From d48fe8d43557fc9b0a03a0a3f10236b0df0e3817 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 11 Sep 2019 12:59:51 +0530 Subject: [PATCH] Removed setInvoker method and allowed property to get set in Datagrid's constructor. --- .../Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 2 -- .../Admin/src/DataGrids/AttributeFamilyDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CMSPageDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CartRuleDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/ChannelDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CurrencyDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 2 -- .../Admin/src/DataGrids/CustomerGroupDataGrid.php | 2 -- .../Admin/src/DataGrids/CustomerReviewDataGrid.php | 2 -- .../Admin/src/DataGrids/ExchangeRatesDataGrid.php | 2 -- .../Admin/src/DataGrids/InventorySourcesDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/LocalesDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php | 2 -- packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php | 2 -- .../Admin/src/DataGrids/OrderInvoicesDataGrid.php | 2 -- .../Admin/src/DataGrids/OrderShipmentsDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/ProductDataGrid.php | 2 -- packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php | 2 -- packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php | 2 -- .../Webkul/Admin/src/DataGrids/TaxRateDataGrid.php | 2 -- packages/Webkul/Admin/src/DataGrids/UserDataGrid.php | 2 -- packages/Webkul/Ui/src/DataGrid/DataGrid.php | 10 +++++----- 25 files changed, 5 insertions(+), 53 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 411c7422a..1ab36e2a4 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -28,8 +28,6 @@ class AttributeDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index d0b1b0c5f..b0d4141cb 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -26,8 +26,6 @@ class AttributeFamilyDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 5c5287ce1..6e827af96 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -30,8 +30,6 @@ class CMSPageDataGrid extends DataGrid $locales = app('Webkul\Core\Repositories\LocaleRepository'); - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index dcd3039c5..7eb57ffd7 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -28,8 +28,6 @@ class CartRuleDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php index 78bcc54fe..506af12eb 100644 --- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php @@ -28,8 +28,6 @@ class CatalogRuleDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 29f84b5bc..7073e047c 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -37,8 +37,6 @@ class CategoryDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'category_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 310f5b8f9..faddf7634 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -26,8 +26,6 @@ class ChannelDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index 584a8dc7b..48810b6e8 100755 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -26,8 +26,6 @@ class CurrencyDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 38a8b9110..d6a38b188 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -34,8 +34,6 @@ class CustomerDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'customer_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 4f60e92dc..4f3698690 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -26,8 +26,6 @@ class CustomerGroupDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => 'ID', diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 8f8b20067..6fe1cc2f5 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -34,8 +34,6 @@ class CustomerReviewDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'product_review_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index e640e53b2..3357b34fc 100755 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -28,8 +28,6 @@ class ExchangeRatesDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'currency_exch_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 2e22971c4..018eb784a 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -26,8 +26,6 @@ class InventorySourcesDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index d17d25026..3a779b910 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -26,8 +26,6 @@ class LocalesDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 69c76a37a..acf76450c 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -26,8 +26,6 @@ class NewsLetterDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index a0154631c..6ff33c4ee 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -42,8 +42,6 @@ class OrderDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index e6136bdd3..ae11bfa55 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -26,8 +26,6 @@ class OrderInvoicesDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index e1be10ce5..55eeb9423 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -42,8 +42,6 @@ class OrderShipmentsDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'shipment_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 812f7c3d8..efba323be 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -42,8 +42,6 @@ class ProductDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'product_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index bbba4cee3..1dde27f2e 100755 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -26,8 +26,6 @@ class RolesDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 263dfc098..830bd003c 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -30,8 +30,6 @@ class SliderDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'slider_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index 94c4dd13b..948fc6372 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -26,8 +26,6 @@ class TaxCategoryDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index ed7dfa240..cf071adb8 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -26,8 +26,6 @@ class TaxRateDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 9a60fbecf..e145de46a 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -30,8 +30,6 @@ class UserDataGrid extends DataGrid public function addColumns() { - $this->setInvoker($this); - $this->addColumn([ 'index' => 'user_id', 'label' => trans('admin::app.datagrid.id'), diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index a82cfdc49..8866a406d 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -139,6 +139,11 @@ abstract class DataGrid abstract public function prepareQueryBuilder(); abstract public function addColumns(); + public function __construct() + { + $this->invoker = $this; + } + /** * Parse the URL and get it ready to be used. */ @@ -420,11 +425,6 @@ abstract class DataGrid public function prepareActions() { } - public function setInvoker($object) - { - $this->invoker = $object; - } - public function render() { $this->addColumns();