From 28063c65bb80302617d834990cdbcb0143369b89 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 7 Nov 2018 19:56:11 +0300 Subject: [PATCH] sorted taxes by name --- app/Http/Controllers/Common/Items.php | 4 ++-- app/Http/Controllers/Expenses/Bills.php | 2 +- app/Http/Controllers/Incomes/Invoices.php | 4 ++-- app/Http/Controllers/Settings/Settings.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php index b270481a6..3c3db8559 100644 --- a/app/Http/Controllers/Common/Items.php +++ b/app/Http/Controllers/Common/Items.php @@ -50,7 +50,7 @@ class Items extends Controller { $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(); @@ -131,7 +131,7 @@ class Items extends Controller { $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(); diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 8855c5536..43e239934 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -98,7 +98,7 @@ class Bills extends Controller $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'); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 8a6bf4372..903d8acd0 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -105,7 +105,7 @@ class Invoices extends Controller $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'); @@ -222,7 +222,7 @@ class Invoices extends Controller $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'); diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php index 873d9c924..2b99b7b96 100644 --- a/app/Http/Controllers/Settings/Settings.php +++ b/app/Http/Controllers/Settings/Settings.php @@ -47,7 +47,7 @@ class Settings extends Controller $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();