Tour: Delete Room first version

motorradig/app/Http/Controllers/TourController.php

@@ -315,12 +315,6 @@ class TourController extends Controller
         //
     }
 
-    public function join($tour_id) {
-        Log::info("TourController::join");
-        $user=Auth::user();
-        Tour::join($tour_id,$user->id);
-        return redirect('/tour/'.$tour_id);
-    }
     public function join_room($tour_id,$room_id) {
         Log::info("TourController::join_room");
         $user=Auth::user();
@@ -348,5 +342,12 @@ class TourController extends Controller
         Tour::create_room($tour_id,$capacity);
         return redirect('tour/'.$tour_id.'/edit');
     }
+    public function delete_room($tour_id,$room_id) {
+        Log::info("create_room Controller started");
+        $user=Auth::user();
 
+        Booking::where('tour_id', $tour_id)->where('room_id', $room_id)->delete();
+        DB::delete("DELETE FROM tour_rooms WHERE tour_id = ? AND id = ?",[$tour_id, $room_id]);
+        return redirect('tour/'.$tour_id.'/edit');
+    }
 }

motorradig/app/Tour.php

@@ -27,16 +27,6 @@ class Tour extends Model
         return false;
     }
 
-    // old join without room parameter
-    public static function join($tour_id,$user_id) {
-        Log::info("Tour::join, tour_id=".$tour_id.", user_id=".$user_id);
-        $booking = Booking::firstOrCreate(
-            ['tour_id' => $tour_id, 'user_id' => $user_id],
-            ['tour_id' => $tour_id, 'user_id' => $user_id, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now() ]
-        );
-        //Log::info($booking);
-    }
-
     // new join with room parameter
     public static function join_room($tour_id, $user_id, $room_id) {
         Log::info("Tour::join_room, tour_id=".$tour_id.", user_id=".$user_id.", room_id=".$room_id);

motorradig/resources/views/tour/edit.blade.php

@@ -99,7 +99,7 @@
                                     @endif
                                     <p><b>[{{$room->room_id}}] {{$room->room_name}}</b>
                                         @if($room->room_id>0) <!-- Delete link only for real room ids -->
-                                            <a class="text-primary ts_tooltip" href="/tour/{{$tour->id}}/deleteRoomAdmin/{{$room->room_id}}">
+                                            <a class="text-primary ts_tooltip" href="/tour/{{$tour->id}}/delete_room/{{$room->room_id}}">
                                                 (X) <span class="ts_tooltiptext">Raum Löschen</span>
                                             </a>
                                         @endif

motorradig/routes/web.php

@@ -48,13 +48,11 @@ Route::post('/tour/update', 'TourController@store')->middleware('auth');
 Route::post('/tour/upload_gallery/{tour_id}', 'TourController@upload_gallery');
 Route::resource('/tour', TourController::class)->middleware('auth');
 
-// alt
-Route::get('/tour/{tour_id}/join', 'TourController@join')->middleware('auth');
-// neu
 Route::get('/tour/{tour_id}/join/{room_id}', 'TourController@join_room')->middleware('auth');
 Route::get('/tour/{tour_id}/cancelBooking', 'TourController@cancelBooking')->middleware('auth');
 Route::get('/tour/{tour_id}/cancelBookingAdmin/{user_id}', 'TourController@cancelBookingAdmin')->middleware('auth');
 Route::get('/tour/{tour_id}/create_room/{capacity}', 'TourController@create_room')->middleware('auth');
+Route::get('/tour/{tour_id}/delete_room/{room_id}', 'TourController@delete_room')->middleware('auth');
 
 Route::get('/img_storage/{category}/{imageName}','ImageController@getImage'); // no middleware auth needed, its checked in Controller