From f173a633955f84a786b7742b3357b6a13810ecf1 Mon Sep 17 00:00:00 2001
From: PhamCuong <cupngpn@mageplaza.com>
Date: Thu, 11 Mar 2021 14:05:10 +0700
Subject: [PATCH 1/3] fix error email sender not get match store view.

---
 Helper/Data.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Helper/Data.php b/Helper/Data.php
index 2b3b218..582786d 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -345,16 +345,14 @@ public function getEmailTemplate($type, $storeId = null)
     /**
      * @param $customer
      * @param $emailType
-     *
-     * @throws NoSuchEntityException
      */
     public function emailApprovalAction($customer, $emailType)
     {
         $storeId = $customer->getStoreId();
         $sendTo  = $customer->getEmail();
-        $sender  = $this->getSenderCustomer();
+        $sender  = $this->getSenderCustomer($storeId);
         if ($this->getAutoApproveConfig()) {
-            $sender = $this->getConfigValue('customer/create_account/email_identity');
+            $sender = $this->getConfigValue('customer/create_account/email_identity', $storeId);
         }
 
         if ($this->getEmailEnable($emailType)) {
@@ -365,15 +363,13 @@ public function emailApprovalAction($customer, $emailType)
 
     /**
      * @param $customer
-     *
-     * @throws NoSuchEntityException
      */
     public function emailNotifyAdmin($customer)
     {
         $storeId = $customer->getStoreId();
-        $sender  = $this->getSenderAdmin();
+        $sender  = $this->getSenderAdmin($storeId);
         if ($this->getAutoApproveConfig()) {
-            $sender = $this->getConfigValue('customer/create_account/email_identity');
+            $sender = $this->getConfigValue('customer/create_account/email_identity', $storeId);
         }
         $sendTo      = $this->getRecipientsAdmin();
         $sendToArray = explode(',', $sendTo);

From 16f7374a9a864e1afed13d099b26a27ed3542f57 Mon Sep 17 00:00:00 2001
From: Bruno <cupngpn@mageplaza.com>
Date: Tue, 27 Apr 2021 16:22:44 +0700
Subject: [PATCH 2/3] Fixed error with Magento Eav

---
 etc/module.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/module.xml b/etc/module.xml
index 50a3efe..10dd904 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -24,6 +24,7 @@
     <module name="Mageplaza_CustomerApproval" setup_version="1.0.2">
         <sequence>
             <module name="Mageplaza_Core"/>
+            <module name="Magento_Eav"/>
             <module name="Magento_Customer"/>
         </sequence>
     </module>

From 66b04f0d106828386b2a96884d49896f99ead081 Mon Sep 17 00:00:00 2001
From: Bruno <cupngpn@mageplaza.com>
Date: Fri, 11 Jun 2021 11:05:14 +0700
Subject: [PATCH 3/3] update composer version & clean code

---
 composer.json | 52 +++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/composer.json b/composer.json
index f3c412e..3eab71d 100755
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,26 @@
-{
-  "name": "mageplaza/module-customer-approval",
-  "description": "Magento 2 Customer Approval Extension",
-  "require": {
-    "mageplaza/module-core": "^1.4.5"
-  },
-  "type": "magento2-module",
-  "version": "1.0.4",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Mageplaza",
-      "email": "support@mageplaza.com",
-      "homepage": "https://www.mageplaza.com",
-      "role": "Technical Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mageplaza\\CustomerApproval\\": ""
-    }
-  }
-}
+{
+  "name": "mageplaza/module-customer-approval",
+  "description": "Magento 2 Customer Approval Extension",
+  "require": {
+    "mageplaza/module-core": "^1.4.5"
+  },
+  "type": "magento2-module",
+  "version": "1.0.5",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "Mageplaza",
+      "email": "support@mageplaza.com",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\CustomerApproval\\": ""
+    }
+  }
+}