Skip to content

Commit 017a09a

Browse files
glo25731glo25731
committed
ACQE-4427: Tax details verification for partial invoice and credit memo with shopping cart rule and FPT
1 parent 36beb55 commit 017a09a

11 files changed

+25
-85
lines changed

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminChangeCalculationSettingsActionGroup.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,17 @@
1313
<description>Goes to the 'Configuration' page for 'Tax'. Change the 'Calculation Settings'.</description>
1414
</annotations>
1515
<!-- change configurations on tax calculation settings-->
16-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" stepKey="waitToOpenCalculationSettingsTab"/>
1716
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettings}}" visible="true" stepKey="openCalculationSettingsTab"/>
18-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" stepKey="waitToClickCalculationMethodBasedCheckBox"/>
1917
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
2018
<selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
21-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" stepKey="waitToClickTaxCalculationBasedCheckBox"/>
2219
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
2320
<selectOption userInput="Shipping Origin" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
24-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" stepKey="waitToClickCalculationPricesCheckBox"/>
2521
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
2622
<selectOption userInput="Including Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="setCalculationPriceToIncludingTax"/>
27-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" stepKey="waitToClickShippingPricesCheckBox"/>
2823
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickShippingPricesCheckBox"/>
2924
<selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationShippingPrices}}" stepKey="setCalculationPriceToExcludingTax"/>
30-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationApplyCustomerTaxInherit}}" stepKey="waitToClickApplyCustomerTaxCheckBox"/>
3125
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationApplyCustomerTaxInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickApplyCustomerTaxCheckBox"/>
3226
<selectOption userInput="After Discount" selector="{{AdminConfigureTaxSection.taxCalculationApplyCustomerTax}}" stepKey="setApplyCustomerTaxAfterDiscount"/>
33-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxCalculationApplyDiscountOnPricesInherit}}" stepKey="waitToClickApplyDiscountOnPricesCheckBox"/>
3427
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationApplyDiscountOnPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickApplyDiscountOnPricesCheckBox"/>
3528
<selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationApplyDiscountOnPrices}}" stepKey="setApplyDiscountOnPricesToExecludeTax"/>
3629
</actionGroup>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminChangeFixedProductTaxesActionGroup.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,20 @@
1313
<description>Goes to the 'Configuration' page via the Admin Side Menu. Change the values for 'Fixed Product Taxes'.</description>
1414
</annotations>
1515
<!-- change shopping cart display setting configurations -->
16-
<scrollTo selector="{{AdminConfigureTaxSection.fixedProductTaxes}}" stepKey="scrollTofixedProductTaxesSection"/>
17-
<waitForElementVisible selector="{{AdminConfigureTaxSection.fixedProductTaxes}}" stepKey="waitToOpenOixedProductTaxesSettings"/>
18-
<conditionalClick selector="{{AdminConfigureTaxSection.fixedProductTaxes}}" dependentSelector="{{AdminConfigureTaxSection.fixedProductTaxes}}" visible="true" stepKey="openOixedProductTaxesSettings"/>
19-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueEnableFpt}}" stepKey="waitToClickSystemValueEnableFptCheckBox"/>
16+
<scrollTo selector="{{AdminConfigureTaxSection.fixedProductTaxes}}" stepKey="scrollToFixedProductTaxesSection"/>
17+
<conditionalClick selector="{{AdminConfigureTaxSection.fixedProductTaxes}}" dependentSelector="{{AdminConfigureTaxSection.fixedProductTaxes}}" visible="true" stepKey="openFixedProductTaxesSettings"/>
2018
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueEnableFpt}}" dependentSelector="{{AdminConfigureTaxSection.systemValueEnableFpt}}" visible="true" stepKey="clickSystemValueEnableFptCheckBox"/>
2119
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownFptYes}}" stepKey="selectDropdownValueForFpt"/>
22-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueDisplayPricesProducts}}" stepKey="waitToClickSystemValueDisplayPricesProductsCheckBox"/>
2320
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueDisplayPricesProducts}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDisplayPricesProducts}}" visible="true" stepKey="clickSystemValueDisplayPricesProductsCheckBox"/>
2421
<selectOption userInput="Excluding FPT" selector="{{AdminConfigureTaxSection.dropdownIncludingFPTAndFPTDescription}}" stepKey="selectOptionForDropdownIncludingFPTAndFPTDescription"/>
25-
<waitForElementVisible selector="{{AdminConfigureTaxSection.displayPricesOnProductViewPageCheckbox}}" stepKey="waitToClickDisplayPricesOnProductViewPageCheckBox"/>
2622
<conditionalClick selector="{{AdminConfigureTaxSection.displayPricesOnProductViewPageCheckbox}}" dependentSelector="{{AdminConfigureTaxSection.displayPricesOnProductViewPageCheckbox}}" visible="true" stepKey="clickDisplayPricesOnProductViewPageCheckBox"/>
2723
<selectOption userInput="Excluding FPT" selector="{{AdminConfigureTaxSection.displayPricesOnProductViewPage}}" stepKey="selectOptionForDisplayPricesOnProductViewPage"/>
28-
<waitForElementVisible selector="{{AdminConfigureTaxSection.displayPricesInSaleModuleCheckbox}}" stepKey="waitToClickDisplayPricesInSaleModuleCheckbox"/>
2924
<conditionalClick selector="{{AdminConfigureTaxSection.displayPricesInSaleModuleCheckbox}}" dependentSelector="{{AdminConfigureTaxSection.displayPricesInSaleModuleCheckbox}}" visible="true" stepKey="clickDisplayPricesInSaleModuleCheckbox"/>
3025
<selectOption userInput="Excluding FPT" selector="{{AdminConfigureTaxSection.displayPricesInSaleModule}}" stepKey="selectOptionForDisplayPricesInSaleModule"/>
31-
<waitForElementVisible selector="{{AdminConfigureTaxSection.displayPricesInEmailCheckbox}}" stepKey="waitToClickDisplayPricesInEmailCheckbox"/>
3226
<conditionalClick selector="{{AdminConfigureTaxSection.displayPricesInEmailCheckbox}}" dependentSelector="{{AdminConfigureTaxSection.displayPricesInEmailCheckbox}}" visible="true" stepKey="clickDisplayPricesInEmailCheckbox"/>
3327
<selectOption userInput="Excluding FPT" selector="{{AdminConfigureTaxSection.displayPricesInEmail}}" stepKey="selectOptionForDisplayPricesInEmail"/>
34-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueApplyTaxToFpt}}" stepKey="waitToClicksystemValueApplyTaxToFptCheckbox"/>
35-
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueApplyTaxToFpt}}" dependentSelector="{{AdminConfigureTaxSection.includeFPTInSubtotalCheckbox}}" visible="true" stepKey="clicksystemValueApplyTaxToFptCheckbox"/>
28+
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueApplyTaxToFpt}}" dependentSelector="{{AdminConfigureTaxSection.includeFPTInSubtotalCheckbox}}" visible="true" stepKey="clickSystemValueApplyTaxToFptCheckbox"/>
3629
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownApplyTaxToFpt}}" stepKey="selectOptionForDropdownApplyTaxToFpt"/>
37-
<waitForElementVisible selector="{{AdminConfigureTaxSection.includeFPTInSubtotalCheckbox}}" stepKey="waitToClickIncludeFPTInSubtotalCheckbox"/>
3830
<conditionalClick selector="{{AdminConfigureTaxSection.includeFPTInSubtotalCheckbox}}" dependentSelector="{{AdminConfigureTaxSection.includeFPTInSubtotalCheckbox}}" visible="true" stepKey="clickIncludeFPTInSubtotalCheckbox"/>
3931
<selectOption userInput="No" selector="{{AdminConfigureTaxSection.includeFPTInSubtotal}}" stepKey="selectOptionForIncludeFPTInSubtotal"/>
4032
</actionGroup>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminChangePriceDisplaySettingsActionGroup.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414
</annotations>
1515
<!-- change display setting configurations -->
1616
<scrollTo selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" stepKey="scrollToTaxPricesDisplaySection"/>
17-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" stepKey="waitToOpenPriceDisplaySettings"/>
1817
<conditionalClick selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" dependentSelector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" visible="true" stepKey="openPriceDisplaySettings"/>
19-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" stepKey="waitToClickDisplayProductPricesCheckBox"/>
2018
<conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" visible="true" stepKey="clickDisplayProductPricesCheckBox"/>
2119
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayProductPrices}}" stepKey="clickDisplayProductPrices"/>
22-
<waitForElementVisible selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" stepKey="waitTolickDisplayShippingPricesCheckBox"/>
2320
<conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayShippingPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayShippingPricesInherit}}" visible="true" stepKey="clickDisplayShippingPricesCheckBox"/>
2421
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayShippingPrices}}" stepKey="clickDisplayShippingPrices"/>
2522
</actionGroup>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminChangeSalesTaxSettingsActionGroup.xml‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,18 @@
1414
</annotations>
1515
<!-- change shopping cart display setting configurations -->
1616
<scrollTo selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" stepKey="scrollToordersInvoicesCreditSalessSection"/>
17-
<waitForElementVisible selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" stepKey="waitToOpenordersInvoicesCreditSalesSettings"/>
18-
<conditionalClick selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" visible="true" stepKey="openordersInvoicesCreditSalesSettings"/>
19-
<waitForElementVisible selector="{{AdminConfigureTaxSection.salesDisplayPriceCheckBox}}" stepKey="waitToClicksalesDisplayPriceCheckBoxCheckBox"/>
20-
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplayPriceCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplayPriceCheckBox}}" visible="true" stepKey="clicksalesDisplayPriceCheckBoxCheckBox"/>
17+
<conditionalClick selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" visible="true" stepKey="openOrdersInvoicesCreditSalesSettings"/>
18+
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplayPriceCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplayPriceCheckBox}}" visible="true" stepKey="clickSalesDisplayPriceCheckBoxCheckBox"/>
2119
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.salesDisplayPrice}}" stepKey="selectOptionForDisplayPricesValue"/>
22-
<waitForElementVisible selector="{{AdminConfigureTaxSection.salesDisplaySubtotalCheckBox}}" stepKey="waitToClicksalesDisplaySubtotalCheckBoxCheckBox"/>
23-
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplaySubtotalCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplaySubtotalCheckBox}}" visible="true" stepKey="clicksalesDisplaySubtotalCheckBoxCheckBox"/>
24-
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.salesDisplaySubtotal}}" stepKey="selectOptionForsalesDisplaySubtotal"/>
25-
<waitForElementVisible selector="{{AdminConfigureTaxSection.salesDisplayShippingAmountCheckBox}}" stepKey="waitToClicksalesDisplayShippingAmountCheckBoxCheckBox"/>
26-
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplayShippingAmountCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplayShippingAmountCheckBox}}" visible="true" stepKey="clicksalesDisplayShippingAmountCheckBoxCheckBox"/>
27-
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.salesDisplaysShippingAmount}}" stepKey="selectOptionForsalesDisplaysShippingAmount"/>
28-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" stepKey="waitToClicksystemValueIncludeTaxTotalSalesCheckBox"/>
29-
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="true" stepKey="clicksystemValueIncludeTaxTotalSalesCheckBox"/>
30-
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" stepKey="selectOptionFordropdownIncludeTaxTotalSales"/>
31-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}" stepKey="waitToClicksystemValueDisplayTaxSummarySalesCheckBox"/>
32-
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}" visible="true" stepKey="clicksystemValueDisplayTaxSummarySalesCheckBox"/>
33-
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummarySales}}" stepKey="selectOptionFordropdownDisplayTaxSummarySales"/>
34-
<waitForElementVisible selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}" stepKey="waitToClicksystemValueDisplayZeroTaxSalesCheckBox"/>
35-
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}" visible="true" stepKey="clicksystemValueDisplayZeroTaxSalesCheckBox"/>
36-
<selectOption userInput="No" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxSales}}" stepKey="selectOptionFordropdownDisplayZeroTaxSales"/>
20+
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplaySubtotalCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplaySubtotalCheckBox}}" visible="true" stepKey="clickSalesDisplaySubtotalCheckBoxCheckBox"/>
21+
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.salesDisplaySubtotal}}" stepKey="selectOptionForDalesDisplaySubtotal"/>
22+
<conditionalClick selector="{{AdminConfigureTaxSection.salesDisplayShippingAmountCheckBox}}" dependentSelector="{{AdminConfigureTaxSection.salesDisplayShippingAmountCheckBox}}" visible="true" stepKey="clickSalesDisplayShippingAmountCheckBoxCheckBox"/>
23+
<selectOption userInput="Including and Excluding Tax" selector="{{AdminConfigureTaxSection.salesDisplaysShippingAmount}}" stepKey="selectOptionForDalesDisplaysShippingAmount"/>
24+
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="true" stepKey="clickSystemValueIncludeTaxTotalSalesCheckBox"/>
25+
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" stepKey="selectOptionForDropdownIncludeTaxTotalSales"/>
26+
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}" visible="true" stepKey="clickSystemValueDisplayTaxSummarySalesCheckBox"/>
27+
<selectOption userInput="Yes" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummarySales}}" stepKey="selectOptionForDropdownDisplayTaxSummarySales"/>
28+
<conditionalClick selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}" visible="true" stepKey="clickSystemValueDisplayZeroTaxSalesCheckBox"/>
29+
<selectOption userInput="No" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxSales}}" stepKey="selectOptionForDropdownDisplayZeroTaxSales"/>
3730
</actionGroup>
3831
</actionGroups>

0 commit comments

Comments
 (0)