diff --git a/config/datagrid.php b/config/datagrid.php index 44fd576ba..aeaf51a57 100644 --- a/config/datagrid.php +++ b/config/datagrid.php @@ -30,7 +30,7 @@ return [ * * Accepted Value = integer */ - 'paginate' => true, + 'paginate' => false, 'operators' => [ 'eq' => "=", diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index f01eb6c6c..029bf80b4 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -13,10 +13,10 @@ use DB; */ class AttributeDataGrid extends DataGrid { - public $allColumns = []; - protected $itemsPerPage = 5; //overriding the default items per page + protected $index = 'id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { @@ -25,11 +25,6 @@ class AttributeDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() - { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index 853efc639..a5c728b26 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -15,6 +15,8 @@ class AttributeFamilyDataGrid extends DataGrid { protected $itemsPerPage = 5; + protected $index = 'id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('attribute_families')->select('id')->addSelect('id', 'code', 'name'); @@ -22,10 +24,6 @@ class AttributeFamilyDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index baef2ba9a..a46398285 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class CategoryDataGrid extends DataGrid { + protected $index = 'category_id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('categories as cat')->select('cat.id as category_id', 'ct.name as category_name', 'cat.position as category_position', 'cat.status as category_status', 'ct.locale as category_locale')->leftJoin('category_translations as ct', 'cat.id', '=', 'ct.category_id'); @@ -20,10 +22,6 @@ class CategoryDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'category_id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 95a16529d..4c25f82da 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class ChannelDataGrid extends DataGrid { + protected $index = 'id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('channels')->addSelect('id', 'code', 'name', 'hostname'); @@ -20,10 +22,6 @@ class ChannelDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index fbb528f9f..02652f0b1 100755 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class CurrencyDataGrid extends DataGrid { + protected $index = 'id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('currencies')->addSelect('id', 'name', 'code'); @@ -20,10 +22,6 @@ class CurrencyDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 7dc7a6680..f801172a9 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -15,6 +15,8 @@ class CustomerDataGrid extends DataGrid { protected $itemsPerPage = 5; + protected $index = 'customer_id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('customers as cus')->addSelect('cus.id as customer_id', 'cus.email as customer_email', 'cg.name as customer_group_name')->addSelect(DB::raw('CONCAT(cus.first_name, " ", cus.last_name) as customer_full_name'))->leftJoin('customer_groups as cg', 'cus.customer_group_id', '=', 'cg.id'); @@ -22,10 +24,6 @@ class CustomerDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'customer_id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index b79e9b47f..746333d90 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class CustomerGroupDataGrid extends DataGrid { + protected $index = 'id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('customer_groups')->addSelect('id', 'name'); @@ -20,10 +22,6 @@ class CustomerGroupDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 12495325d..ad4a43e04 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class CustomerReviewDataGrid extends DataGrid { + protected $index = 'product_review_id'; //the column that needs to be treated as index column + public function prepareQueryBuilder() { $queryBuilder = DB::table('product_reviews as pr')->addSelect('pr.id as product_review_id', 'pr.title as product_review_title', 'pr.comment as product_review_comment', 'pg.name as product_review_name', 'pr.status as product_review_status')->leftjoin('products_grid as pg', 'pr.product_id', '=', 'pg.id'); @@ -20,10 +22,6 @@ class CustomerReviewDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'product_review_id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 46614bbbf..7d6bd7234 100755 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class ExchangeRatesDataGrid extends DataGrid { + protected $index = 'currency_exch_id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('currency_exchange_rates as cer')->addSelect('cer.id as currency_exch_id', 'curr.name as currency_exch_name', 'cer.rate as currency_exch_rate')->leftJoin('currencies as curr', 'cer.target_currency', '=', 'curr.id'); @@ -20,10 +22,6 @@ class ExchangeRatesDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'currency_exch_id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index b7bfb9ca4..0d899faa4 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class InventorySourcesDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('inventory_sources')->addSelect('id', 'code', 'name', 'priority', 'status'); @@ -20,10 +22,6 @@ class InventorySourcesDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 0d4bbc755..09900efbe 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class LocalesDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('locales')->addSelect('id', 'code', 'name'); @@ -20,10 +22,6 @@ class LocalesDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 11b654185..d733fa510 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class NewsLetterDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('subscribers_list')->addSelect('id', 'is_subscribed', 'email'); @@ -20,10 +22,6 @@ class NewsLetterDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 9fa1a5a13..205fac3ac 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class OrderDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('orders')->select('id', 'base_grand_total', 'grand_total', 'created_at', 'channel_name', 'status')->addSelect(DB::raw('CONCAT(customer_first_name, " ", customer_last_name) as full_name')); @@ -20,10 +22,6 @@ class OrderDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index 59c64a957..d3fb5a42c 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class OrderInvoicesDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'grand_total', 'created_at'); @@ -20,10 +22,6 @@ class OrderInvoicesDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index bf0d1b857..b1a1b8b46 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class OrderShipmentsDataGrid extends DataGrid { + protected $index = 'shipment_id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('shipments as ship')->select('ship.id as shipment_id', 'ship.order_id as shipment_order_id', 'ship.total_qty as shipment_total_qty', 'is.name as inventory_source_name', 'ors.created_at as orderdate', 'ship.created_at as shipment_created_at')->addSelect(DB::raw('CONCAT(ors.customer_first_name, " ", ors.customer_last_name) as custname'))->leftJoin('orders as ors', 'ship.order_id', '=', 'ors.id')->leftJoin('inventory_sources as is', 'ship.inventory_source_id', '=', 'is.id'); @@ -20,10 +22,6 @@ class OrderShipmentsDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'shipment_id'; //the column that needs to be treated as index column - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 4b53ae1b1..bf939e6a0 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class ProductDataGrid extends DataGrid { + protected $index = 'product_id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('products_grid')->addSelect('products_grid.product_id as product_id', 'products_grid.sku as product_sku', 'products_grid.name as product_name', 'products.type as product_type', 'products_grid.status as product_status', 'products_grid.price as product_price', 'products_grid.quantity as product_quantity')->leftJoin('products', 'products_grid.product_id', '=', 'products.id'); @@ -20,14 +22,6 @@ class ProductDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'product_id'; //the column that needs to be treated as index column - } - - // public function setGridName() { - // $this->gridName = 'products_grid'; // should be the table name for getting proper index - // } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 32fef4ac5..88814b9f1 100755 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class RolesDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('roles')->addSelect('id', 'name', 'permission_type'); @@ -20,10 +22,6 @@ class RolesDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 4641a7c9f..74aef6d05 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class SliderDataGrid extends DataGrid { + protected $index = 'slider_id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('sliders as sl')->addSelect('sl.id as slider_id', 'sl.title as slider_title', 'ch.name as channel_name')->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id'); @@ -20,10 +22,6 @@ class SliderDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'slider_id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index 836becefa..0098a80e6 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class TaxCategoryDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_categories')->addSelect('id', 'name', 'code'); @@ -20,10 +22,6 @@ class TaxCategoryDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index 41cf949bb..7beca667c 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class TaxRateDataGrid extends DataGrid { + protected $index = 'id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('tax_rates')->addSelect('id', 'identifier', 'state', 'country', 'tax_rate'); @@ -20,10 +22,6 @@ class TaxRateDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'id'; - } - public function addColumns() { $this->addColumn([ @@ -64,7 +62,7 @@ class TaxRateDataGrid extends DataGrid $this->addColumn([ 'index' => 'tax_rate', - 'label' => trans('admin::app.datagrid.rate'), + 'label' => trans('admin::app.datagrid.tax-rate'), 'type' => 'string', 'searchable' => true, 'sortable' => true, diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index f5070a45b..673f5937f 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -13,6 +13,8 @@ use DB; */ class UserDataGrid extends DataGrid { + protected $index = 'user_id'; + public function prepareQueryBuilder() { $queryBuilder = DB::table('admins as u')->addSelect('u.id as user_id', 'u.name as user_name', 'u.status as user_status', 'u.email as user_email', 'ro.name as role_name')->leftJoin('roles as ro', 'u.role_id', '=', 'ro.id'); @@ -20,10 +22,6 @@ class UserDataGrid extends DataGrid $this->setQueryBuilder($queryBuilder); } - public function setIndex() { - $this->index = 'user_id'; - } - public function addColumns() { $this->addColumn([ diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 0941ef104..a8c579ef1 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -27,7 +27,6 @@ abstract class DataGrid abstract public function prepareQueryBuilder(); abstract public function addColumns(); - abstract public function setIndex(); /** * Parse the URL and get it ready to be used. @@ -186,8 +185,6 @@ abstract class DataGrid { $this->addColumns(); - $this->setIndex(); - $this->prepareActions(); $this->prepareMassActions(); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index f20ebeced..5d02e4d63 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -151,7 +151,7 @@ @if(isset($results['massactions'])) - +