Merge pull request #14 from Itonomy/feature/2.3-support

Bump to version 2.0.0. Add 2.3 support.
Itonomy · Sep 23, 2020 · f95601f · f95601f
2 parents f13d802 + fcd32e7
commit f95601f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+          <title>Magento Admin - Itonomy Product Visiblity Grid</title>
+    </head>
     <body>
         <referenceContainer name="page.main.actions">
             <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" />
@@ -8,4 +11,4 @@
             <block class="Itonomy\ProductVisibilityGrid\Block\Adminhtml\ProductVisibilityGrid\Grid" name="admin.productgrid.grid"/>
         </referenceContainer>
     </body>
-</page>
+</page>