From 0e38fc9ad45c226fa2741b4daac624129e254d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 24 Aug 2021 16:05:05 +0200 Subject: [PATCH] Fix Route service provider for $customer --- app/Providers/RouteServiceProvider.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index ed2bb3c..c0b3794 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -52,8 +52,11 @@ class RouteServiceProvider extends ServiceProvider throw (new ModelNotFoundException())->setModel(Customer::class); } } - /** @var \App\Models\Customer $customer */ - return $customer->loadBrandData(app('App\Models\Service')->brand); + if ($brand = app('App\Models\Service')->brand) { + /** @var \App\Models\Customer $customer */ + $customer = $customer->loadBrandData($brand); + } + return $customer; }); }