From c23dc3fa85c370d6ecb1ed397bedc30983ba0c08 Mon Sep 17 00:00:00 2001
From: tuyennn <thinghost76@gmail.com>
Date: Sun, 26 May 2019 18:36:05 +0700
Subject: [PATCH] [BUG] Fix wrong configuration on last change

---
 .../Product/DataProviderPlugin.php            | 63 +++++++++++++++++++
 README.md                                     |  2 +-
 composer.json                                 |  2 +-
 etc/adminhtml/di.xml                          |  3 +
 etc/adminhtml/system.xml                      | 40 ++++++------
 etc/module.xml                                |  2 +-
 6 files changed, 89 insertions(+), 23 deletions(-)
 create mode 100644 Plugin/Ui/DataProvider/Product/DataProviderPlugin.php

diff --git a/Plugin/Ui/DataProvider/Product/DataProviderPlugin.php b/Plugin/Ui/DataProvider/Product/DataProviderPlugin.php
new file mode 100644
index 0000000..6501422
--- /dev/null
+++ b/Plugin/Ui/DataProvider/Product/DataProviderPlugin.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace GhoSter\AutoInstagramPost\Plugin\Ui\DataProvider\Product;
+
+use Magento\Framework\DB\Select;
+use Magento\Framework\Api\Filter;
+use GhoSter\AutoInstagramPost\Ui\DataProvider\Product\DataProvider;
+
+/**
+ * Class DataProviderPlugin
+ * @package GhoSter\AutoInstagramPost\Plugin\Ui\DataProvider\Product
+ */
+class DataProviderPlugin
+{
+    /**
+     * @param DataProvider $subject
+     * @param callable $proceed
+     * @param Filter $filter
+     * @throws \Zend_Db_Select_Exception
+     */
+    public function aroundAddFilter(
+        DataProvider $subject,
+        callable $proceed,
+        Filter $filter
+    ) {
+
+        $proceed($filter);
+
+        if ($filter->getField() == 'posted_to_instagram') {
+            $collection = $subject->getCollection();
+            $select = $collection->getSelect();
+            $partsFrom = $select->getPart(Select::FROM);
+
+            if (isset($partsFrom['at_posted_to_instagram'])) {
+                if ($whereParts = $select->getPart(Select::WHERE)) {
+                    foreach ($whereParts as $key => $wherePartItem) {
+                        $whereParts[$key] = $this->_replaceFilterCondition($wherePartItem);
+                    }
+                    $select->setPart(Select::WHERE, $whereParts);
+                }
+            }
+        }
+    }
+
+    /**
+     * Replace table alias in condition string
+     *
+     * @param string|null $conditionString
+     * @return string|null
+     */
+    protected function _replaceFilterCondition($conditionString)
+    {
+        if ($conditionString === null) {
+            return null;
+        }
+
+        if ($conditionString == "(at_posted_to_instagram.value = '0')") {
+            $conditionString = "(at_posted_to_instagram.value = '0' OR at_posted_to_instagram.value IS NULL)";
+        }
+
+        return $conditionString;
+    }
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index f4e0849..8574458 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This Magento 2 extension Auto Instagram Post allows you add your products immedi
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bf0757d0063e489eb3bff2479964fce2)](https://www.codacy.com/app/GhoSterInc/AutoInstagramPost?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tuyennn/AutoInstagramPost&amp;utm_campaign=Badge_Grade)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/thinghost)
-![Version 1.1.5](https://img.shields.io/badge/Version-1.1.5-green.svg)
+![Version 1.1.5](https://img.shields.io/badge/Version-1.1.6-green.svg)
 
 ---
 ## [![Alt GhoSter](http://thinghost.info/wp-content/uploads/2015/12/ghoster.png "thinghost.info")](http://thinghost.info) Overview
diff --git a/composer.json b/composer.json
index 59619e4..02298aa 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
 
     },
     "type": "magento2-module",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index fdf19a9..d89d51b 100644
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -31,4 +31,7 @@
     <type name="Magento\Backend\Model\Menu\Builder">
         <plugin name="GhoSter_AutoInstagramPost::disable_manage_menu_depends_module_status" type="GhoSter\AutoInstagramPost\Plugin\Model\Menu\BuilderPlugin"/>
     </type>
+    <type name="GhoSter\AutoInstagramPost\Ui\DataProvider\Product\DataProvider">
+        <plugin name="GhoSter_AutoInstagramPost::fix_filter_ui_component_boolean" type="GhoSter\AutoInstagramPost\Plugin\Ui\DataProvider\Product\DataProviderPlugin"/>
+    </type>
 </config>
\ No newline at end of file
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 5775373..8f6fedd 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
             <resource>GhoSter_AutoInstagramPost::config</resource>
             <group id="general" translate="label" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>General Settings</label>
-                <field id="enable" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enable Auto Instagram</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
@@ -18,7 +18,7 @@
                     <label>Username(Instagram Account)</label>
                     <frontend_class>required-entry</frontend_class>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                     <validate>required-entry</validate>
                 </field>
@@ -26,7 +26,7 @@
                     <label>Password</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                     <validate>required-entry</validate>
                 </field>
@@ -35,7 +35,7 @@
                     <label/>
                     <comment><![CDATA[This action will try to use your provided data to login with Instagram API]]></comment>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="upload_image_id" translate="label comment" type="image" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -44,7 +44,7 @@
                     <base_url type="media" scope_info="1">instagram</base_url>
                     <comment><![CDATA[Default Image will be uploaded when product have no Image available. Recommended 800x800 px]]></comment>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                     <validate>required-entry</validate>
                 </field>
@@ -52,17 +52,17 @@
                     <label>Allow auto posting to Instagram after Saving Product</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
             </group>
             <group id="comment_hashtag" translate="label" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Images Description Settings</label>
-                <field id="enable" translate="label" type="select" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label" type="select" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enable Auto Hashtag and Description</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="*/general/enable">1</field>
+                        <field id="*/general/enabled">1</field>
                     </depends>
                 </field>
                 <field id="product_description" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -70,8 +70,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Description on Instagram Post should be generated from product description]]></comment>
                     <depends>
