diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 0c15eea02879..38b702387705 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -53,7 +53,6 @@ class ExpenseController extends BaseController 'entityType' => ENTITY_EXPENSE, 'datatable' => new ExpenseDatatable(), 'title' => trans('texts.expenses'), - 'sortCol' => '3', ]); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 86280d552b07..d0d0fcfad05f 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -58,7 +58,6 @@ class InvoiceController extends BaseController $data = [ 'title' => trans('texts.invoices'), 'entityType' => ENTITY_INVOICE, - 'sortCol' => '3', 'statuses' => Invoice::getStatuses(), 'datatable' => new InvoiceDatatable(), ]; diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 66ee566d76c3..de333dbb425c 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -64,7 +64,6 @@ class PaymentController extends BaseController 'entityType' => ENTITY_PAYMENT, 'datatable' => new PaymentDatatable(), 'title' => trans('texts.payments'), - 'sortCol' => '7', ]); } diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 79fbe6e98d85..d3fe5e9c0da6 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -44,7 +44,6 @@ class ProductController extends BaseController 'datatable' => new ProductDatatable(), 'title' => trans('texts.products'), 'statuses' => Product::getStatuses(), - 'sortCol' => '4', ]); } diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 9f60c1d07e1d..005da1b11d5b 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -49,7 +49,6 @@ class QuoteController extends BaseController 'title' => trans('texts.quotes'), 'entityType' => ENTITY_QUOTE, 'datatable' => $datatable, - 'sortCol' => '3', ]; return response()->view('list_wrapper', $data); diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index b43cb7cb5038..5dacd8ebdb55 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -71,7 +71,6 @@ class TaskController extends BaseController 'entityType' => ENTITY_TASK, 'datatable' => new TaskDatatable(), 'title' => trans('texts.tasks'), - 'sortCol' => '2', ]); } diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php index 180a287a2dce..effda8c55283 100644 --- a/app/Http/Controllers/VendorController.php +++ b/app/Http/Controllers/VendorController.php @@ -42,7 +42,6 @@ class VendorController extends BaseController 'entityType' => 'vendor', 'datatable' => new VendorDatatable(), 'title' => trans('texts.vendors'), - 'sortCol' => '4', ]); } diff --git a/app/Ninja/Datatables/ExpenseDatatable.php b/app/Ninja/Datatables/ExpenseDatatable.php index a279c62c9932..536e9dcbf419 100644 --- a/app/Ninja/Datatables/ExpenseDatatable.php +++ b/app/Ninja/Datatables/ExpenseDatatable.php @@ -7,6 +7,7 @@ use Auth; class ExpenseDatatable extends EntityDatatable { public $entityType = ENTITY_EXPENSE; + public $sortCol = 3; public function columns() { diff --git a/app/Ninja/Datatables/InvoiceDatatable.php b/app/Ninja/Datatables/InvoiceDatatable.php index 6efae7a9dce9..4203d47d3444 100644 --- a/app/Ninja/Datatables/InvoiceDatatable.php +++ b/app/Ninja/Datatables/InvoiceDatatable.php @@ -7,6 +7,7 @@ use Auth; class InvoiceDatatable extends EntityDatatable { public $entityType = ENTITY_INVOICE; + public $sortCol = 3; public function columns() { diff --git a/app/Ninja/Datatables/PaymentDatatable.php b/app/Ninja/Datatables/PaymentDatatable.php index faa9733ca9da..0950b4719b9e 100644 --- a/app/Ninja/Datatables/PaymentDatatable.php +++ b/app/Ninja/Datatables/PaymentDatatable.php @@ -8,6 +8,7 @@ use App\Models\PaymentMethod; class PaymentDatatable extends EntityDatatable { public $entityType = ENTITY_PAYMENT; + public $sortCol = 7; protected static $refundableGateways = [ GATEWAY_STRIPE, diff --git a/app/Ninja/Datatables/ProductDatatable.php b/app/Ninja/Datatables/ProductDatatable.php index a5b3cbfc218d..bf57064f1ad4 100644 --- a/app/Ninja/Datatables/ProductDatatable.php +++ b/app/Ninja/Datatables/ProductDatatable.php @@ -8,6 +8,7 @@ use Str; class ProductDatatable extends EntityDatatable { public $entityType = ENTITY_PRODUCT; + public $sortCol = 4; public function columns() { diff --git a/app/Ninja/Datatables/TaskDatatable.php b/app/Ninja/Datatables/TaskDatatable.php index 05283033e1c9..78647f49c5cb 100644 --- a/app/Ninja/Datatables/TaskDatatable.php +++ b/app/Ninja/Datatables/TaskDatatable.php @@ -8,6 +8,7 @@ use App\Models\Task; class TaskDatatable extends EntityDatatable { public $entityType = ENTITY_TASK; + public $sortCol = 2; public function columns() { diff --git a/app/Ninja/Datatables/VendorDatatable.php b/app/Ninja/Datatables/VendorDatatable.php index 6c56c906a339..8898f922cc46 100644 --- a/app/Ninja/Datatables/VendorDatatable.php +++ b/app/Ninja/Datatables/VendorDatatable.php @@ -7,6 +7,7 @@ use Auth; class VendorDatatable extends EntityDatatable { public $entityType = ENTITY_VENDOR; + public $sortCol = 4; public function columns() {