Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders
2020-08-05 09:24:08 +02:00
9 changed files with 13 additions and 7 deletions
@@ -153,7 +153,10 @@ class WashingReservationController extends Controller
$reservations = WashingReservation::query()->paginate( 20);
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
if(app('router')->getRoutes()->match(app('request')->create(url()->previous()))->getName() == "washing-reservations.appindex")
return redirect()->route("washing-reservations.appindex");
else
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
}
public function api(Request $request){