Merge pull request #322 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jul 21, 2021 · ebec9f5 · ebec9f5
2 parents 85c389b + c36ee78
commit ebec9f5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/module-smtp",
   "description": "SMTP Extension for Magento 2 helps the owner of store simply install SMTP (Simple Mail Transfer Protocol) server which transmits the messages into codes or numbers",
   "require": {
-    "mageplaza/module-core": "^1.4.5"
+    "mageplaza/module-core": "^1.4.11"
   },
   "type": "magento2-module",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "license": "proprietary",
   "authors": [
     {

diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml
@@ -26,9 +26,10 @@
         <add id="Mageplaza_Smtp::configuration" title="Configuration" module="Mageplaza_Smtp" sortOrder="100" action="adminhtml/system_config/edit/section/smtp" resource="Mageplaza_Smtp::configuration" parent="Mageplaza_Smtp::smtp"/>
         <add id="Mageplaza_Smtp::abandoned_cart" title="Abandoned Carts" module="Mageplaza_Smtp" sortOrder="80" parent="Magento_Sales::sales_operation" action="adminhtml/smtp/abandonedcart" resource="Mageplaza_Smtp::abandoned_cart"/>
 
-        <add id="Mageplazaa_Smtp::email_marketing" title="Email Marketing" module="Mageplaza_Smtp" sortOrder="50" parent="Magento_Backend::marketing" resource="Mageplaza_Smtp::email_marketing_menu"/>
-        <add id="Mageplazaa_Smtp::email_marketing_forms" title="Forms" module="Mageplaza_Smtp" sortOrder="10" action="adminhtml/smtp/marketing/type/forms" resource="Mageplaza_Smtp::email_marketing_menu" parent="Mageplazaa_Smtp::email_marketing" />
-        <add id="Mageplazaa_Smtp::email_marketing_newsletters" title="Newsletters" module="Mageplaza_Smtp" sortOrder="20" action="adminhtml/smtp/marketing/type/newsletters" resource="Mageplaza_Smtp::email_marketing_menu" parent="Mageplazaa_Smtp::email_marketing" />
-        <add id="Mageplazaa_Smtp::email_marketing_automation" title="Automation" module="Mageplaza_Smtp" sortOrder="30" action="adminhtml/smtp/marketing/type/automation" resource="Mageplaza_Smtp::email_marketing_menu" parent="Mageplazaa_Smtp::email_marketing" />
+        <add id="Avada_Smtp::email_marketing" title="Email Marketing" module="Mageplaza_Smtp" sortOrder="50" parent="Magento_Backend::marketing" resource="Mageplaza_Smtp::email_marketing_menu"/>
+        <add id="Avada_Smtp::email_marketing_automation" title="Automation" module="Mageplaza_Smtp" sortOrder="10" action="adminhtml/smtp/marketing/type/automation" resource="Mageplaza_Smtp::email_marketing_menu" parent="Avada_Smtp::email_marketing" />
+        <add id="Avada_Smtp::email_marketing_newsletters" title="Campaign" module="Mageplaza_Smtp" sortOrder="20" action="adminhtml/smtp/marketing/type/newsletters" resource="Mageplaza_Smtp::email_marketing_menu" parent="Avada_Smtp::email_marketing" />
+        <add id="Avada_Smtp::email_marketing_sms" title="SMS" module="Mageplaza_Smtp" sortOrder="30" action="adminhtml/smtp/marketing/type/sms" resource="Mageplaza_Smtp::email_marketing_menu" parent="Avada_Smtp::email_marketing" />
+        <add id="Avada_Smtp::email_marketing_forms" title="Popup Forms" module="Mageplaza_Smtp" sortOrder="40" action="adminhtml/smtp/marketing/type/forms" resource="Mageplaza_Smtp::email_marketing_menu" parent="Avada_Smtp::email_marketing" />
     </menu>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -123,16 +123,19 @@
                 </field>
             </group>
         </section>
+        <tab id="avada" translate="label" sortOrder="401" class="avada-extensions">
+            <label>Avada Marketing Automation</label>
+        </tab>
         <section id="email_marketing" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Marketing Automation</label>
-            <tab>mageplaza</tab>
+            <label>Configuration</label>
+            <tab>avada</tab>
             <resource>Mageplaza_Smtp::email_marketing</resource>
             <group id="general" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>General Configuration</label>
                 <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment><![CDATA[By enabling Marketing Automation, you agree to the <a href="https://avada.io/tos.html" target="_blank">Terms & Conditions</a> and <a href="https://avada.io/dpa.html" target="_blank">Data processing agreement</a>.]]></comment>
+                    <comment><![CDATA[By enabling <a href="https://avada.io/" target="_blank">Marketing Automation</a>, you agree to the <a href="https://avada.io/tos.html" target="_blank">Terms & Conditions</a> and <a href="https://avada.io/dpa.html" target="_blank">Data processing agreement</a>.]]></comment>
                 </field>
                 <field id="define_vendor" translate="label comment" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Attribute Code for Vendor</label>
@@ -174,7 +177,7 @@
                         <field id="email_marketing/general/enabled">1</field>
                     </depends>
                 </field>
-                <field id="is_tracking" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="is_tracking" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Tracking Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>

diff --git a/view/adminhtml/templates/marketing.phtml b/view/adminhtml/templates/marketing.phtml
@@ -30,6 +30,9 @@ switch ($type) {
     case 'newsletters':
         $iframeUrl = 'https://magento2.avada.io/newsletters.html';
         break;
+    case 'sms':
+        $iframeUrl = 'https://magento2.avada.io/sms.html';
+        break;
     default:
         return;
 }