conflict fix

doc/booking_query_1_of_2.all_tour_rooms.sql

@@ -0,0 +1,23 @@
+-- tour_room based display ( Suppresses users without room)
+SELECT   
+    qry.tour_id,
+    qry.room_id,
+    b.user_id,
+    qry.capacity,
+    qry.room_name,
+    COALESCE(qry.room_name,'Ungebucht') room_name,
+    COALESCE(qry.room_name,'ZZZZZZZZZ') room_sort_order
+FROM (
+     SELECT
+         tr.tour_id,
+         tr.id as room_id,
+         tr.capacity,
+         tr.name as room_name
+     FROM
+         tour_rooms tr
+     WHERE 
+        tr.tour_id= 17
+     ) qry LEFT JOIN bookings as b
+           ON b.tour_id = qry.tour_id AND b.room_id=qry.room_id
+     ORDER BY 6,4
+;

motorradig/app/Http/Controllers/TourController.php

@@ -249,6 +249,11 @@ class TourController extends Controller
     }
 
 
+    public function create_room($tour_id, $capacity) {
+        DB::delete("INSERT INTO booking_rooms")
+    }
+
+
     public function upload_gallery(Request $request, Tour $tour){
         dd($request);
     }

motorradig/config/database.php

@@ -48,9 +48,9 @@ return [
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
+            'database' => env('DB_DATABASE', 'motorradig'),
+            'username' => env('DB_USERNAME', 'mig_user'),
+            'password' => env('DB_PASSWORD', 'mig_password'),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',

motorradig/database/migrations/2022_04_20_083326_create_tour_rooms.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateBookingRooms extends Migration
+class CreateTourRooms extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateBookingRooms extends Migration
      */
     public function up()
     {
-        Schema::create('booking_rooms', function (Blueprint $table) {
+        Schema::create('tour_rooms', function (Blueprint $table) {
             $table->id();
             $table->string('name');
             $table->integer('tour_id');

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

@@ -107,7 +107,13 @@
                             @endforeach
                         </ul>
                         <div class="card-header">
-                            <button type="submit" class="btn">+ Raum hinzufügen</button>
+                            <a href="/tour/{{$tour->id}}/create_room/1" class="text-primary">+ Einzelzimmer</a>
+                            <!-- <button type="submit" class="btn">+ Einzelzimmer</button> -->
+                        </div>
+                        &nbsp;
+                        <div class="card-header">
+                            <a href="/tour/{{$tour->id}}/create_room/2" class="text-primary">+ Doppelzimmer</a>
+                            <!-- <button type="submit" class="btn">+ Doppelzimmer</button> -->
                         </div>
                     </div>
                 </div>

motorradig/routes/web.php

@@ -51,6 +51,7 @@ Route::resource('/tour', TourController::class)->middleware('auth');
 Route::get('/tour/{tour_id}/join', 'TourController@join')->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('/img_storage/{category}/{imageName}','ImageController@getImage'); // no middleware auth needed, its checked in Controller