From e3e6a0862b8947b837adf19a46f090bc250982cb Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 7 Feb 2018 15:55:17 +0300
Subject: [PATCH] fixed #177

---
 app/Models/Expense/Bill.php                      | 2 +-
 app/Models/Income/Invoice.php                    | 2 +-
 config/columnsortable.php                        | 2 +-
 resources/views/expenses/bills/index.blade.php   | 2 +-
 resources/views/incomes/invoices/index.blade.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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 @@
                         <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('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>
                     </tr>
                 </thead>
diff --git a/resources/views/incomes/invoices/index.blade.php b/resources/views/incomes/invoices/index.blade.php
index 127f236ab..66f863cc2 100644
--- a/resources/views/incomes/invoices/index.blade.php
+++ b/resources/views/incomes/invoices/index.blade.php
@@ -38,7 +38,7 @@
                         <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('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>
                     </tr>
                 </thead>