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 . '\'', [] 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 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" ], 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 +