From 2a71802d604504054a808ff486728428920680be Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Wed, 22 Sep 2021 18:04:43 +0700
Subject: [PATCH 01/12] - Fix Proxy

---
 Helper/EmailMarketing.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
index f4809ab..b9f19c9 100755
--- a/Helper/EmailMarketing.php
+++ b/Helper/EmailMarketing.php
@@ -1697,9 +1697,9 @@ public function sendRequestProxy($data)
 
         if ($this->_request->getMethod() === 'POST') {
             $body = $this->setHeaders($data, $url);
-            $this->_curl->post($this->url, $body);
+            $this->_curl->post($url, $body);
         } else {
-            $this->_curl->get($this->url);
+            $this->_curl->get($url);
         }
 
         $body        = $this->_curl->getBody();

From 73abbf9bafd077babeca011cac52c1bbdb9fdc24 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Fri, 24 Sep 2021 11:20:38 +0700
Subject: [PATCH 02/12] - Fix proxy

---
 Controller/Proxy/Index.php | 13 +++++++++++--
 Helper/EmailMarketing.php  | 19 +++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Controller/Proxy/Index.php b/Controller/Proxy/Index.php
index 22ab1e5..8ef3a40 100644
--- a/Controller/Proxy/Index.php
+++ b/Controller/Proxy/Index.php
@@ -61,8 +61,17 @@ public function __construct(
     public function execute()
     {
         try {
-            $params   = $this->getRequest()->getParams();
-            $response = $this->helperEmailMarketing->sendRequestProxy($params);
+            $params = $this->getRequest()->getParams();
+            $url    = EmailMarketing::PROXY_URL;
+            if (isset($params['path'])) {
+                $url = EmailMarketing::PROXY_URL . $params['path'];
+            }
+
+            if ($this->_request->getMethod() === 'GET') {
+                return $this->_redirect($url);
+            }
+
+            $response = $this->helperEmailMarketing->sendRequestProxy($url, $params);
         } catch (Exception $e) {
             $response = [];
         }
diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
index b9f19c9..110330d 100755
--- a/Helper/EmailMarketing.php
+++ b/Helper/EmailMarketing.php
@@ -1680,27 +1680,18 @@ public function isTracking($storeId = null)
     }
 
     /**
-     * @param array $data
+     * @param string $url
+     * @param array|null $data
      *
      * @return mixed
-     * @throws LocalizedException
      * @throws NoSuchEntityException
      */
-    public function sendRequestProxy($data)
+    public function sendRequestProxy($url, $data)
     {
-        $url = self::PROXY_URL;
-        if (isset($data['path'])) {
-            $url = self::PROXY_URL . $data['path'];
-        }
-
         $this->initCurl();
 
-        if ($this->_request->getMethod() === 'POST') {
-            $body = $this->setHeaders($data, $url);
-            $this->_curl->post($url, $body);
-        } else {
-            $this->_curl->get($url);
-        }
+        $body = $this->setHeaders($data, $url);
+        $this->_curl->post($url, $body);
 
         $body        = $this->_curl->getBody();
         $bodyData    = self::jsonDecode($body);

From b12c0f7de3ceea1bc91088e301a543005608b6e5 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Tue, 28 Sep 2021 16:46:18 +0700
Subject: [PATCH 03/12] - Fix bug

---
 Model/Config/Source/SyncType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/Config/Source/SyncType.php b/Model/Config/Source/SyncType.php
index 57cd7d7..fb09bd7 100755
--- a/Model/Config/Source/SyncType.php
+++ b/Model/Config/Source/SyncType.php
@@ -56,7 +56,7 @@ public function toOptionArray()
             ],
             [
                 'value' => self::ALL,
-                'label' => __('Every Thing')
+                'label' => __('Everything')
             ]
         ];
 

From 888df0580111f303ccd1512ec9f095547ae6f4d3 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Tue, 28 Sep 2021 17:34:21 +0700
Subject: [PATCH 04/12] - Update Sync

---
 .../system/config/sync-template.phtml         | 38 ++++++++++++++++---
 view/adminhtml/web/js/model/sync.js           | 19 +++++++---
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/view/adminhtml/templates/system/config/sync-template.phtml b/view/adminhtml/templates/system/config/sync-template.phtml
index 42c54f2..dc99b6d 100644
--- a/view/adminhtml/templates/system/config/sync-template.phtml
+++ b/view/adminhtml/templates/system/config/sync-template.phtml
@@ -26,12 +26,9 @@ use Mageplaza\Smtp\Helper\Data;
 ?>
 <div class="actions actions-test-email" id="<?= /* @noEscape */ $block->getElementId() ?>">
     <div id="mp-sync">
