Merge branch 'develop' into trunk
This commit is contained in:
commit
e31898bb7b
1 changed files with 5 additions and 2 deletions
|
|
@ -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;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue