From 25ea9641eaadb28a32167d95e9286c9cbdc78d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 31 Dec 2020 09:32:00 +0300 Subject: [PATCH] use collections --- app/Http/Controllers/Auth/Users.php | 2 +- app/Http/Controllers/Common/Items.php | 2 +- app/Http/Controllers/Purchases/Payments.php | 4 ++-- app/Http/Controllers/Sales/Revenues.php | 4 ++-- app/Http/Controllers/Settings/Defaults.php | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index 98a1721d2..770ebc93f 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -127,7 +127,7 @@ class Users extends Controller if ($user->company_ids) { foreach($user->company_ids as $company_id) { - if (array_key_exists($company_id, $companies)) { + if ($companies->has($company_id)) { continue; } diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php index 6c93a5996..5cb304a93 100644 --- a/app/Http/Controllers/Common/Items.php +++ b/app/Http/Controllers/Common/Items.php @@ -131,7 +131,7 @@ class Items extends Controller { $categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); - if ($item->category && !array_key_exists($item->category_id, $categories)) { + if ($item->category && !$categories->has($item->category_id)) { $categories->put($item->category->id, $item->category->name); } diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php index d2ac7acb3..5c4c73d41 100644 --- a/app/Http/Controllers/Purchases/Payments.php +++ b/app/Http/Controllers/Purchases/Payments.php @@ -150,13 +150,13 @@ class Payments extends Controller $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); - if ($payment->contact && !array_key_exists($payment->contact_id, $vendors)) { + if ($payment->contact && !$vendors->has($payment->contact_id)) { $vendors->put($payment->contact->id, $payment->contact->name); } $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); - if ($payment->category && !array_key_exists($payment->category_id, $categories)) { + if ($payment->category && !$categories->has($payment->category_id)) { $categories->put($payment->category->id, $payment->category->name); } diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php index cc15f39e3..6f5bad53f 100644 --- a/app/Http/Controllers/Sales/Revenues.php +++ b/app/Http/Controllers/Sales/Revenues.php @@ -150,13 +150,13 @@ class Revenues extends Controller $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); - if ($revenue->contact && !array_key_exists($revenue->contact_id, $customers)) { + if ($revenue->contact && !$customers->has($revenue->contact_id)) { $customers->put($revenue->contact->id, $revenue->contact->name); } $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id'); - if ($revenue->category && !array_key_exists($revenue->category_id, $categories)) { + if ($revenue->category && !$categories->has($revenue->category_id)) { $categories->put($revenue->category->id, $revenue->category->name); } diff --git a/app/Http/Controllers/Settings/Defaults.php b/app/Http/Controllers/Settings/Defaults.php index 3bcc27cf8..4af8fe39d 100644 --- a/app/Http/Controllers/Settings/Defaults.php +++ b/app/Http/Controllers/Settings/Defaults.php @@ -21,7 +21,7 @@ class Defaults extends Controller $sale_category_id = setting('default.income_category'); - if ($sale_category_id && !array_key_exists($sale_category_id, $sales_categories)) { + if ($sale_category_id && !$sales_categories->has($sale_category_id)) { $category = Category::find($sale_category_id); $sales_categories->put($category->id, $category->name); @@ -31,7 +31,7 @@ class Defaults extends Controller $expense_category_id = setting('default.expense_category'); - if ($expense_category_id && !array_key_exists($expense_category_id, $purchases_categories)) { + if ($expense_category_id && !$purchases_categories->has($expense_category_id)) { $category = Category::find($expense_category_id); $purchases_categories->put($category->id, $category->name);