-        <div id="progress-content" style="display: none">
+        <div id="progress-content" class="progress-content" style="display: none">
             <p class="text-right">
                 <span id="syncing" class="syncing"><?= $block->escapeHtml(__('Syncing...')) ?></span>
-                <span id="syncing-1" class="syncing"><?= $block->escapeHtml(__('Syncing Customers...')) ?></span>
-                <span id="syncing-2" class="syncing"><?= $block->escapeHtml(__('Syncing Orders...')) ?></span>
-                <span id="syncing-3" class="syncing"><?= $block->escapeHtml(__('Syncing Subscribers...')) ?></span>
                 <span id="sync-percent">0%</span>
             </p>
             <div class="progress">
@@ -39,7 +36,38 @@ use Mageplaza\Smtp\Helper\Data;
                 </div>
             </div>
         </div>
+        <div id="progress-content-1" class="progress-content" style="display: none">
+            <p class="text-right">
+                <span id="syncing-1" class="syncing"><?= $block->escapeHtml(__('Syncing Customers...')) ?></span>
+                <span id="sync-percent-1">0%</span>
+            </p>
+            <div class="progress">
+                <div class="progress-bar-1 progress-bar-sync">
+                </div>
+            </div>
+        </div>
 
+        <div id="progress-content-2" class="progress-content" style="display: none">
+            <p class="text-right">
+                <span id="syncing-2" class="syncing"><?= $block->escapeHtml(__('Syncing Orders...')) ?></span>
+                <span id="sync-percent-2">0%</span>
+            </p>
+            <div class="progress">
+                <div class="progress-bar-2 progress-bar-sync">
+                </div>
+            </div>
+        </div>
+
+        <div id="progress-content-3" class="progress-content" style="display: none">
+            <p class="text-right">
+                <span id="syncing-3" class="syncing"><?= $block->escapeHtml(__('Syncing Subscribers...')) ?></span>
+                <span id="sync-percent-3">0%</span>
+            </p>
+            <div class="progress">
+                <div class="progress-bar-3 progress-bar-sync">
+                </div>
+            </div>
+        </div>
         <div id="console-log" style="display: none">
             <textarea name="console-log" id="mp-console-log" cols="30" rows="10" disabled></textarea>
             <input type="hidden" value="" id="mp-log-data"
@@ -91,7 +119,7 @@ use Mageplaza\Smtp\Helper\Data;
         overflow: hidden;
     }
 
