Merge pull request #32 from mageplaza/2.3-develop

2.3 develop
mageplaza · Jun 11, 2021 · 71fecc4 · 71fecc4
2 parents 86fd4cf + 66b04f0
commit 71fecc4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 34 deletions.
diff --git 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);

diff --git 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": "[email protected]",
-      "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": "[email protected]",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\CustomerApproval\\": ""
+    }
+  }
+}
diff --git 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>