vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
This commit is contained in:
frederikpyt
2020-08-04 16:52:42 +02:00
parent 1011165ca0 4f1ff3a823
commit 64d1f785f9
15 changed files with 52 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/WashingReservationController.php
+5 -8
View File
@@ -67,15 +67,13 @@ class WashingReservationController extends Controller
$machineReservation = new WashingReservation($data);
$machineReservation->user_id = auth()->user()->id;
$machineReservation->save();
$saved = $machineReservation->save();
$allMachineReservations = WashingReservation::query()->where('time', '=', $request->time)->where('machine_id', '=', $request->machine_id)->get();
if (!$saved) {
return Response::detect("washing-reservations.store", [
"washing_reservation" => $machineReservation
]);
if (count($allMachineReservations) > 0) {
return redirect()->route("washing-reservations.create", ["washing_reservation" => $machineReservation])->with('ReservationExists', '<p class="text-center"><b>Der findes allerede en reservation til denne tid, men denne vaskemaskine!</b></p>');
} else {
$machineReservation->save();
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]);
@@ -175,7 +173,7 @@ class WashingReservationController extends Controller
foreach ($reservations as $reservation){
array_push($times, $reservation->time);
}
//2020-07-28%
$output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times ]);
return Response($output);
}
@@ -232,7 +230,6 @@ class WashingReservationController extends Controller
'<td></td>'.
'<td></td>'.
'<td></td>'.
'<td></td>'.
'</tr>';
}
return Response($output);