diff --git a/app/Http/Controllers/Credit/AccountController.php b/app/Http/Controllers/Credit/AccountController.php index db2d358..92a9e87 100644 --- a/app/Http/Controllers/Credit/AccountController.php +++ b/app/Http/Controllers/Credit/AccountController.php @@ -43,13 +43,6 @@ class AccountController extends Controller if (!$user->isAdmin()) { $userBrands = $user->brands(); - if (!$userBrands->count()) { - \redirect()->route('ticket.index')->withErrors(['warning' => trans( - // phpcs:ignore Generic.Files.LineLength.TooLong - 'Pour utiliser cette fonctionnalité vous devez appartenir à une marque, merci d\'en faire la demande à :mail', - ['mail' => collect(config('mail.contactsList.serviceweb'))->implode(' ')] - )])->throwResponse(); - } return $query->whereHas('brand', function ($q) use ($userBrands) { $q->whereIn('brand_id', $userBrands->pluck('id')); }); diff --git a/app/Models/User.php b/app/Models/User.php index fa0cf91..40c0bf7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -49,7 +49,11 @@ class User extends Authenticatable */ protected $crudValueColumn = 'id'; - // stores unhashed pwd + /** + * stores unhashed pwd + * + * @var string|null + */ public $tmpPass = null; /** diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 30600af..4a07210 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -74,8 +74,17 @@ class RouteServiceProvider extends ServiceProvider return Account::where('id', \intval($value))->firstOrFail(); }); + Route::model('credit_log', function ($value) { + /** @var \App\Models\User|null */ + if (!($user = \auth()->user())) { + abort(401); + } + + $this->assertClientHasBrands($user); + + return CreditLog::where('id', \intval($value))->firstOrFail(); + }); Route::model('brand', Brand::class); - Route::model('credit_log', CreditLog::class); Route::model('label', Label::class); Route::model('marker', Marker::class); Route::model('file', File::class); diff --git a/resources/views/accounts/index.blade.php b/resources/views/accounts/index.blade.php index 6120874..562d76b 100644 --- a/resources/views/accounts/index.blade.php +++ b/resources/views/accounts/index.blade.php @@ -30,6 +30,7 @@ + @if(request()->brand)