Skip to content

Commit e5257f6

Browse files
committed
ACQE-8463:Admin cannot handle order placement when payment methods are not available
- Added data entity to config COD payments
1 parent 3bac376 commit e5257f6

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,12 @@
3636
<data key="label">payment/purchaseorder/active</data>
3737
<data key="value">0</data>
3838
</entity>
39+
<entity name="cashOnDeliveryMaximumOrderTotalOrderPayment" type="config">
40+
<data key="path">payment/cashondelivery/max_order_total</data>
41+
<data key="value">100</data>
42+
</entity>
43+
<entity name="cashOnDeliveryMinimumOrderTotalOrderPayment" type="config">
44+
<data key="path">payment/cashondelivery/min_order_total</data>
45+
<data key="value">1</data>
46+
</entity>
3947
</entities>

app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPlacementWithPaymentMethodConstraintsTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@
2727
</createData>
2828
<createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
2929
<!-- Step 1&2: Disable payment method one of "Check/Money Order" and "Zero Subtotal Checkout" -->
30-
<magentoCLI command="config:set payment/checkmo/active 0" stepKey="disabledCheckMoneyOrderValue"/>
30+
<actionGroup ref="CliDisableCheckMoneyOrderPaymentMethodActionGroup" stepKey="disableCheckMoneyOrderValue"/>
3131
<magentoCLI command="config:set {{DisableZeroSubtotalCheckoutConfigData.path}} {{DisableZeroSubtotalCheckoutConfigData.value}}" stepKey="disabledZeroSubtotalCheckoutOrderValue"/>
3232
<!-- Step 3: Enable CashOnDelivery -->
3333
<createData entity="CashOnDeliveryPaymentMethodDefault" stepKey="enableCashOnDeliveryPaymentMethod"/>
3434
<!-- Step 4: Set the Maximum Order Total and Maximum Order Total CashOnDelivery -->
35-
<magentoCLI command="config:set payment/cashondelivery/max_order_total 100" stepKey="cashOnDeliveryMaximumOrderTotalConfigData"/>
36-
<magentoCLI command="config:set payment/cashondelivery/min_order_total 1" stepKey="cashOnDeliveryMinimumOrderTotalConfigData"/>
37-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronReindex">
38-
<argument name="indices" value=""/>
39-
</actionGroup>
35+
<magentoCLI command="config:set {{cashOnDeliveryMaximumOrderTotalOrderPayment.path}} {{cashOnDeliveryMaximumOrderTotalOrderPayment.value}}" stepKey="cashOnDeliveryMaximumOrderTotalConfigData"/>
36+
<magentoCLI command="config:set {{cashOnDeliveryMinimumOrderTotalOrderPayment.path}} {{cashOnDeliveryMinimumOrderTotalOrderPayment.value}}" stepKey="cashOnDeliveryMinimumOrderTotalOrderPayment"/>
37+
<magentoCLI command="config:set {{cashOnDeliveryMinimumOrderTotalOrderPayment.path}} {{cashOnDeliveryMinimumOrderTotalOrderPayment.value}}" stepKey="cashOnDeliveryMinimumOrderTotalOrderPayment"/>
4038
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
4139
</before>
4240
<after>
@@ -45,7 +43,7 @@
4543
<deleteData createDataKey="simpleCustomer" stepKey="deleteCustomer"/>
4644
<!-- Restore original payment method configurations -->
4745
<magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
48-
<magentoCLI command="config:set payment/cashondelivery/active 0" stepKey="restoreCOD"/>
46+
<magentoCLI command="config:set {{disabledCashOnDeliveryPayment.label}} {{disabledCashOnDeliveryPayment.value}}" stepKey="restoreCOD"/>
4947
<!-- Clear cache and logout -->
5048
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
5149
</after>

app/code/Magento/Sales/Test/Mftf/test-dependency-allowlist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ AdminSetProductQuantityToEachSkusConfigurableProductActionGroup
1717
AdminConfigurableProductFormSection
1818
StorefrontSelectCheckMoneyOrderActionGroup
1919
StorefrontSalesOrderSection
20+
CliDisableCheckMoneyOrderPaymentMethodActionGroup

0 commit comments

Comments
 (0)