From 30dc4b4f1f013ff084917eb43e036178eee7783a Mon Sep 17 00:00:00 2001 From: Robin Rijkeboer Date: Wed, 23 Sep 2020 16:55:33 +0200 Subject: [PATCH 1/4] Apply patch from issue #13 for 2.3 compatability --- Model/ResourceModel/ProductVisibilityGrid/Collection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/ResourceModel/ProductVisibilityGrid/Collection.php b/Model/ResourceModel/ProductVisibilityGrid/Collection.php index ab6ff07..58b8960 100644 --- a/Model/ResourceModel/ProductVisibilityGrid/Collection.php +++ b/Model/ResourceModel/ProductVisibilityGrid/Collection.php @@ -240,7 +240,7 @@ protected function _addAttribute($name) // Join with default value table for the attribute. $select->joinLeft( [$table => $this->getTable('catalog_product_entity') . '_' . $attributeType], - $table . '.entity_id = main_table.entity_id' + $table . '.value_id= main_table.entity_id' . ' AND ' . $table . '.attribute_id = \'' . $attributeId . '\'' . ' AND ' . $table . '.store_id = \'' . Store::DEFAULT_STORE_ID . '\'', [] @@ -252,7 +252,7 @@ protected function _addAttribute($name) // Join with store value table for the attribute. $select->joinLeft( [$tableStore => $this->getTable('catalog_product_entity') . '_' . $attributeType], - $tableStore . '.entity_id = main_table.entity_id' + $tableStore . '.value_id = main_table.entity_id' . ' AND ' . $tableStore . '.attribute_id = \'' . $attributeId . '\'' . ' AND ' . $tableStore . '.store_id = \'' . $this->storeId . '\'', [] From 595474ec18f7e9e22d1f490f4717a8f8e96452d7 Mon Sep 17 00:00:00 2001 From: Robin Rijkeboer Date: Wed, 23 Sep 2020 16:57:42 +0200 Subject: [PATCH 2/4] Add title to page requested by #12 --- view/adminhtml/layout/productvisibility_index_grid.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/view/adminhtml/layout/productvisibility_index_grid.xml b/view/adminhtml/layout/productvisibility_index_grid.xml index cfdd2d0..0104825 100644 --- a/view/adminhtml/layout/productvisibility_index_grid.xml +++ b/view/adminhtml/layout/productvisibility_index_grid.xml @@ -1,5 +1,8 @@ + + Magento Admin - Itonomy Product Visiblity Grid + @@ -8,4 +11,4 @@ - \ No newline at end of file + From e2206244b018c740d8b86ee1150dc896e35d9a28 Mon Sep 17 00:00:00 2001 From: Robin Rijkeboer Date: Wed, 23 Sep 2020 16:59:43 +0200 Subject: [PATCH 3/4] Bump to version 2.0 Compatibility with 2.0/2.1/2.2 is not guaranteed anymore. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 096f9e0..4c11b78 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,13 @@ "description": "", "require": { "php": ">=7.0", - "magento/framework": ">=101.0.0" + "magento/framework": ">=102.0.0" }, "suggest": { }, "type": "magento2-module", - "version": "1.0.8", + "version": "2.0.0", "license": [ "MIT" ], From fcd32e723c28327e05b365d6099862ce5de6c039 Mon Sep 17 00:00:00 2001 From: Robin Rijkeboer Date: Wed, 23 Sep 2020 17:01:18 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ba9087d..dc08159 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This grid will make your life easier. It shows the different "visibility conditi # Requirements -- Magento: >= 2.2 +- Magento: >= 2.3 - PHP: >= 7.0 - Composer @@ -62,6 +62,7 @@ Feel free to contribute and if there are any problems don't hesitate to open an - Updated to version 1.0.6 Fix SQL error when no products are in Magento - Updated to version 1.0.7 Fix for 2.1.8 support and fix for null values in "visible in category" - Updated to version 1.0.8 Update some documentation, minor fixes. +- Updated to version 2.0.0 Magento 2.3 compatablity. Magento 2.2 support is dropped. Fixed #12 and #13 ## Credits