diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 152d4efdd..8f4a59b17 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -29,7 +29,7 @@ class Bill extends Model * * @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. diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 8b5074b1f..bde54d06a 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -37,7 +37,7 @@ class Invoice extends Model * * @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. diff --git a/config/columnsortable.php b/config/columnsortable.php index 7d9f8cdd6..cb55aa195 100644 --- a/config/columnsortable.php +++ b/config/columnsortable.php @@ -7,7 +7,7 @@ return [ */ 'columns' => [ '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', ], 'amount' => [ diff --git a/resources/views/expenses/bills/index.blade.php b/resources/views/expenses/bills/index.blade.php index f1936972a..278e76be2 100644 --- a/resources/views/expenses/bills/index.blade.php +++ b/resources/views/expenses/bills/index.blade.php @@ -39,7 +39,7 @@