Skip to content

Commit 7682b28

Browse files
authored
ENGCOM-5452: Moved Zero Subtotal Checkout Payment Settings #23679
2 parents 345f920 + 48e22ec commit 7682b28

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

app/code/Magento/OfflinePayments/etc/adminhtml/system.xml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -152,41 +152,6 @@
152152
<label>Sort Order</label>
153153
</field>
154154
</group>
155-
<group id="free" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
156-
<label>Zero Subtotal Checkout</label>
157-
<field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
158-
<label>Enabled</label>
159-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
160-
</field>
161-
<field id="order_status" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
162-
<label>New Order Status</label>
163-
<source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
164-
</field>
165-
<field id="payment_action" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
166-
<label>Automatically Invoice All Items</label>
167-
<source_model>Magento\Payment\Model\Source\Invoice</source_model>
168-
<depends>
169-
<field id="order_status" separator=",">processing</field>
170-
</depends>
171-
</field>
172-
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
173-
<label>Sort Order</label>
174-
<frontend_class>validate-number</frontend_class>
175-
</field>
176-
<field id="title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
177-
<label>Title</label>
178-
</field>
179-
<field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
180-
<label>Payment from Applicable Countries</label>
181-
<source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
182-
</field>
183-
<field id="specificcountry" translate="label" type="multiselect" sortOrder="51" showInDefault="1" showInWebsite="1" showInStore="0">
184-
<label>Payment from Specific Countries</label>
185-
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
186-
<can_be_empty>1</can_be_empty>
187-
</field>
188-
<field id="model"></field>
189-
</group>
190155
</section>
191156
</system>
192157
</config>

app/code/Magento/OfflinePayments/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ Title,Title
2121
"Bank Transfer Payment","Bank Transfer Payment"
2222
Instructions,Instructions
2323
"Cash On Delivery Payment","Cash On Delivery Payment"
24-
"Zero Subtotal Checkout","Zero Subtotal Checkout"
2524
"Automatically Invoice All Items","Automatically Invoice All Items"

app/code/Magento/Payment/etc/adminhtml/system.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,41 @@
1111
<label>Payment Methods</label>
1212
<tab>sales</tab>
1313
<resource>Magento_Payment::payment</resource>
14+
<group id="free" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
15+
<label>Zero Subtotal Checkout</label>
16+
<field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
17+
<label>Enabled</label>
18+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
19+
</field>
20+
<field id="order_status" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
21+
<label>New Order Status</label>
22+
<source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
23+
</field>
24+
<field id="payment_action" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
25+
<label>Automatically Invoice All Items</label>
26+
<source_model>Magento\Payment\Model\Source\Invoice</source_model>
27+
<depends>
28+
<field id="order_status" separator=",">processing</field>
29+
</depends>
30+
</field>
31+
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
32+
<label>Sort Order</label>
33+
<frontend_class>validate-number</frontend_class>
34+
</field>
35+
<field id="title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
36+
<label>Title</label>
37+
</field>
38+
<field id="allowspecific" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
39+
<label>Payment from Applicable Countries</label>
40+
<source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
41+
</field>
42+
<field id="specificcountry" translate="label" type="multiselect" sortOrder="51" showInDefault="1" showInWebsite="1" showInStore="0">
43+
<label>Payment from Specific Countries</label>
44+
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
45+
<can_be_empty>1</can_be_empty>
46+
</field>
47+
<field id="model"></field>
48+
</group>
1449
</section>
1550
</system>
1651
</config>

app/code/Magento/Payment/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ No,No
5858
"Payment Methods Section","Payment Methods Section"
5959
"Payment Services","Payment Services"
6060
"Payment Methods","Payment Methods"
61+
"Zero Subtotal Checkout","Zero Subtotal Checkout"

0 commit comments

Comments
 (0)