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

fixed #177

Browse Source
This commit is contained in:
denisdulici 2018-02-07 15:55:17 +03:00
parent d6540a3c8f
commit e3e6a0862b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Expense/Bill.php
View File

@ -29,7 +29,7 @@ class Bill extends Model
* *
* @var array * @var array
*/ */
public $sortable = ['bill_number', 'vendor_name', 'amount', 'status.name', 'billed_at', 'due_at']; public $sortable = ['bill_number', 'vendor_name', 'amount', 'status.name', 'billed_at', 'due_at', 'bill_status_code'];
/** /**
* Searchable rules. * Searchable rules.

2
app/Models/Income/Invoice.php
View File

@ -37,7 +37,7 @@ class Invoice extends Model
* *
* @var array * @var array
*/ */
public $sortable = ['invoice_number', 'customer_name', 'amount', 'status' , 'invoiced_at', 'due_at']; public $sortable = ['invoice_number', 'customer_name', 'amount', 'status' , 'invoiced_at', 'due_at', 'invoice_status_code'];
/** /**
* Searchable rules. * Searchable rules.

2
config/columnsortable.php
View File

@ -7,7 +7,7 @@ return [
*/ */
'columns' => [ 'columns' => [
'alpha' => [ 'alpha' => [
'rows' => ['name', 'customer_name', 'vendor_name', 'display_name', 'company_name', 'domain', 'email', 'description', 'code', 'type', 'status', 'vendor', 'account'], 'rows' => ['name', 'customer_name', 'vendor_name', 'display_name', 'company_name', 'domain', 'email', 'description', 'code', 'type', 'status', 'vendor', 'account', 'bill_status_code', 'invoice_status_code'],
'class' => 'fa fa-sort-alpha', 'class' => 'fa fa-sort-alpha',
], ],
'amount' => [ 'amount' => [

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

@ -39,7 +39,7 @@
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th> <th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th> <th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th> <th class="col-md-1">@sortablelink('bill_status_code', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th> <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>

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

@ -38,7 +38,7 @@
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th> <th class="col-md-2">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('invoices.due_date'))</th> <th class="col-md-2">@sortablelink('due_at', trans('invoices.due_date'))</th>
<th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th> <th class="col-md-1">@sortablelink('invoice_status_code', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th> <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>