From ef1687b88cd0adba12169617c1f256ecc8097175 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 29 Jan 2019 13:44:27 +0530 Subject: [PATCH] default sort order on the default index of the datagrids had beenh set to descending order --- packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php | 2 ++ .../Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/UserDataGrid.php | 2 ++ 21 files changed, 42 insertions(+) diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 89837a79d..3bb2e1817 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -19,6 +19,8 @@ class AttributeDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('attributes') diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index e661a6009..9fd1fdd2d 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -19,6 +19,8 @@ class AttributeFamilyDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('attribute_families')->select('id')->addSelect('id', 'code', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 111b1fd18..33a173a26 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -19,6 +19,8 @@ class CategoryDataGrid extends DataGrid protected $index = 'category_id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('categories as cat') diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 106ed124c..716fa12c8 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -19,6 +19,8 @@ class ChannelDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('channels')->addSelect('id', 'code', 'name', 'hostname'); diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index db694db08..e83f764b6 100755 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -19,6 +19,8 @@ class CurrencyDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('currencies')->addSelect('id', 'name', 'code'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index b4ea36ff0..8b15050f0 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -19,6 +19,8 @@ class CustomerDataGrid extends DataGrid protected $index = 'customer_id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('customers as custs') diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 79e700ca7..3e96102d9 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -19,6 +19,8 @@ class CustomerGroupDataGrid extends DataGrid protected $index = 'id'; //the column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('customer_groups')->addSelect('id', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index a33fc8e74..0858b7e50 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -19,6 +19,8 @@ class CustomerReviewDataGrid extends DataGrid protected $index = 'product_review_id'; //column that needs to be treated as index column + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('product_reviews as pr') diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 4a1535534..ad535bc79 100755 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -19,6 +19,8 @@ class ExchangeRatesDataGrid extends DataGrid protected $index = 'currency_exch_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('currency_exchange_rates as cer')->addSelect('cer.id as currency_exch_id', 'curr.name', 'cer.rate')->leftJoin('currencies as curr', 'cer.target_currency', '=', 'curr.id'); diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 3d3dc3b7a..a29d80480 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -19,6 +19,8 @@ class InventorySourcesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('inventory_sources')->addSelect('id', 'code', 'name', 'priority', 'status'); diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 76cfe699e..4bc3a5ecc 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -19,6 +19,8 @@ class LocalesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('locales')->addSelect('id', 'code', 'name'); diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 4cded8a4a..999dcbc5e 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -19,6 +19,8 @@ class NewsLetterDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('subscribers_list')->addSelect('id', 'is_subscribed', 'email'); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 3c4a8e4ed..a4dff89c3 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -19,6 +19,8 @@ class OrderDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('orders')->select('id', 'base_sub_total', 'base_grand_total', 'created_at', 'channel_name', 'status')->addSelect(DB::raw('CONCAT(customer_first_name, " ", customer_last_name) as full_name')); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index c12dfd4ea..8b4db58c8 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -19,6 +19,8 @@ class OrderInvoicesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'grand_total', 'created_at'); diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index e10c78f79..bbf9be8fc 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -19,6 +19,8 @@ class OrderShipmentsDataGrid extends DataGrid protected $index = 'shipment_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('shipments as ship') diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 2aa1d2214..1b7af6ec8 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -17,6 +17,8 @@ class ProductDataGrid extends DataGrid protected $itemsPerPage = 10; //overriding the default items per page + protected $sortOrder = 'desc'; //asc or desc + protected $index = 'product_id'; public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 47669cf56..856446021 100755 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -19,6 +19,8 @@ class RolesDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('roles')->addSelect('id', 'name', 'permission_type'); diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 2c7eb4124..94c3d7937 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -19,6 +19,8 @@ class SliderDataGrid extends DataGrid protected $index = 'slider_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('sliders as sl')->addSelect('sl.id as slider_id', 'sl.title', 'ch.name')->leftJoin('channels as ch', 'sl.channel_id', '=', diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index fedffa723..d963610b4 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -19,6 +19,8 @@ class TaxCategoryDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_categories')->addSelect('id', 'name', 'code'); diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index 5196bf813..03f1066ee 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -19,6 +19,8 @@ class TaxRateDataGrid extends DataGrid protected $index = 'id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_rates')->addSelect('id', 'identifier', 'state', 'country', 'tax_rate'); diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 31fd8d7b3..60e900f46 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -19,6 +19,8 @@ class UserDataGrid extends DataGrid protected $index = 'user_id'; + protected $sortOrder = 'desc'; //asc or desc + public function prepareQueryBuilder() { $queryBuilder = DB::table('admins as u')->addSelect('u.id as user_id', 'u.name as user_name', 'u.status', 'u.email', 'ro.name as role_name')->leftJoin('roles as ro', 'u.role_id', '=', 'ro.id');