Merge pull request #242 from mageplaza/2.3-develop

2.3 develop
mageplaza · Aug 1, 2021 · bf14467 · bf14467
2 parents 0a81448 + 25cb0a9
commit bf14467
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/Controller/Popup/Create.php b/Controller/Popup/Create.php
@@ -217,6 +217,10 @@ public function execute()
             }
         } catch (LocalizedException $e) {
             $result['message'][] = $this->escaper->escapeHtml($e->getMessage());
+            if ($this->session->getMpRedirectUrl()) {
+                $result['redirect'] = $this->session->getMpRedirectUrl();
+                $this->session->unsMpRedirectUrl();
+            }
         } catch (Exception $e) {
             $result['message'][] = __('We can\'t save the customer.');
         }

diff --git a/Controller/Social/Login.php b/Controller/Social/Login.php
@@ -90,8 +90,7 @@ public function execute()
             }
 
             $customer = $this->createCustomerProcess($userProfile, $type);
-
-        } else {
+        } elseif ($this->apiHelper->isCheckMode()) {
             if ($customerData->getData('password_hash') === null) {
                 $userProfile->hash = '';
                 $this->session->setUserProfile($userProfile);

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "roave/security-advisories": "dev-master"
   },
   "type": "magento2-module",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "license": "proprietary",
   "authors": [
     {

diff --git a/etc/config.xml b/etc/config.xml
@@ -30,7 +30,7 @@
                 <enabled>0</enabled>
                 <link_trigger>.header.links, .section-item-content .header.links, .authorization-link</link_trigger>
                 <send_password>1</send_password>
-                <check_mode>1</check_mode>
+                <check_mode>0</check_mode>
                 <social_display>1,2,3,4</social_display>
                 <popup_login>popup_slide</popup_login>
                 <authentication_popup>0</authentication_popup>

diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -33,7 +33,7 @@
         <referenceBlock name="header_customer_form_login" remove="true"/>
         <referenceContainer name="content">
             <block class="Mageplaza\SocialLogin\Block\Popup" name="social-login-popup" as="popup.modal" template="popup.phtml">
-                <block class="Magento\Framework\View\Element\Template" name="social-login-popup-email" before="-" as="popup.email" template="Mageplaza_SocialLogin::popup/form/email.phtml"/>
+                <block class="Mageplaza\SocialLogin\Block\Popup" name="social-login-popup-email" before="-" as="popup.email" template="Mageplaza_SocialLogin::popup/form/email.phtml"/>
                 <block class="Mageplaza\SocialLogin\Block\Form\Login" name="social-login-popup-authentication" as="popup.authentication" template="Mageplaza_SocialLogin::popup/form/authentication.phtml">
                     <block class="Mageplaza\SocialLogin\Block\Popup\Social" name="social-login-popup-authentication-social" as="popup.authentication.social" template="Mageplaza_SocialLogin::popup/form/authentication/social.phtml"/>
                     <container name="social.login.form.additional.info.login" as="form_additional_info">

diff --git a/view/frontend/web/js/popup.js b/view/frontend/web/js/popup.js
@@ -24,7 +24,7 @@ define(
         'Magento_Customer/js/customer-data',
         'mage/translate',
         'Magento_Ui/js/modal/modal',
-        'mageplaza/core/jquery/popup'
+        'Mageplaza_Core/js/jquery.magnific-popup.min'
     ], function ($, customerData, $t, modal) {
         'use strict';