Skip to content

Commit add9d57

Browse files
lakshmana49lakshmana49
committed
ACP2E-3276: Order reports showing the wrong currency symbol
1 parent 3f5cb78 commit add9d57

File tree

3 files changed

+121
-238
lines changed

3 files changed

+121
-238
lines changed

‎app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection/GeneratedReportSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<section name="GeneratedReportSection">
1111
<element name="ordersCount" type="text" selector="//tr[@class='totals']/th[@class=' col-orders col-orders_count col-number']"/>
1212
<element name="canceledOrders" type="text" selector="//tr[@class='totals']/th[@class=' col-canceled col-total_canceled_amount a-right']"/>
13+
<element name="salesTotals" type="text" selector="//tr[@class='totals']/th[@class=' col-sales-total col-total_income_amount a-right']"/>
1314
</section>
1415
</sections>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminOrderReportsForMultiWebsiteWithDifferentDisplayCurrencyTest.xml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminOrderReportsForMultiWebsiteWithDifferentDisplayCurrencyTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Admin Order Reports For Multi Website With Different Display Currency(USD And EUR) Test"/>
15+
<title value="Admin Order Reports For Multi Website With Different Display Currency Test"/>
16+
<description value="Admin Order Reports For Multi Website With Different Display Currency Test"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="ACP2E-3276"/>
19+
<group value="reports"/>
20+
</annotations>
21+
<before>
22+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
23+
<!--Set catalog price scope to Global-->
24+
<comment userInput="Set catalog price scope to Website" stepKey="commentSetPriceScope"/>
25+
<magentoCLI command="config:set catalog/price/scope 0" stepKey="setPriceScopeWebsite"/>
26+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
27+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
28+
29+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
30+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
31+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
34+
<argument name="website" value="{{customWebsite.name}}"/>
35+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
36+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
39+
<argument name="StoreGroup" value="customStoreGroup"/>
40+
<argument name="customStore" value="customStore"/>
41+
</actionGroup>
42+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
43+
<argument name="productId" value="$createProduct.id$"/>
44+
</actionGroup>
45+
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="assignProductToSecondWebsite">
46+
<argument name="website" value="{{customWebsite.name}}"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="goToCurrencySetupPage"/>
49+
<actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="switchToMainWebsite">
50+
<argument name="website" value="customWebsite"/>
51+
</actionGroup>
52+
<uncheckOption selector="{{AdminConfigSection.allowedCurrencyCheckbox}}" stepKey="uncheckUseSystemValueDisplayCurrency"/>
53+
<uncheckOption selector="{{AdminConfigSection.defaultCurrencyCheckbox}}" stepKey="uncheckUseSystemValueAllowedCurrency"/>
54+
<selectOption selector="{{AdminConfigSection.defaultCurrency}}" userInput="Euro" stepKey="selectAllowedDisplayCurrency"/>
55+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="['Euro']" stepKey="selectDefaultDisplayCurrency"/>
56+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration"/>
57+
58+
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPageSecondTime"/>
59+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForLoadRatesPageSecondTime"/>
60+
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRates">
61+
<argument name="firstCurrency" value="USD"/>
62+
<argument name="secondCurrency" value="EUR"/>
63+
<argument name="rate" value="0.8"/>
64+
</actionGroup>
65+
66+
</before>
67+
<after>
68+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
69+
<magentoCLI command="config:set catalog/price/scope 1" stepKey="setCatalogPriceScopeToGlobal"/>
70+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
71+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersFilters"/>
72+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
73+
<argument name="websiteName" value="{{customWebsite.name}}"/>
74+
</actionGroup>
75+
</after>
76+
<!--Create customer account for Second Website-->
77+
<actionGroup ref="StorefrontOpenProductPageUsingStoreCodeInUrlActionGroup" stepKey="openProductPageUsingStoreCodeInUrl">
78+
<argument name="product" value="$createProduct$"/>
79+
<argument name="storeView" value="customStore"/>
80+
</actionGroup>
81+
<actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="addProductToCart"/>
82+
<!-- Go to Checkout -->
83+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
84+
85+
<!-- Fill all required fields with valid data and select Flat Rate, price = 5, shipping -->
86+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
87+
<argument name="shippingMethod" value="Flat Rate"/>
88+
<argument name="customerAddressVar" value="US_Address_CA" />
89+
</actionGroup>
90+
91+
<!-- Select payment solution -->
92+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
93+
94+
<!-- Place Order: order is successfully placed -->
95+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
96+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumberEUR"/>
97+
98+
<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPageActionGroup" />
99+
100+
<click selector="{{ReportMainSection.storeViewDropdown}}" stepKey="clickOrderReportWebsiteSwitchDropdown"/>
101+
<waitForElementVisible selector="{{ReportMainSection.websiteByName('Main Website')}}" stepKey="waitForOrderReportWebsiteAreVisible"/>
102+
<click selector="{{ReportMainSection.websiteByName(customWebsite.name)}}" stepKey="clickOrderReportWebsiteByName"/>
103+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
104+
105+
<generateDate stepKey="generateEndDate" date="+1 day" format="m/d/Y"/>
106+
<generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
107+
108+
<actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportOrderReportEUR">
109+
<argument name="orderFromDate" value="$generateStartDate"/>
110+
<argument name="orderToDate" value="$generateEndDate"/>
111+
</actionGroup>
112+
<waitForPageLoad stepKey="waitForGenerateReportOrderEUR"/>
113+
114+
<grabTextFrom selector="{{GeneratedReportSection.salesTotals}}" stepKey="grabOrderAmountEURO"/>
115+
<assertStringContainsString stepKey="checkOrderCurrencySymbolEuro">
116+
<actualResult type="variable">$grabOrderAmountEURO</actualResult>
117+
<expectedResult type="string">€</expectedResult>
118+
</assertStringContainsString>
119+
</test>
120+
</tests>

‎app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php

Lines changed: 0 additions & 238 deletions
This file was deleted.

0 commit comments

Comments
 (0)