Merge branches '2.4' and '2.4-develop' of github.com:mageplaza/magent…

…o-2-social-login into 2.4-develop

README.md

@@ -29,14 +29,15 @@
 ## ✓ Install Social Login via composer (recommend)
 Run the following command in Magento 2 root folder:
 
-With Social Proof (recommend):
+
+With Marketing Automation (recommend):
 ```
-composer require mageplaza/magento-2-social-login avada/module-proofo
+composer require mageplaza/magento-2-social-login mageplaza/module-smtp
 php bin/magento setup:upgrade
 php bin/magento setup:static-content:deploy
 ```
 
-Without Social Proof:
+Without Marketing Automation:
 ```
 composer require mageplaza/magento-2-social-login
 php bin/magento setup:upgrade

composer.json

@@ -12,7 +12,7 @@
     "roave/security-advisories": "dev-master"
   },
   "type": "magento2-module",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "license": "proprietary",
   "authors": [
     {

etc/adminhtml/system.xml

@@ -33,8 +33,8 @@
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[This extension is fully compatible with <a href="https://www.mageplaza.com/magento-2-one-step-checkout-extension/" target="_blank">One Step Checkout</a>. <br>
-                    1. Increase 25% conversion rate with <a href="https://www.mageplaza.com/magento-2-layered-navigation-extension/" target="_blank">Layered Navigation</a>
-                    2. <a href="https://pages.mageplaza.com/abandoned-cart-email-templates-for-magento/?utm_source=configuration&utm_campaign=m2-bannerslider" target="_blank">How to setup abandoned cart email series</a>]]></comment>
+                    1. Increase 25% conversion rate with <a href="https://www.mageplaza.com/magento-2-layered-navigation-extension/" target="_blank">Layered Navigation</a><br>
+                    2. Magento stores see upwards of 30% revenue 💰 with AVADA. <a href="https://go.avada.io/mageplaza">Learn more</a>]]></comment>
                 </field>
                 <field id="send_password" translate="label comment" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Password To Customer</label>