From 821428c150e14376260a44c355081f41e1a128b6 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Wed, 2 Sep 2020 13:15:11 +0200
Subject: [PATCH] v0.11.1d - Fixed WashingReservation

---
 .../app/Http/Controllers/WashingReservationController.php      | 3 ++-
 .../resources/views/app/washing-reservations/index.blade.php   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php
index 37ab1b3..e7e2958 100644
--- a/skolehjem/app/Http/Controllers/WashingReservationController.php
+++ b/skolehjem/app/Http/Controllers/WashingReservationController.php
@@ -132,6 +132,7 @@ class WashingReservationController extends Controller
     public function destroy($id)
     {
         $machineReservation = WashingReservation::find($id);
+        dd($id);
         $machineReservation->delete();
 
         $reservations = WashingReservation::query()->paginate( 20);
@@ -265,7 +266,7 @@ class WashingReservationController extends Controller
     {
         WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
 
-        $reservations = WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->join('locations', 'locations.id', '=', 'washing_machines.location_id')->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
+        $reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
 
         return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
     }
diff --git a/skolehjem/resources/views/app/washing-reservations/index.blade.php b/skolehjem/resources/views/app/washing-reservations/index.blade.php
index 63890c3..95e91ab 100644
--- a/skolehjem/resources/views/app/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/index.blade.php
@@ -16,7 +16,7 @@
                     <h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
                     <div class="row align-items-center">
                         <span style="font-size: 4vw; white-space: pre-line;"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}
-                            - {{ $reservation->name }}</span>
+                            - {{ \App\Location::query()->where('id', '=', \App\WashingMachine::query()->find($reservation->machine_id)->location_id)->first()->name }}</span>
                         <form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
                             @csrf
                             @method("delete")