more improvements
This commit is contained in:
parent
47f7b5b20e
commit
092a336396
@ -21,7 +21,7 @@ class Users extends Controller
|
|||||||
$users = User::with('roles')->collect();
|
$users = User::with('roles')->collect();
|
||||||
|
|
||||||
$roles = collect(Role::all()->pluck('display_name', 'id'))
|
$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'));
|
return view('auth.users.index', compact('users', 'roles'));
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@ class Transfers extends Controller
|
|||||||
$items = Transfer::with(['payment', 'revenue', 'account'])->collect('payment.paid_at');
|
$items = Transfer::with(['payment', 'revenue', 'account'])->collect('payment.paid_at');
|
||||||
|
|
||||||
$accounts = collect(Account::enabled()->pluck('name', 'id'))
|
$accounts = collect(Account::enabled()->pluck('name', 'id'))
|
||||||
->prepend(trans('accounts.all'), '');
|
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
|
||||||
|
|
||||||
$transfers = array();
|
$transfers = array();
|
||||||
|
|
||||||
|
@ -27,10 +27,10 @@ class Payments extends Controller
|
|||||||
$payment_methods = Modules::getPaymentMethods();
|
$payment_methods = Modules::getPaymentMethods();
|
||||||
|
|
||||||
$categories = collect(Category::enabled()->type('income')->pluck('name', 'id'))
|
$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'))
|
$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'));
|
return view('customers.payments.index', compact('payments', 'payment_methods', 'categories', 'accounts'));
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,8 @@ class Items extends Controller
|
|||||||
{
|
{
|
||||||
$items = Item::with('category')->collect();
|
$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'));
|
return view('items.items.index', compact('items', 'categories'));
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ class Categories extends Controller
|
|||||||
$categories = Category::collect();
|
$categories = Category::collect();
|
||||||
|
|
||||||
$types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'])
|
$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'));
|
return view('settings.categories.index', compact('categories', 'types'));
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ class Modules
|
|||||||
if (setting('general.api_token')) {
|
if (setting('general.api_token')) {
|
||||||
$categories = Cache::remember('modules.categories', Date::now()->addHour(6), function () {
|
$categories = Cache::remember('modules.categories', Date::now()->addHour(6), function () {
|
||||||
return collect($this->getCategories())->pluck('name', 'slug')
|
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]);
|
$view->with(['categories' => $categories]);
|
||||||
|
@ -10,6 +10,5 @@ return [
|
|||||||
'bank_phone' => 'Bank Phone',
|
'bank_phone' => 'Bank Phone',
|
||||||
'bank_address' => 'Bank Address',
|
'bank_address' => 'Bank Address',
|
||||||
'default_account' => 'Default Account',
|
'default_account' => 'Default Account',
|
||||||
'all' => 'All Accounts',
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
'all' => 'All Categories',
|
|
||||||
'all_types' => 'All Types'
|
|
||||||
];
|
|
@ -1,7 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
'all' => 'All Roles',
|
|
||||||
|
|
||||||
];
|
|
@ -16,7 +16,7 @@
|
|||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<span class="title-filter">{{ trans('general.search') }}:</span>
|
<span class="title-filter">{{ trans('general.search') }}:</span>
|
||||||
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
|
{!! 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('<span class="fa fa-filter"></span> ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
|
{!! Form::button('<span class="fa fa-filter"></span> ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<span class="title-filter">{{ trans('general.search') }}:</span>
|
<span class="title-filter">{{ trans('general.search') }}:</span>
|
||||||
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
|
{!! 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('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', 'placeholder' => trans_choice('general.payment_methods', 2)]) !!}
|
{!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm']) !!}
|
||||||
{!! Form::button('<span class="fa fa-filter"></span> ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
|
{!! Form::button('<span class="fa fa-filter"></span> ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user