Code refactoring

magepal · Feb 27, 2021 · 4908e80 · 4908e80
1 parent 2db2dac
commit 4908e80
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 239 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/README.md b/README.md
@@ -1,6 +1,13 @@
 <a href="http://www.magepal.com" ><img src="https://image.ibb.co/dHBkYH/Magepal_logo.png" width="100" align="right" /></a>
 
 # Customer and Address Form Fields Manager for Magento2
+
+[![Total Downloads](https://poser.pugx.org/magepal/magento2-form-field-manager/downloads)](https://www.magepal.com/magento2/extensions/admin-form-fields-manager-for-magento-2.html)
+[![Latest Stable Version](https://poser.pugx.org/magepal/magento2-form-field-manager/v/stable)](https://www.magepal.com/magento2/extensions/admin-form-fields-manager-for-magento-2.html)
+
+
+<a href="https://www.magepal.com/magento2/extensions/admin-form-fields-manager-for-magento-2.html" ><img alt="Magento Extensions" src="https://user-images.githubusercontent.com/1415141/109392207-dcf93f00-78e8-11eb-875d-d23be0c9b29b.png" /></a>
+
 Quickly and easily remove unwanted form fields from admin order creation and customer account, added by default magento or other third party extensions
 
 

diff --git a/composer.json b/composer.json
@@ -28,10 +28,10 @@
         "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0|~7.1.3|~7.2.0|~7.3.0|~7.4.0",
         "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.*",
-        "magepal/magento2-core":">1.1.0"
+        "magepal/magento2-core": ">=1.1.10"
     },
     "type": "magento2-module",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "autoload": {
         "files": [
             "registration.php"

diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -7,17 +7,16 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-
     <type name="Magento\Customer\Model\Customer\DataProvider">
         <plugin sortOrder="1" name="magePalFormFieldManagerDataProvider"
                 type="MagePal\FormFieldManager\Plugin\Model\Customer\DataProviderPlugin"/>
     </type>
-    <type name="Magento\Ui\Component\AbstractComponent">
+    <type name="Magento\Ui\Component\Form\Fieldset">
         <plugin sortOrder="1" name="magePalFormFieldManagerAbstractComponent"
                 type="MagePal\FormFieldManager\Plugin\Component\AbstractComponentPlugin"/>
     </type>
     <type name="Magento\Customer\Model\Metadata\Form">
         <plugin sortOrder="1" name="magePalFormFieldManagerForm"
                 type="MagePal\FormFieldManager\Plugin\Model\Metadata\FormPlugin"/>
     </type>
-</config>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -15,23 +15,18 @@
             <label>Form Field Manager</label>
             <tab>magepal</tab>
             <resource>MagePal_FormFieldManager::magepal_formfieldmanager</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 Form Field Manager</label>
-                <attribute type="expanded">1</attribute>
                 <comment>
                     <![CDATA[
-                    <strong>Copyright © 2020 <a href="http://www.magepal.com" target="_blank">www.magepal.com</a> / <a href="mailto:[email protected]">[email protected]</a></strong><br />
+                    <strong>Copyright © 2021 <a href="http://www.magepal.com" target="_blank">www.magepal.com</a> / <a href="mailto:[email protected]">[email protected]</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\FormFieldManager\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_FormFieldManager" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Composer Version</label>
-                    <frontend_model>MagePal\FormFieldManager\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">

diff --git a/etc/module.xml b/etc/module.xml
@@ -4,7 +4,7 @@
     <module name="MagePal_FormFieldManager" setup_version="1.0.0">
         <sequence>
             <module name="Magento_Customer"/>
-
+            <module name="MagePal_Core"/>
         </sequence>
     </module>
-</config>
+</config>