use collections
This commit is contained in:
parent
2c3d472cd8
commit
25ea9641ea
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user