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

Merge pull request #27 from denisdulici/improve-filters

Browse Source 
Improved income/expense filters
This commit is contained in:
Denis Duliçi 2017-09-27 22:00:53 +03:00 committed by GitHub
commit e0e4e1d7c6
36 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Filters/Expenses/Bills.php
View File

@ -19,6 +19,11 @@ class Bills extends ModelFilter
return $this->whereLike('vendor_name', $query);
}
public function vendor($vendor)
{
return $this->where('vendor_id', $vendor);
}
public function status($status)
{
return $this->where('bill_status_code', $status);

5
app/Filters/Expenses/Payments.php
View File

@ -19,6 +19,11 @@ class Payments extends ModelFilter
return $this->whereLike('description', $query);
}
public function vendor($vendor)
{
return $this->where('vendor_id', $vendor);
}
public function category($category)
{
return $this->where('category_id', $category);

5
app/Filters/Incomes/Invoices.php
View File

@ -19,6 +19,11 @@ class Invoices extends ModelFilter
return $this->whereLike('customer_name', $query);
}
public function customer($customer)
{
return $this->where('customer_id', $customer);
}
public function status($status)
{
return $this->where('invoice_status_code', $status);

5
app/Filters/Incomes/Revenues.php
View File

@ -14,6 +14,11 @@ class Revenues extends ModelFilter
*/
public $relations = [];
public function search($query)
{
return $this->whereLike('description', $query);
}
public function customer($customer)
{
return $this->where('customer_id', $customer);

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

2
app/Http/Controllers/Customers/Invoices.php
View File

@ -46,7 +46,7 @@ class Invoices extends Controller
}
$status = collect(InvoiceStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_statuses'), '');
->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
return view('customers.invoices.index', compact('invoices', 'status'));
}

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

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

@ -38,10 +38,13 @@ class Bills extends Controller
{
$bills = Bill::with('status')->collect();
$status = collect(BillStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_statuses'), '');
$vendors = collect(Vendor::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
return view('expenses.bills.index', compact('bills', 'status'));
$status = collect(BillStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
return view('expenses.bills.index', compact('bills', 'vendors', 'status'));
}
/**

9
app/Http/Controllers/Expenses/Payments.php
View File

@ -24,13 +24,16 @@ class Payments extends Controller
{
$payments = Payment::with(['account', 'category'])->collect();
$vendors = collect(Vendor::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
$categories = collect(Category::enabled()->type('expense')->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('expenses.payments.index', compact('payments', 'categories', 'accounts'));
return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
}
/**

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

@ -40,10 +40,13 @@ class Invoices extends Controller
{
$invoices = Invoice::with('status')->collect();
$status = collect(InvoiceStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_statuses'), '');
$customers = collect(Customer::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
return view('incomes.invoices.index', compact('invoices', 'status'));
$status = collect(InvoiceStatus::all()->pluck('name', 'code'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
return view('incomes.invoices.index', compact('invoices', 'customers', 'status'));
}
/**

6
app/Http/Controllers/Incomes/Revenues.php
View File

@ -28,13 +28,13 @@ class Revenues extends Controller
$revenues = Revenue::with(['account', 'category', 'customer'])->collect();
$customers = collect(Customer::enabled()->pluck('name', 'id'))
->prepend(trans('customer.all'), '');
->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
$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('incomes.revenues.index', compact('revenues', 'customers', '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'
];

4
resources/lang/en-GB/general.php
View File

@ -35,6 +35,7 @@ return [
'languages' => 'Language|Languages',
'updates' => 'Update|Updates',
'numbers' => 'Number|Numbers',
'statuses' => 'Status|Statuses',
'dashboard' => 'Dashboard',
'banking' => 'Banking',
@ -76,7 +77,6 @@ return [
'color' => 'Colour',
'save' => 'Save',
'cancel' => 'Cancel',
'status' => 'Status',
'from' => 'From',
'to' => 'To',
'print' => 'Print',
@ -85,12 +85,12 @@ return [
'filter' => 'Filter',
'create_user' => 'Create User',
'created_user' => 'Created User',
'all_statuses' => 'All Statuses',
'bank' => 'Bank Transfer',
'cash' => 'Cash',
'paypal' => 'PayPal',
'help' => 'Help',
'all' => 'All',
'all_type' => 'All :type',
'upcoming' => 'Upcoming',
'created' => 'Created',

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

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

2
resources/views/banking/accounts/index.blade.php
View File

@ -34,7 +34,7 @@
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('number', trans('accounts.number'))</th>
<th>@sortablelink('opening_balance', trans('accounts.current_balance'))</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th style="width: 15%;">{{ trans('general.actions') }}</th>
</tr>
</thead>

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

@ -24,7 +24,7 @@
<th>{{ trans('invoices.invoice_number') }}</th>
<th>{{ trans_choice('general.customers', 1) }}</th>
<th>{{ trans('invoices.total_price') }}</th>
<th>{{ trans('general.status') }}</th>
<th>{{ trans_choice('general.statuses', 1) }}</th>
<th>{{ trans('invoices.invoice_date') }}</th>
<th style="width: 18%;">{{ trans('general.actions') }}</th>
</tr>

4
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">
@ -34,7 +34,7 @@
<th>@sortablelink('invoice_number', trans('invoices.invoice_number'))</th>
<th>@sortablelink('customer_name', trans_choice('general.customers', 1))</th>
<th>@sortablelink('amount', trans('invoices.total_price'))</th>
<th>@sortablelink('status.name', trans('general.status'))</th>
<th>@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
<th>@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th>@sortablelink('due_at', trans('invoices.due_date'))</th>
<th style="width: 18%;">{{ trans('general.actions') }}</th>

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

@ -176,7 +176,7 @@
<thead>
<tr>
<th>{{ trans('general.date') }}</th>
<th>{{ trans('general.status') }}</th>
<th>{{ trans_choice('general.statuses', 1) }}</th>
<th>{{ trans('general.description') }}</th>
</tr>
</thead>

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">

3
resources/views/expenses/bills/index.blade.php
View File

@ -16,6 +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('vendor', $vendors, request('vendor'), ['class' => 'form-control input-filter input-sm']) !!}
{!! 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>
@ -35,7 +36,7 @@
<th class="col-md-1">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-1">@sortablelink('status.name', trans('general.status'))</th>
<th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
<th>@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th>@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-3">{{ trans('general.actions') }}</th>

2
resources/views/expenses/bills/show.blade.php
View File

@ -176,7 +176,7 @@
<thead>
<tr>
<th>{{ trans('general.date') }}</th>
<th>{{ trans('general.status') }}</th>
<th>{{ trans_choice('general.statuses', 1) }}</th>
<th>{{ trans('general.description') }}</th>
</tr>
</thead>

1
resources/views/expenses/payments/index.blade.php
View File

@ -16,6 +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('vendor', $vendors, request('vendor'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('category', $categories, request('category'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('account', $accounts, request('account'), ['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']) !!}

2
resources/views/expenses/vendors/index.blade.php vendored
View File

@ -34,7 +34,7 @@
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('email', trans('general.email'))</th>
<th>@sortablelink('phone', trans('general.phone'))</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th style="width: 15%;">{{ trans('general.actions') }}</th>
</tr>
</thead>

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

@ -34,7 +34,7 @@
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('email', trans('general.email'))</th>
<th>@sortablelink('phone', trans('general.phone'))</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th style="width: 15%;">{{ trans('general.actions') }}</th>
</tr>
</thead>

3
resources/views/incomes/invoices/index.blade.php
View File

@ -16,6 +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('customer', $customers, request('customer'), ['class' => 'form-control input-filter input-sm']) !!}
{!! 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>
@ -34,7 +35,7 @@
<th class="col-md-1">@sortablelink('invoice_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('customer_name', trans_choice('general.customers', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-1">@sortablelink('status.name', trans('general.status'))</th>
<th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
<th>@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th>@sortablelink('due_at', trans('invoices.due_date'))</th>
<th class="col-md-3">{{ trans('general.actions') }}</th>

2
resources/views/incomes/invoices/show.blade.php
View File

@ -179,7 +179,7 @@
<thead>
<tr>
<th>{{ trans('general.date') }}</th>
<th>{{ trans('general.status') }}</th>
<th>{{ trans_choice('general.statuses', 1) }}</th>
<th>{{ trans('general.description') }}</th>
</tr>
</thead>

1
resources/views/incomes/revenues/index.blade.php
View File

@ -15,6 +15,7 @@
{!! Form::open(['url' => 'incomes/revenues', 'role' => 'form', 'method' => 'GET']) !!}
<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('customer', $customers, request('customer'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('category', $categories, request('category'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('account', $accounts, request('account'), ['class' => 'form-control input-filter input-sm']) !!}

2
resources/views/items/items/index.blade.php
View File

@ -38,7 +38,7 @@
<th class="col-md-1">@sortablelink('quantity', trans_choice('items.quantities', 1))</th>
<th>@sortablelink('sale_price', trans('items.sales_price'))</th>
<th>@sortablelink('purchase_price', trans('items.purchase_price'))</th>
<th class="col-md-1">@sortablelink('enabled', trans('general.status'))</th>
<th class="col-md-1">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-2">{{ trans('general.actions') }}</th>
</tr>
</thead>

2
resources/views/settings/categories/index.blade.php
View File

@ -35,7 +35,7 @@
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('type', trans_choice('general.types', 1))</th>
<th>{{ trans('general.color') }}</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-2">{{ trans('general.actions') }}</th>
</tr>
</thead>

2
resources/views/settings/currencies/index.blade.php
View File

@ -32,7 +32,7 @@
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('code', trans('currencies.code'))</th>
<th>@sortablelink('rate', trans('currencies.rate'))</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-2">{{ trans('general.actions') }}</th>
</tr>
</thead>

2
resources/views/settings/taxes/index.blade.php
View File

@ -34,7 +34,7 @@
<tr>
<th>@sortablelink('name', trans('general.name'))</th>
<th>@sortablelink('rate', trans('taxes.rate_percent'))</th>
<th>@sortablelink('enabled', trans('general.status'))</th>
<th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-2">{{ trans('general.actions') }}</th>
</tr>
</thead>