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

Merge branch '1.3-dev' of github.com:akaunting/akaunting into 1.3-dev

Browse Source
This commit is contained in:
cuneytsenturk 2018-11-07 21:43:10 +03:00
commit 7c5da105c0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ class Items extends Controller
{ {
$categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id'); $categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first(); $currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
@ -131,7 +131,7 @@ class Items extends Controller
{ {
$categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id'); $categories = Category::enabled()->orderBy('name')->type('item')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first(); $currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();

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

@ -98,7 +98,7 @@ class Bills extends Controller
$items = Item::enabled()->orderBy('name')->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id'); $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');

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

@ -105,7 +105,7 @@ class Invoices extends Controller
$items = Item::enabled()->orderBy('name')->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
@ -222,7 +222,7 @@ class Invoices extends Controller
$items = Item::enabled()->orderBy('name')->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');

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

@ -47,7 +47,7 @@ class Settings extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();