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

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();