From 092a336396a4c5ff0e8e06e3991027b9b308b093 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 27 Sep 2017 21:58:43 +0300 Subject: [PATCH] more improvements --- app/Http/Controllers/Auth/Users.php | 2 +- app/Http/Controllers/Banking/Transfers.php | 2 +- app/Http/Controllers/Customers/Payments.php | 4 ++-- app/Http/Controllers/Items/Items.php | 3 ++- app/Http/Controllers/Settings/Categories.php | 2 +- app/Http/ViewComposers/Modules.php | 2 +- resources/lang/en-GB/accounts.php | 1 - resources/lang/en-GB/categories.php | 7 ------- resources/lang/en-GB/roles.php | 7 ------- resources/views/customers/invoices/index.blade.php | 2 +- resources/views/customers/payments/index.blade.php | 4 ++-- 11 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 resources/lang/en-GB/categories.php delete mode 100644 resources/lang/en-GB/roles.php diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index 8c7de8b02..4800ebcbd 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -21,7 +21,7 @@ class Users extends Controller $users = User::with('roles')->collect(); $roles = collect(Role::all()->pluck('display_name', 'id')) - ->prepend(trans('roles.all'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.roles', 2)]), ''); return view('auth.users.index', compact('users', 'roles')); } diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index aaf366f20..ca8617150 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -27,7 +27,7 @@ class Transfers extends Controller $items = Transfer::with(['payment', 'revenue', 'account'])->collect('payment.paid_at'); $accounts = collect(Account::enabled()->pluck('name', 'id')) - ->prepend(trans('accounts.all'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), ''); $transfers = array(); diff --git a/app/Http/Controllers/Customers/Payments.php b/app/Http/Controllers/Customers/Payments.php index 064dcac30..6feabec74 100644 --- a/app/Http/Controllers/Customers/Payments.php +++ b/app/Http/Controllers/Customers/Payments.php @@ -27,10 +27,10 @@ class Payments extends Controller $payment_methods = Modules::getPaymentMethods(); $categories = collect(Category::enabled()->type('income')->pluck('name', 'id')) - ->prepend(trans('categories.all'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); $accounts = collect(Account::enabled()->pluck('name', 'id')) - ->prepend(trans('accounts.all'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), ''); return view('customers.payments.index', compact('payments', 'payment_methods', 'categories', 'accounts')); } diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index be67b94bd..3d8eef2b3 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -23,7 +23,8 @@ class Items extends Controller { $items = Item::with('category')->collect(); - $categories = Category::enabled()->type('item')->pluck('name', 'id')->prepend(trans('categories.all'), ''); + $categories = Category::enabled()->type('item')->pluck('name', 'id') + ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); return view('items.items.index', compact('items', 'categories')); } diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index 904256763..d0a428b2a 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -19,7 +19,7 @@ class Categories extends Controller $categories = Category::collect(); $types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other']) - ->prepend(trans('categories.all_types'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), ''); return view('settings.categories.index', compact('categories', 'types')); } diff --git a/app/Http/ViewComposers/Modules.php b/app/Http/ViewComposers/Modules.php index cb68c5f25..def452fd2 100644 --- a/app/Http/ViewComposers/Modules.php +++ b/app/Http/ViewComposers/Modules.php @@ -23,7 +23,7 @@ class Modules if (setting('general.api_token')) { $categories = Cache::remember('modules.categories', Date::now()->addHour(6), function () { return collect($this->getCategories())->pluck('name', 'slug') - ->prepend(trans('categories.all'), ''); + ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); }); $view->with(['categories' => $categories]); diff --git a/resources/lang/en-GB/accounts.php b/resources/lang/en-GB/accounts.php index ae2abe99c..98b9c65a4 100644 --- a/resources/lang/en-GB/accounts.php +++ b/resources/lang/en-GB/accounts.php @@ -10,6 +10,5 @@ return [ 'bank_phone' => 'Bank Phone', 'bank_address' => 'Bank Address', 'default_account' => 'Default Account', - 'all' => 'All Accounts', ]; diff --git a/resources/lang/en-GB/categories.php b/resources/lang/en-GB/categories.php deleted file mode 100644 index 3f0adb977..000000000 --- a/resources/lang/en-GB/categories.php +++ /dev/null @@ -1,7 +0,0 @@ - 'All Categories', - 'all_types' => 'All Types' -]; diff --git a/resources/lang/en-GB/roles.php b/resources/lang/en-GB/roles.php deleted file mode 100644 index d0ebb3548..000000000 --- a/resources/lang/en-GB/roles.php +++ /dev/null @@ -1,7 +0,0 @@ - 'All Roles', - -]; diff --git a/resources/views/customers/invoices/index.blade.php b/resources/views/customers/invoices/index.blade.php index 73a557f15..eee259836 100644 --- a/resources/views/customers/invoices/index.blade.php +++ b/resources/views/customers/invoices/index.blade.php @@ -16,7 +16,7 @@
{{ trans('general.search') }}: {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} - {!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('status.all')]) !!} + {!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
diff --git a/resources/views/customers/payments/index.blade.php b/resources/views/customers/payments/index.blade.php index d7fee8ef9..e7be75f8a 100644 --- a/resources/views/customers/payments/index.blade.php +++ b/resources/views/customers/payments/index.blade.php @@ -16,8 +16,8 @@
{{ trans('general.search') }}: {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} - {!! Form::select('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('categories.all')]) !!} - {!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans_choice('general.payment_methods', 2)]) !!} + {!! Form::select('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}