Update copyright and add core extension

magepal · Apr 11, 2022 · f66b1da · f66b1da
1 parent c30922c
commit f66b1da
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 148 deletions.
diff --git a/Block/Adminhtml/System/Config/Form/Composer/Version.php b/Block/Adminhtml/System/Config/Form/Composer/Version.php
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "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.11"
     },
     "suggest": {
         "magepal/magento2-checkout-success-misc-script":"Add miscellaneous HTML and scripts to your checkout success page"

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -19,8 +19,8 @@
                 <label>Preview Success Page</label><attribute type="expanded">1</attribute>
                 <comment>
                     <![CDATA[
-                    <div id="magepal-info-pcsp">
-                        Copyright © 2020 <a href="https://www.magepal.com/magento2/extensions.html?utm_source=preview-confirmation-page&utm_medium=admin" target="_blank">MagePal, LLC</a>
+                    <div class="magepal-info">
+                        Copyright © 2022 <a href="https://www.magepal.com/magento2/extensions.html?utm_source=preview-confirmation-page&utm_medium=admin" target="_blank">MagePal, LLC</a>
                         <a href="https://www.magepal.com/help/docs/preview-order-confirmation-page-magento-2/?utm_source=preview-confirmation-page&utm_medium=admin#documentation" target="_blank">Documentation</a>
                         <a href="https://www.magepal.com/help/docs/preview-order-confirmation-page-magento-2/?utm_source=preview-confirmation-page&utm_medium=admin#support">Support</a>
                         <a href="https://www.magepal.com/help/docs/preview-order-confirmation-page-magento-2?utm_source=preview-confirmation-page&utm_medium=admin#current_version" target="_blank">Latest Version</a>
@@ -30,32 +30,12 @@
                     <div>
                     Design beautiful order confirmation page with our new <a href="https://www.magepal.com/enhanced-success-page.html">Enhanced Success Page</a> extension.
                     </div>
-                    <hr style="border-top: 1px solid #e3e3e3" />
-                    <style>
-                        #magepal-info-pcsp a {
-                            font-weight: bold;
-                            border-left: 2px solid #e3e3e3;
-                            padding-left:10px;
-                            padding-right:10px;
-                            color: #ef7e1e;
-                        }
-
-                        #magepal-info-pcsp a:first-child {
-                            padding-left: 5px;
-                            border-left: none;
-                        }
-
-                        #magepal-info-pcsp {
-                            padding-bottom: 5px;
-                        }
-                        .section-config.active #magepal_checkout_preview_success_page-head {
-                            padding-bottom: 0px;
-                        }
-                     </style>]]>
+                    <hr class="magepal-hr" />
+                    ]]>
                 </comment>
-                <field id="composer_version" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="MagePal_PreviewCheckoutSuccessPage" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Composer Version</label>
-                    <frontend_model>MagePal\PreviewCheckoutSuccessPage\Block\Adminhtml\System\Config\Form\Composer\Version</frontend_model>
+                    <frontend_model>MagePal\Core\Block\Adminhtml\System\Config\Composer\Version</frontend_model>
                 </field>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="1">
                     <label>Enable</label>

diff --git a/etc/module.xml b/etc/module.xml
@@ -2,5 +2,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="MagePal_PreviewCheckoutSuccessPage" setup_version="1.0.0">
+        <sequence>
+            <module name="MagePal_Core"/>
+        </sequence>
     </module>
-</config>
+</config>