diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index d2428ade5..30a3173f5 100755 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -266,6 +266,20 @@ class Product { } public function findRepeated() { + //find if there is duplicacy in the products grid here + } + /** + * Take action for attribute creation + */ + public function createColumnBasedOnAttribute($attribute) { + dd($attribute); + } + + /** + * Take action for attribute updatation + */ + public function updateColumnBasedOnAttribute($attribute) { + dd($attribute); } } \ No newline at end of file diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 2bf786338..7d47d9c93 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -222,7 +222,7 @@ abstract class DataGrid } } } - dd($collection->toSql()); + return $collection; } 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 95939b233..5869dc75c 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -654,7 +654,10 @@ select() { this.allSelected = false; - this.massActionsToggle = true; + if(this.dataIds.length == 0) + this.massActionsToggle = false; + else + this.massActionsToggle = true; }, //triggered when master checkbox is clicked