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

more improvements

Browse Source
This commit is contained in:
denisdulici 2017-09-27 21:58:43 +03:00
parent 47f7b5b20e
commit 092a336396
11 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/Users.php
View File

@ -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'));
}

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

@ -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();

4
app/Http/Controllers/Customers/Payments.php
View File

@ -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'));
}

3
app/Http/Controllers/Items/Items.php
View File

@ -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'));
}

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

@ -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'));
}

2
app/Http/ViewComposers/Modules.php
View File

@ -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]);

1
resources/lang/en-GB/accounts.php
View File

@ -10,6 +10,5 @@ return [
'bank_phone' => 'Bank Phone',
'bank_address' => 'Bank Address',
'default_account' => 'Default Account',
'all' => 'All Accounts',
];

7
resources/lang/en-GB/categories.php
View File

@ -1,7 +0,0 @@
<?php
return [
'all' => 'All Categories',
'all_types' => 'All Types'
];

7
resources/lang/en-GB/roles.php
View File

@ -1,7 +0,0 @@
<?php
return [
'all' => 'All Roles',
];

2
resources/views/customers/invoices/index.blade.php
View File

@ -16,7 +16,7 @@
<div class="pull-left">
<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::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> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div>
<div class="pull-right">

4
resources/views/customers/payments/index.blade.php
View File

@ -16,8 +16,8 @@
<div class="pull-left">
<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::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('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div>
<div class="pull-right">