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

Change selectAddNewGroup to selectRemoteAddNewGroup

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-11-10 19:15:54 +03:00
parent 57759aa718
commit c31c097e19
26 changed files with 247 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class Users extends Controller
return $r->hasPermission('read-client-portal');
});
$companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
$companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
return view('auth.users.create', compact('roles', 'companies', 'landing_pages'));
}
@ -123,7 +123,7 @@ class Users extends Controller
});
}
$companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
$companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages'));
}

2
app/Http/Controllers/Banking/Transactions.php
View File

@ -22,7 +22,7 @@ class Transactions extends Controller
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$types = collect(['expense' => 'Expense', 'income' => 'Income'])
$types = collect(['expense' => trans_choice('general.expenses', 1), 'income' => trans_choice('general.incomes', 1)])
->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
$request_type = !request()->has('type') ? ['income', 'expense'] : request('type');

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

@ -50,9 +50,9 @@ class Items extends Controller
*/
public function create()
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->take(setting('default.select_limit'))->pluck('title', 'id');
return view('common.items.create', compact('categories', 'taxes'));
}

2
app/Http/Controllers/Modals/Items.php
View File

@ -30,7 +30,7 @@ class Items extends Controller
*/
public function create(IRequest $request)
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');

16
app/Http/Controllers/Purchases/Bills.php
View File

@ -39,13 +39,7 @@ class Bills extends Controller
{
$bills = Bill::with('contact', 'transactions')->collect(['billed_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = $this->getBillStatuses();
return $this->response('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
return $this->response('purchases.bills.index', compact('bills'));
}
/**
@ -96,7 +90,7 @@ class Bills extends Controller
*/
public function create()
{
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -106,7 +100,7 @@ class Bills extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$number = $this->getNextBillNumber();
@ -192,7 +186,7 @@ class Bills extends Controller
*/
public function edit(Bill $bill)
{
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -202,7 +196,7 @@ class Bills extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}

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

@ -32,13 +32,7 @@ class Payments extends Controller
{
$payments = Transaction::with('account', 'bill', 'category', 'contact')->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
return $this->response('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
return $this->response('purchases.payments.index', compact('payments'));
}
/**
@ -66,9 +60,9 @@ class Payments extends Controller
$currency = Currency::where('code', $account_currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -154,9 +148,9 @@ class Payments extends Controller
$currency = Currency::where('code', $payment->currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();

16
app/Http/Controllers/Sales/Invoices.php
View File

@ -40,13 +40,7 @@ class Invoices extends Controller
{
$invoices = Invoice::with('contact', 'transactions')->collect(['invoice_number'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = $this->getInvoiceStatuses();
return $this->response('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
return $this->response('sales.invoices.index', compact('invoices'));
}
/**
@ -99,7 +93,7 @@ class Invoices extends Controller
*/
public function create()
{
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -109,7 +103,7 @@ class Invoices extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$number = $this->getNextInvoiceNumber();
@ -195,7 +189,7 @@ class Invoices extends Controller
*/
public function edit(Invoice $invoice)
{
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
@ -205,7 +199,7 @@ class Invoices extends Controller
$taxes = Tax::enabled()->orderBy('name')->get();
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}

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

@ -32,13 +32,7 @@ class Revenues extends Controller
{
$revenues = Transaction::with('account', 'category', 'contact', 'invoice')->income()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
return $this->response('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
return $this->response('sales.revenues.index', compact('revenues'));
}
/**
@ -66,9 +60,9 @@ class Revenues extends Controller
$currency = Currency::where('code', $account_currency_code)->first();
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -154,9 +148,9 @@ class Revenues extends Controller
$currency = Currency::where('code', $revenue->currency_code)->first();
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
$customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();

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

@ -17,8 +17,8 @@ class Defaults extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$sales_categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
$purchases_categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
$sales_categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$purchases_categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');