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

fixed #400

Browse Source
This commit is contained in:
denisdulici
2018-06-29 14:42:15 +03:00
parent 1794876787
commit 93ed391cdd
7 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Banking/Transfers.php
View File

@ -28,7 +28,7 @@ class Transfers extends Controller
$items = Transfer::with(['payment', 'payment.account', 'revenue', 'revenue.account'])->collect('payment.paid_at'); $items = Transfer::with(['payment', 'payment.account', 'revenue', 'revenue.account'])->collect('payment.paid_at');
$accounts = collect(Account::enabled()->pluck('name', 'id')) $accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
$transfers = array(); $transfers = array();
@ -97,7 +97,7 @@ class Transfers extends Controller
*/ */
public function create() public function create()
{ {
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -183,7 +183,7 @@ class Transfers extends Controller
$transfer['payment_method'] = $revenue->payment_method; $transfer['payment_method'] = $revenue->payment_method;
$transfer['reference'] = $revenue->reference; $transfer['reference'] = $revenue->reference;
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();

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

@ -25,7 +25,7 @@ class Items extends Controller
{ {
$items = Item::with('category')->collect(); $items = Item::with('category')->collect();
$categories = Category::enabled()->type('item')->pluck('name', 'id') $categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id')
->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
return view('common.items.index', compact('items', 'categories')); return view('common.items.index', compact('items', 'categories'));
@ -48,9 +48,9 @@ class Items extends Controller
*/ */
public function create() public function create()
{ {
$categories = Category::enabled()->type('item')->pluck('name', 'id'); $categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
return view('common.items.create', compact('categories', 'taxes')); return view('common.items.create', compact('categories', 'taxes'));
} }
@ -127,9 +127,9 @@ class Items extends Controller
*/ */
public function edit(Item $item) public function edit(Item $item)
{ {
$categories = Category::enabled()->type('item')->pluck('name', 'id'); $categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
return view('common.items.edit', compact('item', 'categories', 'taxes')); return view('common.items.edit', compact('item', 'categories', 'taxes'));
} }

30
app/Http/Controllers/Expenses/Bills.php
View File

@ -45,7 +45,7 @@ class Bills extends Controller
{ {
$bills = Bill::with(['vendor', 'status', 'items', 'payments', 'histories'])->collect(['billed_at'=> 'desc']); $bills = Bill::with(['vendor', 'status', 'items', 'payments', 'histories'])->collect(['billed_at'=> 'desc']);
$vendors = collect(Vendor::enabled()->pluck('name', 'id')) $vendors = collect(Vendor::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
$statuses = collect(BillStatus::all()->pluck('name', 'code')) $statuses = collect(BillStatus::all()->pluck('name', 'code'))
@ -73,15 +73,15 @@ class Bills extends Controller
$bill->paid = $paid; $bill->paid = $paid;
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$vendors = Vendor::enabled()->pluck('name', 'id'); $vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -95,15 +95,15 @@ class Bills extends Controller
*/ */
public function create() public function create()
{ {
$vendors = Vendor::enabled()->pluck('name', 'id'); $vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$items = Item::enabled()->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('expense')->pluck('name', 'id'); $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes', 'categories')); return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes', 'categories'));
} }
@ -316,15 +316,15 @@ class Bills extends Controller
*/ */
public function edit(Bill $bill) public function edit(Bill $bill)
{ {
$vendors = Vendor::enabled()->pluck('name', 'id'); $vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$items = Item::enabled()->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('expense')->pluck('name', 'id'); $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes', 'categories')); return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes', 'categories'));
} }

22
app/Http/Controllers/Expenses/Payments.php
View File

@ -27,13 +27,13 @@ class Payments extends Controller
{ {
$payments = Payment::with(['vendor', 'account', 'category'])->isNotTransfer()->collect(['paid_at'=> 'desc']); $payments = Payment::with(['vendor', 'account', 'category'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = collect(Vendor::enabled()->pluck('name', 'id')) $vendors = collect(Vendor::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
$categories = collect(Category::enabled()->type('expense')->pluck('name', 'id')) $categories = collect(Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
$accounts = collect(Account::enabled()->pluck('name', 'id')) $accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
$transfer_cat_id = Category::transfer(); $transfer_cat_id = Category::transfer();
@ -58,15 +58,15 @@ class Payments extends Controller
*/ */
public function create() public function create()
{ {
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$vendors = Vendor::enabled()->pluck('name', 'id'); $vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->pluck('name', 'id'); $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -148,15 +148,15 @@ class Payments extends Controller
*/ */
public function edit(Payment $payment) public function edit(Payment $payment)
{ {
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', $payment->account_id)->pluck('currency_code')->first(); $account_currency_code = Account::where('id', $payment->account_id)->pluck('currency_code')->first();
$vendors = Vendor::enabled()->pluck('name', 'id'); $vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->pluck('name', 'id'); $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();

30
app/Http/Controllers/Incomes/Invoices.php
View File

@ -48,7 +48,7 @@ class Invoices extends Controller
{ {
$invoices = Invoice::with(['customer', 'status', 'items', 'payments', 'histories'])->collect(['invoice_number'=> 'desc']); $invoices = Invoice::with(['customer', 'status', 'items', 'payments', 'histories'])->collect(['invoice_number'=> 'desc']);
$customers = collect(Customer::enabled()->pluck('name', 'id')) $customers = collect(Customer::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
$status = collect(InvoiceStatus::all()->pluck('name', 'code')) $status = collect(InvoiceStatus::all()->pluck('name', 'code'))
@ -76,15 +76,15 @@ class Invoices extends Controller
$invoice->paid = $paid; $invoice->paid = $paid;
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$customers = Customer::enabled()->pluck('name', 'id'); $customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -98,15 +98,15 @@ class Invoices extends Controller
*/ */
public function create() public function create()
{ {
$customers = Customer::enabled()->pluck('name', 'id'); $customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$items = Item::enabled()->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$number = $this->getNextInvoiceNumber(); $number = $this->getNextInvoiceNumber();
@ -337,15 +337,15 @@ class Invoices extends Controller
*/ */
public function edit(Invoice $invoice) public function edit(Invoice $invoice)
{ {
$customers = Customer::enabled()->pluck('name', 'id'); $customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$items = Item::enabled()->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes', 'categories')); return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes', 'categories'));
} }

22
app/Http/Controllers/Incomes/Revenues.php
View File

@ -29,13 +29,13 @@ class Revenues extends Controller
{ {
$revenues = Revenue::with(['account', 'category', 'customer'])->isNotTransfer()->collect(['paid_at'=> 'desc']); $revenues = Revenue::with(['account', 'category', 'customer'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$customers = collect(Customer::enabled()->pluck('name', 'id')) $customers = collect(Customer::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
$categories = collect(Category::enabled()->type('income')->pluck('name', 'id')) $categories = collect(Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
$accounts = collect(Account::enabled()->pluck('name', 'id')) $accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
$transfer_cat_id = Category::transfer(); $transfer_cat_id = Category::transfer();
@ -60,15 +60,15 @@ class Revenues extends Controller
*/ */
public function create() public function create()
{ {
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$customers = Customer::enabled()->pluck('name', 'id'); $customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -150,15 +150,15 @@ class Revenues extends Controller
*/ */
public function edit(Revenue $revenue) public function edit(Revenue $revenue)
{ {
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', $revenue->account_id)->pluck('currency_code')->first(); $account_currency_code = Account::where('id', $revenue->account_id)->pluck('currency_code')->first();
$customers = Customer::enabled()->pluck('name', 'id'); $customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();

6
app/Http/Controllers/Settings/Settings.php
View File

@ -43,11 +43,11 @@ class Settings extends Controller
$timezones = $this->getTimezones(); $timezones = $this->getTimezones();
$accounts = Account::enabled()->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$taxes = Tax::enabled()->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();