From 089e24a10d2ee8d527e5e65308d384a095127461 Mon Sep 17 00:00:00 2001
From: Andrea Parmeggiani <andrea.parmeggiani@santacleo.com>
Date: Fri, 12 Jul 2019 17:02:06 +0200
Subject: [PATCH 1/2] Moved Zero Subtotal Checkout Payment Settings

---
 .../OfflinePayments/etc/adminhtml/system.xml  | 35 -------------------
 .../Magento/Payment/etc/adminhtml/system.xml  | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
index 89cc4d0986a00..01f041bcb68c2 100644
--- a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
@@ -152,41 +152,6 @@
                     <label>Sort Order</label>
                 </field>
             </group>
-            <group id="free" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Zero Subtotal Checkout</label>
-                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Enabled</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-                <field id="order_status" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>New Order Status</label>
-                    <source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
-                </field>
-                <field id="payment_action" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Automatically Invoice All Items</label>
-                    <source_model>Magento\Payment\Model\Source\Invoice</source_model>
-                    <depends>
-                        <field id="order_status" separator=",">processing</field>
-                    </depends>
-                </field>
-                <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Sort Order</label>
-                    <frontend_class>validate-number</frontend_class>
-                </field>
-                <field id="title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Title</label>
-                </field>
-                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Payment from Applicable Countries</label>
-                    <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                </field>
-                <field id="specificcountry" translate="label" type="multiselect" sortOrder="51" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Payment from Specific Countries</label>
-                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-                    <can_be_empty>1</can_be_empty>
-                </field>
-                <field id="model"></field>
-            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Payment/etc/adminhtml/system.xml b/app/code/Magento/Payment/etc/adminhtml/system.xml
index 3aa4ee53b30f1..d168dc13a397b 100644
--- a/app/code/Magento/Payment/etc/adminhtml/system.xml
+++ b/app/code/Magento/Payment/etc/adminhtml/system.xml
@@ -11,6 +11,41 @@
             <label>Payment Methods</label>
             <tab>sales</tab>
             <resource>Magento_Payment::payment</resource>
+            <group id="free" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Zero Subtotal Checkout</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="order_status" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>New Order Status</label>
+                    <source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
+                </field>
+                <field id="payment_action" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Automatically Invoice All Items</label>
+                    <source_model>Magento\Payment\Model\Source\Invoice</source_model>
+                    <depends>
+                        <field id="order_status" separator=",">processing</field>
+                    </depends>
+                </field>
+                <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Sort Order</label>
+                    <frontend_class>validate-number</frontend_class>
+                </field>
+                <field id="title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Title</label>
+                </field>
+                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Payment from Applicable Countries</label>
+                    <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+                </field>
+                <field id="specificcountry" translate="label" type="multiselect" sortOrder="51" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Payment from Specific Countries</label>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <can_be_empty>1</can_be_empty>
+                </field>
+                <field id="model"></field>
+            </group>
         </section>
     </system>
 </config>

From fb7d3aeec66ef78767bd1faf48d57711f62ec593 Mon Sep 17 00:00:00 2001
From: Andrea Parmeggiani <info@textarea.it>
Date: Fri, 19 Jul 2019 18:21:50 +0200
Subject: [PATCH 2/2] Moved "Zero Subtotal Checkout" translation to Payment
 Module

---
 app/code/Magento/OfflinePayments/i18n/en_US.csv | 1 -
 app/code/Magento/Payment/i18n/en_US.csv         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/OfflinePayments/i18n/en_US.csv b/app/code/Magento/OfflinePayments/i18n/en_US.csv
index 5a180f7af4944..c5e503f4f9b6a 100644
--- a/app/code/Magento/OfflinePayments/i18n/en_US.csv
+++ b/app/code/Magento/OfflinePayments/i18n/en_US.csv
@@ -21,5 +21,4 @@ Title,Title
 "Bank Transfer Payment","Bank Transfer Payment"
 Instructions,Instructions
 "Cash On Delivery Payment","Cash On Delivery Payment"
-"Zero Subtotal Checkout","Zero Subtotal Checkout"
 "Automatically Invoice All Items","Automatically Invoice All Items"
diff --git a/app/code/Magento/Payment/i18n/en_US.csv b/app/code/Magento/Payment/i18n/en_US.csv
index d5a79becec22b..939215e995d84 100644
--- a/app/code/Magento/Payment/i18n/en_US.csv
+++ b/app/code/Magento/Payment/i18n/en_US.csv
@@ -58,3 +58,4 @@ No,No
 "Payment Methods Section","Payment Methods Section"
 "Payment Services","Payment Services"
 "Payment Methods","Payment Methods"
+"Zero Subtotal Checkout","Zero Subtotal Checkout"