code refactoring

magepal · Mar 2, 2021 · 48a69f5 · 48a69f5
1 parent 3e12603
commit 48a69f5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 238 deletions.
diff --git a/Block/Adminhtml/System/Config/Form/Composer/Version.php b/Block/Adminhtml/System/Config/Form/Composer/Version.php
diff --git a/Block/Adminhtml/System/Config/Form/Module/Version.php b/Block/Adminhtml/System/Config/Form/Module/Version.php
diff --git a/composer.json b/composer.json
@@ -27,10 +27,10 @@
         "magento/module-backend": "100.0.*|100.1.*|100.2.*|101.0.*|102.0.*",
         "magento/framework": "100.0.*|100.1.*|101.0.*|102.0.*|103.0.*",
         "magento/module-newsletter": "*",
-        "magepal/magento2-core":">1.1.0"
+        "magepal/magento2-core": ">=1.1.10"
     },
     "type": "magento2-module",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "autoload": {
         "files": [
             "registration.php"

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -15,23 +15,19 @@
             <label>Newsletter Signup Email</label>
             <tab>magepal</tab>
             <resource>MagePal_NewsletterSignupEmail::magepal_newsletter_signup_email</resource>
-            <group id="about" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="0" translate="label">
+            <group id="about_magepal" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="0" translate="label">
                 <label>About Newsletter Signup Email</label>
                 <attribute type="expanded">1</attribute>
                 <comment>
                     <![CDATA[
-                    <strong>Copyright © 2018 <a href="http://www.magepal.com" target="_blank">www.magepal.com</a> / <a href="mailto:support@magepal.com">support@magepal.com</a></strong><br />
+                    <strong>Copyright © 2021 <a href="http://www.magepal.com" target="_blank">www.magepal.com</a> / <a href="mailto:support@magepal.com">support@magepal.com</a></strong><br />
                     Discover other must have extensions at <a href="http://www.magepal.com" target="_blank">www.magepal.com</a>. Thanks for choosing MagePal Extensions.<br/><br/>
-                    <hr style="border-top: 1px solid #e3e3e3" />
+                    <hr class="magepal-hr" />
                   ]]>
                 </comment>
-                <field id="module_version" translate="label" type="label" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Module Version</label>
-                    <frontend_model>MagePal\NewsletterSignupEmail\Block\Adminhtml\System\Config\Form\Module\Version</frontend_model>
-                </field>
-                <field id="composer_version" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="MagePal_NewsletterSignupEmail" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Composer Version</label>
-                    <frontend_model>MagePal\NewsletterSignupEmail\Block\Adminhtml\System\Config\Form\Composer\Version</frontend_model>
+                    <frontend_model>MagePal\Core\Block\Adminhtml\System\Config\Composer\Version</frontend_model>
                 </field>
             </group>
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">