Merge pull request #271 from mageplaza/2.4-develop

2.4 develop

Block/DataDeletion/DeleteData.php

@@ -101,5 +101,4 @@ public function getStoreName()
             return '';
         }
     }
-
 }

Controller/Social/DataDeletion.php

@@ -86,7 +86,6 @@ public function __construct(
             $customerModel
         );
         $this->_logger = $logger;
-
     }
 
     /**

composer.json

@@ -2,14 +2,14 @@
   "name": "mageplaza/magento-2-social-login",
   "description": "Magento 2 Social Login extension is designed for quick login to your Magento 2 store without procesing complex register steps",
   "require": {
-    "mageplaza/module-core": "^1.5.0",
+    "mageplaza/module-core": "^1.5.1",
     "hybridauth/hybridauth": "^3.8.2"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master"
   },
   "type": "magento2-module",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "license": "proprietary",
   "authors": [
     {

i18n/en_US.csv

@@ -49,6 +49,7 @@ None,None
 "Customer Authentication Popup","Customer Authentication Popup"
 "Always Require","Always Require"
 "If social account does not provide E-mail.","If social account does not provide E-mail."
+"Your data in our website has been deleted","Your data in our website has been deleted"
 "Login By %1","Login By %1"
 "Sign in with %1","Sign in with %1"
 "Sign In","Sign In"
@@ -80,7 +81,9 @@ Submit,Submit
 "Please complete your information below to login.","Please complete your information below to login."
 "Forgot Password","Forgot Password"
 "Please enter your email address below to receive a password reset link.","Please enter your email address below to receive a password reset link."
+Ok,Ok
 "Could not authenticate. Please try again later","Could not authenticate. Please try again later"
+"Proceed to Checkout","Proceed to Checkout"
 "Social Login","Social Login"
 General,General
 Enable,Enable
@@ -110,6 +113,7 @@ Facebook,Facebook
 "Facebook App ID","Facebook App ID"
 "Facebook App Secret","Facebook App Secret"
 "Valid OAuth redirect URIs","Valid OAuth redirect URIs"
+"Data Deletion Url","Data Deletion Url"
 "Sort Order","Sort Order"
 Google,Google
 "Create app <a href=""https://code.google.com/apis/console/"" target=""_bank"">here</a>","Create app <a href=""https://code.google.com/apis/console/"" target=""_bank"">here</a>"

view/frontend/templates/popup/form/create.phtml

@@ -46,8 +46,8 @@
                             <input type="checkbox" class="checkbox" name="is_subscribed"
                                    title="<?= __('Sign Up for Newsletter') ?>" value="1"
                                    id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()):
-                                        ?> checked="checked"<?php
-                                                     endif; ?> />
+                                ?> checked="checked"<?php
+                            endif; ?> />
                             <label for="is_subscribed"
                                    class="label"><span><?= __('Sign Up for Newsletter') ?></span></label>
                         </div>
@@ -266,4 +266,3 @@
             <?php endif; ?>
         </div>
     </div>
-</div>