Merge pull request #43 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jun 22, 2022 · 98b3ad7 · 98b3ad7
2 parents f1da4fb + 5a3de97
commit 98b3ad7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Observer/CustomerLogin.php b/Observer/CustomerLogin.php
@@ -84,7 +84,8 @@ public function execute(Observer $observer)
         $customerId = $customer->getId();
         $statusCustomer = $this->helperData->getIsApproved($customerId);
 
-        if ($statusCustomer !== AttributeOptions::APPROVED) {
+        if (($statusCustomer !== AttributeOptions::APPROVED && $statusCustomer !== AttributeOptions::NEW_STATUS)
+        || ($statusCustomer === AttributeOptions::NEW_STATUS && !$this->helperData->getAutoApproveConfig())) {
             $this->_customerSession->logout()
             ->setBeforeAuthUrl($this->_redirect->getRefererUrl())
             ->setLastCustomerId($customerId);

diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/module-customer-approval",
   "description": "Magento 2 Customer Approval Extension",
   "require": {
-    "mageplaza/module-core": "^1.4.5"
+    "mageplaza/module-core": "^1.4.12"
   },
   "type": "magento2-module",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "proprietary",
   "authors": [
     {