diff --git a/app/Http/Controllers/Credit/AccountController.php b/app/Http/Controllers/Credit/AccountController.php index 3f537f1..c5f8531 100644 --- a/app/Http/Controllers/Credit/AccountController.php +++ b/app/Http/Controllers/Credit/AccountController.php @@ -34,22 +34,16 @@ class AccountController extends Controller * * @param Builder $query * @return Builder + * @throws \ErrorException If account is missing in url. */ public function indexQuery(Builder $query): Builder { - /** @var \App\Models\User */ - $user = auth()->user(); - if (!$user->isAdmin()) { - // Show only users brand(s) accounts. - $brands = $user->sites()->with('brand')->get()->pluck('brand') - ->filter(function ($v) { - return !\is_null($v); - }); - return $query->whereHas('brand', function ($q) use ($brands) { - $q->whereIn('id', $brands->pluck('id')); - }); + /** @var \App\Models\Brand|null $brand */ + if (!($brand = request()->brand)) { + throw new \ErrorException('Cannot get brand'); } - return $query; + + return $query->where('brand_id', '=', $brand->id); } /** diff --git a/app/Http/Controllers/Credit/CreditLogController.php b/app/Http/Controllers/Credit/CreditLogController.php index d8bedee..a3d60e7 100644 --- a/app/Http/Controllers/Credit/CreditLogController.php +++ b/app/Http/Controllers/Credit/CreditLogController.php @@ -30,11 +30,20 @@ class CreditLogController extends Controller * * @param Builder $query * @return Builder + * @throws \ErrorException If account is missing in url. */ public function indexQuery(Builder $query): Builder { $query->orderBy('created_at', 'DESC'); - return $query; + + /** @var \App\Models\Credit\Account|null $account */ + if (!($account = request()->account)) { + throw new \ErrorException('Cannot get account'); + } + + return $query->whereHas('account', function ($q) use ($account) { + $q->whereIn('id', $account->pluck('id')); + }); } /** diff --git a/composer.lock b/composer.lock index d901ad7..6ad74d1 100644 --- a/composer.lock +++ b/composer.lock @@ -1509,12 +1509,12 @@ "source": { "type": "git", "url": "https://github.com/Kwaadpepper/crud-policies.git", - "reference": "b9588ab2633493b635aa0aa77013265ed400332d" + "reference": "c25ff96be976796a5447bd75d6ef16a0d7226f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/b9588ab2633493b635aa0aa77013265ed400332d", - "reference": "b9588ab2633493b635aa0aa77013265ed400332d", + "url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/c25ff96be976796a5447bd75d6ef16a0d7226f47", + "reference": "c25ff96be976796a5447bd75d6ef16a0d7226f47", "shasum": "" }, "require": { @@ -1567,7 +1567,11 @@ "issues": "https://github.com/Kwaadpepper/crud-policies/issues", "source": "https://github.com/Kwaadpepper/crud-policies/tree/0.4.5" }, +<<<<<<< HEAD "time": "2022-06-15T15:19:14+00:00" +======= + "time": "2022-06-15T15:42:22+00:00" +>>>>>>> origin/ticket928 }, { "name": "kwaadpepper/enum", diff --git a/resources/views/accounts/index.blade.php b/resources/views/accounts/index.blade.php index b087455..6120874 100644 --- a/resources/views/accounts/index.blade.php +++ b/resources/views/accounts/index.blade.php @@ -30,6 +30,14 @@ +
| + {{ __('Ticket :id', ['id' => $model->estimation->first()->ticket->id]) }} + | + @endif + {{-- MODEL ACTIONS --}}
|