-                        <field id="*/general/enable">1</field>
-                        <field id="enable">1</field>
+                        <field id="*/general/enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="category_hashtag" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -79,16 +79,16 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Hashtag on Instagram Post should be generated from categories which product belongs]]></comment>
                     <depends>
-                        <field id="*/general/enable">1</field>
-                        <field id="enable">1</field>
+                        <field id="*/general/enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="enable_custom" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Add Custom Hashtags</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="*/general/enable">1</field>
-                        <field id="enable">1</field>
+                        <field id="*/general/enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="hashtag" translate="label" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -97,8 +97,8 @@
                     <backend_model>GhoSter\AutoInstagramPost\Model\Config\Backend\Hashtag</backend_model>
                     <comment><![CDATA[Hashtag on Instagram Post should include these custom, no need to add # before hashtag, value should be stripped and remove spaces]]></comment>
                     <depends>
-                        <field id="*/general/enable">1</field>
-                        <field id="enable">1</field>
+                        <field id="*/general/enabled">1</field>
+                        <field id="enabled">1</field>
                         <field id="enable_custom">1</field>
                     </depends>
                 </field>
@@ -106,8 +106,8 @@
                     <label>Description Template</label>
                     <comment><![CDATA[{{CUSTOMHASTAG}} {{CATEGORYHASHTAG}} {{PRODUCTDESC}} {{PRODUCTNAME}}</br>Instagram caption character limit: 2,200 characters</br>Instagram hashtag limit: 30 hashtags</br>Instagram bio character limit: 150 characters]]></comment>
                     <depends>
-                        <field id="*/general/enable">1</field>
-                        <field id="enable">1</field>
+                        <field id="*/general/enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
             </group>
@@ -117,7 +117,7 @@
                     <label>Enable Scheduled Auto Post</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
-                        <field id="*/general/enable">1</field>
+                        <field id="*/general/enabled">1</field>
                     </depends>
                 </field>
                 <field id="time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -137,7 +137,7 @@
                 <field id="limit" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Limit Number of Posts</label>
                     <depends>
-                        <field id="enable">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                     <validate>validate-zero-or-greater</validate>
                 </field>
diff --git a/etc/module.xml b/etc/module.xml
index aaf3b87..cffdd8b 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="GhoSter_AutoInstagramPost" setup_version="1.1.5"/>
+    <module name="GhoSter_AutoInstagramPost" setup_version="1.1.6"/>
 </config>
\ No newline at end of file