shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Select remote limit set edit selected key value added.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-12-30 22:39:14 +03:00
parent 966b6800c0
commit 66a201c3bd
5 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Auth/Users.php
View File

@ -125,6 +125,18 @@ class Users extends Controller
$companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
if ($user->company_ids) {
foreach($user->company_ids as $company_id) {
if (array_key_exists($company_id, $companies)) {
continue;
}
$company = \App\Models\Common\Company::find($company_id);
$companies->put($company->id, $company->name);
}
}
return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages'));
}

4
app/Http/Controllers/Common/Items.php
View File

@ -131,6 +131,10 @@ 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)) {
$categories->put($item->category->id, $item->category->name);
}
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
return view('common.items.edit', compact('item', 'categories', 'taxes'));

8
app/Http/Controllers/Purchases/Payments.php
View File

@ -150,8 +150,16 @@ 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)) {
$vendors->put($payment->contact->id, $payment->contact->name);
}
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
if ($revenue->category && !array_key_exists($payment->category_id, $categories)) {
$categories->put($revenue->category->id, $revenue->category->name);
}
$payment_methods = Modules::getPaymentMethods();
$date_format = $this->getCompanyDateFormat();

8
app/Http/Controllers/Sales/Revenues.php
View File

@ -150,8 +150,16 @@ 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, $vendors)) {
$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)) {
$categories->put($revenue->category->id, $revenue->category->name);
}
$payment_methods = Modules::getPaymentMethods();
$date_format = $this->getCompanyDateFormat();

17
app/Http/Controllers/Settings/Defaults.php
View File

@ -18,8 +18,25 @@ class Defaults extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$sales_categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$sale_category_id = setting('default.income_category');
if ($sale_category_id && !array_key_exists($sale_category_id, $sales_categories)) {
$category = Category::find($sale_category_id);
$sales_categories->put($category->id, $category->name);
}
$purchases_categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$expense_category_id = setting('default.expense_category');
if ($expense_category_id && !array_key_exists($expense_category_id, $purchases_categories)) {
$category = Category::find($expense_category_id);
$purchases_categories->put($category->id, $category->name);
}
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$payment_methods = Modules::getPaymentMethods();