-    .progress-bar {
+    .progress-bar, .progress-bar-sync {
         background-color: #79a22e;
         color: #fff;
         float: left;
diff --git a/view/adminhtml/web/js/model/sync.js b/view/adminhtml/web/js/model/sync.js
index a04cfe2..e12eb15 100644
--- a/view/adminhtml/web/js/model/sync.js
+++ b/view/adminhtml/web/js/model/sync.js
@@ -104,6 +104,13 @@ define([
                             percentText + ' (' + self.totalSync + '/' + self.currentResult.total + ')'
                         );
 
+                        if (i && i >= 1 && i <= 3) {
+                            self.getElement('.progress-bar-' + i).css('width', percentText);
+                            self.getElement('#sync-percent-' + i).text(
+                                percentText + ' (' + self.totalSync + '/' + self.currentResult.total + ')'
+                            );
+                        }
+
                         if (end < self.currentResult.total) {
                             self.syncData(end, i);
                         } else {
@@ -171,6 +178,8 @@ define([
             this.options          = options;
             this.currentResult    = {};
 
+            self.getElement('.progress-content').hide();
+
             if (type !== 'all') {
                 self.estimateSync(type, syncOptions, createdFrom, createdTo, daysRange);
             } else {
@@ -275,10 +284,10 @@ define([
                             }
 
                             if (self.currentResult.total > 0) {
-                                self.getElement('#sync-percent').text('0%');
-                                self.getElement('.progress-bar').removeAttr('style');
+                                self.getElement('#sync-percent-' + i).text('0%');
+                                self.getElement('.progress-bar-' + i).removeAttr('style');
                                 self.currentResult.percent = 0;
-                                self.getElement('#progress-content').show();
+                                self.getElement('#progress-content-' + i).show();
                                 self.totalSync = 0;
                                 self.getElement('.syncing').hide();
                                 self.getElement('#syncing-' + i).show();
@@ -287,13 +296,13 @@ define([
                             } else {
                                 self.showMultiMessages('message message-notice', result.message);
                                 $(self.options.buttonElement).removeClass('disabled');
-                                self.getElement('#progress-content').hide();
+                                self.getElement('#progress-content-' + i).hide();
                                 self.estimateSyncAll(i + 1, syncOptions, createdFrom, createdTo, daysRange);
                             }
                         } else {
                             self.showMultiMessages('message message-error', result.message);
                             $(self.options.buttonElement).removeClass('disabled');
-                            self.getElement('#progress-content').hide();
+                            self.getElement('#progress-content-' + i).hide();
                         }
                     }
                 });

From d41bf2970e34461731850cb0fda5a950f7c9cd42 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Thu, 30 Sep 2021 08:56:47 +0700
Subject: [PATCH 05/12] - Fix Proxy

---
 Controller/Proxy/Index.php | 21 ++++++++++++++++-----
 Helper/EmailMarketing.php  | 12 ++++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Controller/Proxy/Index.php b/Controller/Proxy/Index.php
index 8ef3a40..9387bc0 100644
--- a/Controller/Proxy/Index.php
+++ b/Controller/Proxy/Index.php
@@ -25,6 +25,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Mageplaza\Smtp\Helper\Data;
 use Mageplaza\Smtp\Helper\EmailMarketing;
@@ -40,17 +41,25 @@ class Index extends Action
      */
     protected $helperEmailMarketing;
 
+    /**
+     * @var RawFactory
+     */
+    protected $resultRawFactory;
+
     /**
      * Index constructor.
      *
      * @param Context $context
      * @param EmailMarketing $helperEmailMarketing
+     * @param RawFactory $resultRawFactory
      */
     public function __construct(
         Context $context,
-        EmailMarketing $helperEmailMarketing
+        EmailMarketing $helperEmailMarketing,
+        RawFactory $resultRawFactory
     ) {
         $this->helperEmailMarketing = $helperEmailMarketing;
+        $this->resultRawFactory     = $resultRawFactory;
 
         parent::__construct($context);
     }
@@ -67,11 +76,13 @@ public function execute()
                 $url = EmailMarketing::PROXY_URL . $params['path'];
             }
 
-            if ($this->_request->getMethod() === 'GET') {
-                return $this->_redirect($url);
-            }
-
             $response = $this->helperEmailMarketing->sendRequestProxy($url, $params);
+            if ($this->_request->getParam('type') === 'raw') {
+                $result = $this->resultRawFactory->create();
+                $result->setContents($response);
+
+                return $result;
+            }
         } catch (Exception $e) {
             $response = [];
         }
diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
index 110330d..e11ef93 100755
--- a/Helper/EmailMarketing.php
+++ b/Helper/EmailMarketing.php
@@ -1690,11 +1690,19 @@ public function sendRequestProxy($url, $data)
     {
         $this->initCurl();
 
-        $body = $this->setHeaders($data, $url);
-        $this->_curl->post($url, $body);
+        if ($this->_request->getMethod() === 'POST') {
+            $body = $this->setHeaders($data, $url);
+            $this->_curl->post($url, $body);
+        } else {
+            $this->_curl->get($url);
+        }
 
         $body        = $this->_curl->getBody();
         $bodyData    = self::jsonDecode($body);
+        if ($this->_request->getParam('type') === 'raw') {
+            $bodyData = $body;
+        }
+
         $this->_curl = '';
 
         return $bodyData;

From 8df0e6664a22c59a8355bc150714492cb13e2d64 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Thu, 30 Sep 2021 13:55:43 +0700
Subject: [PATCH 06/12] - Fix Proxy

---
 Controller/Proxy/Index.php | 3 ++-
 Helper/EmailMarketing.php  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Controller/Proxy/Index.php b/Controller/Proxy/Index.php
index 9387bc0..c890331 100644
--- a/Controller/Proxy/Index.php
+++ b/Controller/Proxy/Index.php
@@ -77,8 +77,9 @@ public function execute()
             }
 
             $response = $this->helperEmailMarketing->sendRequestProxy($url, $params);
-            if ($this->_request->getParam('type') === 'raw') {
+            if (isset($params['type'])) {
                 $result = $this->resultRawFactory->create();
+                $result->setHeader('content-type', $params['type']);
                 $result->setContents($response);
 
                 return $result;
diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
index e11ef93..ea60420 100755
--- a/Helper/EmailMarketing.php
+++ b/Helper/EmailMarketing.php
@@ -1688,6 +1688,8 @@ public function isTracking($storeId = null)
      */
     public function sendRequestProxy($url, $data)
     {
+        $params = $this->_request->getParams();
+
         $this->initCurl();
 
         if ($this->_request->getMethod() === 'POST') {
@@ -1697,9 +1699,9 @@ public function sendRequestProxy($url, $data)
             $this->_curl->get($url);
         }
 
-        $body        = $this->_curl->getBody();
-        $bodyData    = self::jsonDecode($body);
-        if ($this->_request->getParam('type') === 'raw') {
+        $body     = $this->_curl->getBody();
+        $bodyData = self::jsonDecode($body);
+        if (isset($params['type'])) {
             $bodyData = $body;
         }
 

From 9946f2b83ff5ea5a8651afc5e7d515aefa16cdb5 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Tue, 5 Oct 2021 15:01:43 +0700
Subject: [PATCH 07/12] - Fix bug cache AVADA_EM

---
 Block/Script.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Block/Script.php b/Block/Script.php
index e42f4d3..e0e00bb 100644
--- a/Block/Script.php
+++ b/Block/Script.php
@@ -43,6 +43,11 @@
  */
 class Script extends Template
 {
+    /**
+     * @var bool
+     */
+    protected $_isScopePrivate = true;
+
     /**
      * @var EmailMarketing
      */

From 9e9677cfc221ee8ae37ec07e502490cd651f166b Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Wed, 6 Oct 2021 15:43:50 +0700
Subject: [PATCH 08/12] - Fix bug SMTP

---
 Block/Script.php                   |  16 ++--
 Observer/Customer/LoginSuccess.php |  59 +++++++++++++
 etc/events.xml                     | 131 +++++++++++++++--------------
 3 files changed, 137 insertions(+), 69 deletions(-)
 create mode 100644 Observer/Customer/LoginSuccess.php

diff --git a/Block/Script.php b/Block/Script.php
index e0e00bb..2249fba 100644
--- a/Block/Script.php
+++ b/Block/Script.php
@@ -28,6 +28,7 @@
 use Magento\Customer\Model\SessionFactory as CustomerSession;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -41,12 +42,9 @@
  * Class Script
  * @package Mageplaza\Smtp\Block
  */
-class Script extends Template
+class Script extends Template implements IdentityInterface
 {
-    /**
-     * @var bool
-     */
-    protected $_isScopePrivate = true;
+    const CACHE_TAG = 'mp_smtp_script';
 
     /**
      * @var EmailMarketing
@@ -243,4 +241,12 @@ public function getPrice($product, $includeTax = false)
 
         return $price;
     }
+
+    /**
+     * @return array|string[]
+     */
+    public function getIdentities()
+    {
+        return [self::CACHE_TAG];
+    }
 }
diff --git a/Observer/Customer/LoginSuccess.php b/Observer/Customer/LoginSuccess.php
new file mode 100644
index 0000000..f7bc770
--- /dev/null
+++ b/Observer/Customer/LoginSuccess.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+
+namespace Mageplaza\Smtp\Observer\Customer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\PageCache\Model\Cache\Type;
+use Mageplaza\Smtp\Block\Script;
+use Zend_Cache;
+
+/**
+ * Class LoginSuccess
+ * @package Mageplaza\Smtp\Observer\Customer
+ */
+class LoginSuccess implements ObserverInterface
+{
+    /**
+     * @var Type
+     */
+    protected $fullPageCache;
+
+    /**
+     * LoginSuccess constructor.
+     *
+     * @param Type $fullPageCache
+     */
+    public function __construct(
+        Type $fullPageCache
+    ) {
+        $this->fullPageCache = $fullPageCache;
+    }
+
+    /**
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        $this->fullPageCache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [Script::CACHE_TAG]);
+    }
+}
diff --git a/etc/events.xml b/etc/events.xml
index 67b5752..6e99858 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -1,64 +1,67 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Mageplaza
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Mageplaza.com license that is
- * available through the world-wide-web at this URL:
- * https://www.mageplaza.com/LICENSE.txt
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- *
- * @category    Mageplaza
- * @package     Mageplaza_Smtp
- * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
- * @license     https://www.mageplaza.com/LICENSE.txt
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <!--    ================================================ CUSTOMER ============================================-->
-    <event name="customer_address_save_commit_after">
-        <observer name="mp_smtp_customer_address_save_commit_after" instance="Mageplaza\Smtp\Observer\Customer\SaveAddress"/>
-    </event>
-    <event name="customer_address_save_before">
-        <observer name="mp_smtp_customer_address_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\ModelSaveBefore"/>
-    </event>
-    <event name="customer_save_before">
-        <observer name="mp_smtp_customer_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\ModelSaveBefore"/>
-    </event>
-    <event name="newsletter_subscriber_save_commit_after">
-        <observer name="mp_smtp_customer_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\SubscriberSaveCommitAfter"/>
-    </event>
-    <event name="customer_save_commit_after">
-        <observer name="mp_smtp_customer_save_commit_after" instance="Mageplaza\Smtp\Observer\Customer\CustomerSaveCommitAfter"/>
-    </event>
-    <event name="sales_quote_save_commit_after">
-        <observer name="mp_smtp_quote_save_after" instance="Mageplaza\Smtp\Observer\Quote\SyncQuote"/>
-    </event>
-    <event name="sales_quote_delete_commit_after">
-        <observer name="mp_smtp_quote_save_after" instance="Mageplaza\Smtp\Observer\Quote\DeleteQuote"/>
-    </event>
-    <event name="sales_quote_save_before">
-        <observer name="mp_smtp_quote_save_before" instance="Mageplaza\Smtp\Observer\Quote\SetToken"/>
-    </event>
-    <event name="checkout_submit_all_after">
-        <observer name="mp_smtp_sales_order_create" instance="Mageplaza\Smtp\Observer\Order\OrderCreate"/>
-    </event>
-    <event name="sales_order_save_commit_after">
-        <observer name="mp_smtp_sales_order_complete" instance="Mageplaza\Smtp\Observer\Order\OrderComplete"/>
-    </event>
-    <event name="sales_order_invoice_save_commit_after">
-        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\InvoiceCommitAfter"/>
-    </event>
-    <event name="sales_order_creditmemo_save_commit_after">
-        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\CreditmemoCreate"/>
-    </event>
-    <event name="sales_order_shipment_save_commit_after">
-        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\ShipmentCreate"/>
-    </event>
-</config>
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <!--    ================================================ CUSTOMER ============================================-->
+    <event name="customer_address_save_commit_after">
+        <observer name="mp_smtp_customer_address_save_commit_after" instance="Mageplaza\Smtp\Observer\Customer\SaveAddress"/>
+    </event>
+    <event name="customer_address_save_before">
+        <observer name="mp_smtp_customer_address_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\ModelSaveBefore"/>
+    </event>
+    <event name="customer_save_before">
+        <observer name="mp_smtp_customer_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\ModelSaveBefore"/>
+    </event>
+    <event name="newsletter_subscriber_save_commit_after">
+        <observer name="mp_smtp_customer_model_save_before" instance="Mageplaza\Smtp\Observer\Customer\SubscriberSaveCommitAfter"/>
+    </event>
+    <event name="customer_save_commit_after">
+        <observer name="mp_smtp_customer_save_commit_after" instance="Mageplaza\Smtp\Observer\Customer\CustomerSaveCommitAfter"/>
+    </event>
+    <event name="sales_quote_save_commit_after">
+        <observer name="mp_smtp_quote_save_after" instance="Mageplaza\Smtp\Observer\Quote\SyncQuote"/>
+    </event>
+    <event name="sales_quote_delete_commit_after">
+        <observer name="mp_smtp_quote_save_after" instance="Mageplaza\Smtp\Observer\Quote\DeleteQuote"/>
+    </event>
+    <event name="sales_quote_save_before">
+        <observer name="mp_smtp_quote_save_before" instance="Mageplaza\Smtp\Observer\Quote\SetToken"/>
+    </event>
+    <event name="checkout_submit_all_after">
+        <observer name="mp_smtp_sales_order_create" instance="Mageplaza\Smtp\Observer\Order\OrderCreate"/>
+    </event>
+    <event name="sales_order_save_commit_after">
+        <observer name="mp_smtp_sales_order_complete" instance="Mageplaza\Smtp\Observer\Order\OrderComplete"/>
+    </event>
+    <event name="sales_order_invoice_save_commit_after">
+        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\InvoiceCommitAfter"/>
+    </event>
+    <event name="sales_order_creditmemo_save_commit_after">
+        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\CreditmemoCreate"/>
+    </event>
+    <event name="sales_order_shipment_save_commit_after">
+        <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\ShipmentCreate"/>
+    </event>
+    <event name="customer_login">
+        <observer name="customer_login_success" instance="Mageplaza\Smtp\Observer\Customer\LoginSuccess" />
+    </event>
+</config>

From 744fa821209bcc5790c4d35aa38967d2d8e4daaa Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Wed, 6 Oct 2021 16:23:36 +0700
Subject: [PATCH 09/12] - Fix bug cache AVADA_EM

---
 Block/Script.php                   |  4 +---
 Helper/EmailMarketing.php          |  1 +
 Observer/Customer/LoginSuccess.php | 34 ++++++++++++++++++++++++++----
 etc/events.xml                     |  3 ---
 etc/frontend/events.xml            | 27 ++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 etc/frontend/events.xml

diff --git a/Block/Script.php b/Block/Script.php
index 2249fba..f9fcfd9 100644
--- a/Block/Script.php
+++ b/Block/Script.php
@@ -44,8 +44,6 @@
  */
 class Script extends Template implements IdentityInterface
 {
-    const CACHE_TAG = 'mp_smtp_script';
-
     /**
      * @var EmailMarketing
      */
@@ -247,6 +245,6 @@ public function getPrice($product, $includeTax = false)
      */
     public function getIdentities()
     {
-        return [self::CACHE_TAG];
+        return [EmailMarketing::CACHE_TAG];
     }
 }
diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
index ea60420..324dcd9 100755
--- a/Helper/EmailMarketing.php
+++ b/Helper/EmailMarketing.php
@@ -83,6 +83,7 @@
  */
 class EmailMarketing extends Data
 {
+    const CACHE_TAG           = 'mp_smtp_script';
     const IS_SYNCED_ATTRIBUTE = 'mp_smtp_is_synced';
     const API_URL             = 'https://app.avada.io';
     const APP_URL             = self::API_URL . '/app/api/v1/connects';
diff --git a/Observer/Customer/LoginSuccess.php b/Observer/Customer/LoginSuccess.php
index f7bc770..aca165e 100644
--- a/Observer/Customer/LoginSuccess.php
+++ b/Observer/Customer/LoginSuccess.php
@@ -21,10 +21,12 @@
 
 namespace Mageplaza\Smtp\Observer\Customer;
 
+use Exception;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\PageCache\Model\Cache\Type;
-use Mageplaza\Smtp\Block\Script;
+use Mageplaza\Smtp\Helper\Data;
+use Mageplaza\Smtp\Helper\EmailMarketing;
 use Zend_Cache;
 
 /**
@@ -38,15 +40,31 @@ class LoginSuccess implements ObserverInterface
      */
     protected $fullPageCache;
 
+    /**
+     * @var EmailMarketing
+     */
+    protected $helperEmailMarketing;
+
+    /**
+     * @var Data
+     */
+    protected $helperData;
+
     /**
      * LoginSuccess constructor.
      *
      * @param Type $fullPageCache
+     * @param Data $helperData
+     * @param EmailMarketing $helperEmailMarketing
      */
     public function __construct(
-        Type $fullPageCache
+        Type $fullPageCache,
+        Data $helperData,
+        EmailMarketing $helperEmailMarketing
     ) {
-        $this->fullPageCache = $fullPageCache;
+        $this->fullPageCache        = $fullPageCache;
+        $this->helperData           = $helperData;
+        $this->helperEmailMarketing = $helperEmailMarketing;
     }
 
     /**
@@ -54,6 +72,14 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        $this->fullPageCache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [Script::CACHE_TAG]);
+        try {
+            $scopeId = $this->helperData->getScopeId();
+        } catch (Exception $e) {
+            $scopeId = null;
+        }
+
+        if ($this->helperEmailMarketing->isEnableEmailMarketing($scopeId)) {
+            $this->fullPageCache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [EmailMarketing::CACHE_TAG]);
+        }
     }
 }
diff --git a/etc/events.xml b/etc/events.xml
index 6e99858..14a1c0e 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -61,7 +61,4 @@
     <event name="sales_order_shipment_save_commit_after">
         <observer name="mp_smtp_sales_creditmemo_create" instance="Mageplaza\Smtp\Observer\Order\ShipmentCreate"/>
     </event>
-    <event name="customer_login">
-        <observer name="customer_login_success" instance="Mageplaza\Smtp\Observer\Customer\LoginSuccess" />
-    </event>
 </config>
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
new file mode 100644
index 0000000..d630bee
--- /dev/null
+++ b/etc/frontend/events.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="customer_login">
+        <observer name="customer_login_success" instance="Mageplaza\Smtp\Observer\Customer\LoginSuccess" />
+    </event>
+</config>

From 2f106ac056e96e340979715c2a4dbadf2e9fc1ee Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Fri, 8 Oct 2021 15:42:42 +0700
Subject: [PATCH 10/12] - Fix get product price

---
 Block/Script.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Block/Script.php b/Block/Script.php
index f9fcfd9..a7f3a7b 100644
--- a/Block/Script.php
+++ b/Block/Script.php
@@ -231,10 +231,21 @@ public function getPrice($product, $includeTax = false)
     {
         $price = number_format($this->priceCurrency->convert($product->getFinalPrice()), 2);
 
+        if ($product->getTypeId() === 'configurable') {
+            $price = number_format($product->getFinalPrice(), 2);
+        }
+
         if ($includeTax) {
             $price = number_format($this->priceCurrency->convert(
                 $this->taxHelper->getTaxPrice($product, $product->getFinalPrice(), true)
             ), 2);
+
+            if ($product->getTypeId() === 'configurable') {
+                $price = number_format(
+                    $this->taxHelper->getTaxPrice($product, $product->getFinalPrice(), true),
+                    2
+                );
+            }
         }
 
         return $price;

From 4910d13c142d664b52b137d4573dc22dd0bd8be5 Mon Sep 17 00:00:00 2001
From: shin <tuvd@mageplaza.com>
Date: Mon, 11 Oct 2021 10:56:19 +0700
Subject: [PATCH 11/12] - Hide default Abandoned Cart template

---
 Plugin/Model/Template/Config.php | 45 ++++++++++++++++++++++++++++++++
 etc/adminhtml/di.xml             | 26 ++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 Plugin/Model/Template/Config.php
 create mode 100644 etc/adminhtml/di.xml

diff --git a/Plugin/Model/Template/Config.php b/Plugin/Model/Template/Config.php
new file mode 100644
index 0000000..a1583da
--- /dev/null
+++ b/Plugin/Model/Template/Config.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+
+namespace Mageplaza\Smtp\Plugin\Model\Template;
+
+use Magento\Email\Model\Template\Config as EmailConfig;
+
+/**
+ * Class Config
+ * @package Mageplaza\Smtp\Plugin\Model\Template
+ */
+class Config
+{
+    /**
+     * @param EmailConfig $subject
+     * @param array $templates
+     *
+     * @return array
+     */
+    public function afterGetAvailableTemplates(EmailConfig $subject, $templates)
+    {
+        $key = array_search('mpsmtp_abandoned_cart_email_template', array_column($templates, 'value'));
+        unset($templates[$key]);
+
+        return $templates;
+    }
+}
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 0000000..a45244e
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?><!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Email\Model\Template\Config">
+        <plugin name="mageplaza_smtp_template_abandoned_cart" type="Mageplaza\Smtp\Plugin\Model\Template\Config" />
+    </type>
+</config>

From d956be82f7d80fa7a5c37c23ebb412fc85e813b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=E1=BA=BF=20Vinh?= <vinhlt@mageplaza.com>
Date: Tue, 12 Oct 2021 09:44:21 +0700
Subject: [PATCH 12/12] --update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4bcf1d6..e017093 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "mageplaza/module-core": "^1.4.11"
   },
   "type": "magento2-module",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "license": "proprietary",
   "authors": [
     {