From 449518e4b472aeeff75e5a74e0eeb99b907e47e7 Mon Sep 17 00:00:00 2001
From: Fahim <fahim@pop-os.localdomain>
Date: Fri, 6 Aug 2021 01:11:40 +0600
Subject: [PATCH] Updated: DataTable Sorting Condition

---
 app/DataTables/CurrencyDataTable.php          | 7 +++++--
 app/DataTables/CustomersDataTable.php         | 7 +++++--
 app/DataTables/ExpenseCategoriesDataTable.php | 5 ++++-
 app/DataTables/ExpensesDataTable.php          | 7 +++++--
 app/DataTables/ProductCategoriesDataTable.php | 8 +++++++-
 app/DataTables/ProductDataTable.php           | 7 +++++--
 app/DataTables/RolesDataTable.php             | 7 +++++--
 app/DataTables/SalesDataTable.php             | 6 +++++-
 app/DataTables/SuppliersDataTable.php         | 7 +++++--
 app/DataTables/UsersDataTable.php             | 5 ++++-
 10 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/app/DataTables/CurrencyDataTable.php b/app/DataTables/CurrencyDataTable.php
index 8d6af85e..92cd8c21 100644
--- a/app/DataTables/CurrencyDataTable.php
+++ b/app/DataTables/CurrencyDataTable.php
@@ -32,7 +32,7 @@ class CurrencyDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                         'tr' .
                                         <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(0)
+            ->orderBy(6)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -65,7 +65,10 @@ class CurrencyDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/CustomersDataTable.php b/app/DataTables/CustomersDataTable.php
index 9680ab63..be651594 100644
--- a/app/DataTables/CustomersDataTable.php
+++ b/app/DataTables/CustomersDataTable.php
@@ -33,7 +33,7 @@ class CustomersDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                        'tr' .
                                  <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(1)
+            ->orderBy(4)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -60,7 +60,10 @@ class CustomersDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/ExpenseCategoriesDataTable.php b/app/DataTables/ExpenseCategoriesDataTable.php
index a67bc566..fbc9f6b5 100644
--- a/app/DataTables/ExpenseCategoriesDataTable.php
+++ b/app/DataTables/ExpenseCategoriesDataTable.php
@@ -32,7 +32,7 @@ class ExpenseCategoriesDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(0, 'asc')
+            ->orderBy(4)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -60,6 +60,9 @@ class ExpenseCategoriesDataTable extends DataTable
                 ->exportable(false)
                 ->printable(false)
                 ->addClass('text-center'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/ExpensesDataTable.php b/app/DataTables/ExpensesDataTable.php
index d460c555..1be7299b 100644
--- a/app/DataTables/ExpensesDataTable.php
+++ b/app/DataTables/ExpensesDataTable.php
@@ -35,7 +35,7 @@ class ExpensesDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(1)
+            ->orderBy(6)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -69,7 +69,10 @@ class ExpensesDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/ProductCategoriesDataTable.php b/app/DataTables/ProductCategoriesDataTable.php
index 1c499fe2..09472f33 100644
--- a/app/DataTables/ProductCategoriesDataTable.php
+++ b/app/DataTables/ProductCategoriesDataTable.php
@@ -32,7 +32,7 @@ class ProductCategoriesDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(0, 'asc')
+            ->orderBy(4)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -49,14 +49,20 @@ class ProductCategoriesDataTable extends DataTable
         return [
             Column::make('category_code')
                 ->addClass('text-center'),
+
             Column::make('category_name')
                 ->addClass('text-center'),
+
             Column::make('products_count')
                 ->addClass('text-center'),
+
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
                 ->addClass('text-center'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/ProductDataTable.php b/app/DataTables/ProductDataTable.php
index 322ed9b1..8737d20e 100644
--- a/app/DataTables/ProductDataTable.php
+++ b/app/DataTables/ProductDataTable.php
@@ -43,7 +43,7 @@ class ProductDataTable extends DataTable
                     ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-                    ->orderBy(0)
+                    ->orderBy(7)
                     ->buttons(
                         Button::make('excel')
                             ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -86,7 +86,10 @@ class ProductDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/RolesDataTable.php b/app/DataTables/RolesDataTable.php
index c9238bc5..b2533e55 100644
--- a/app/DataTables/RolesDataTable.php
+++ b/app/DataTables/RolesDataTable.php
@@ -40,7 +40,7 @@ class RolesDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(1)
+            ->orderBy(4)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -72,7 +72,10 @@ class RolesDataTable extends DataTable
                 ->exportable(false)
                 ->printable(false)
                 ->addClass('text-center')
-                ->addClass('align-middle')
+                ->addClass('align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/SalesDataTable.php b/app/DataTables/SalesDataTable.php
index 326d66e0..01f3d616 100644
--- a/app/DataTables/SalesDataTable.php
+++ b/app/DataTables/SalesDataTable.php
@@ -47,6 +47,7 @@ class SalesDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
+            ->orderBy(8)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -86,7 +87,10 @@ class SalesDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/SuppliersDataTable.php b/app/DataTables/SuppliersDataTable.php
index 3c15d229..60fc55fa 100644
--- a/app/DataTables/SuppliersDataTable.php
+++ b/app/DataTables/SuppliersDataTable.php
@@ -33,7 +33,7 @@ class SuppliersDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                         'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(1)
+            ->orderBy(4)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -60,7 +60,10 @@ class SuppliersDataTable extends DataTable
             Column::computed('action')
                 ->exportable(false)
                 ->printable(false)
-                ->className('text-center align-middle')
+                ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }
 
diff --git a/app/DataTables/UsersDataTable.php b/app/DataTables/UsersDataTable.php
index aaff1c21..ed2a53c4 100644
--- a/app/DataTables/UsersDataTable.php
+++ b/app/DataTables/UsersDataTable.php
@@ -56,7 +56,7 @@ class UsersDataTable extends DataTable
             ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> .
                                 'tr' .
                                 <'row'<'col-md-5'i><'col-md-7 mt-2'p>>")
-            ->orderBy(1)
+            ->orderBy(6)
             ->buttons(
                 Button::make('excel')
                     ->text('<i class="bi bi-file-earmark-excel-fill"></i> Excel'),
@@ -90,6 +90,9 @@ class UsersDataTable extends DataTable
                 ->exportable(false)
                 ->printable(false)
                 ->className('text-center align-middle'),
+
+            Column::make('created_at')
+                ->visible(false)
         ];
     }