Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

2020-08-03 13:21:56 +02:00
parent e2847e9959 a66b7aad92
commit e8f6c2242a
8 changed files with 31 additions and 35 deletions
@@ -164,7 +164,10 @@ class WashingReservationController extends Controller

            $machines = WashingMachine::all();

-            $reservations = WashingReservation::query()->where("time", "LIKE", substr($date, 1, strpos($date, "T"))."%")->get();
+            if($request->machine_id == 0)
+                $request->machine_id = WashingMachine::all()->first()->id;
+
+            $reservations = WashingReservation::query()->where("machine_id", "=", $request->machine_id)->where("time", "LIKE", substr($date, 1, strpos($date, "T"))."%")->get();

            $times = [];