Skip to content

Commit df50d63

Browse files
engcom-Echoengcom-Echo
committed
MC-37657: A saved VAT Number is not displayed when placing an order by Admin on a Customer behalf
1 parent cd857f9 commit df50d63

File tree

5 files changed

+123
-0
lines changed

5 files changed

+123
-0
lines changed

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
</array>
199199
<data key="state">California</data>
200200
</entity>
201+
<entity name="US_With_Vat_Number" type="address" extends="US_Address_CA">
202+
<data key="vat_id">U1234567891</data>
203+
</entity>
201204
<entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
202205
<data key="default_billing">false</data>
203206
<data key="default_shipping">true</data>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,17 @@
233233
<data key="website_id">0</data>
234234
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
235235
</entity>
236+
<entity name="Customer_With_Vat_Number" type="customer">
237+
<data key="group_id">1</data>
238+
<data key="email" unique="prefix">[email protected]</data>
239+
<data key="firstname">John</data>
240+
<data key="lastname">Doe</data>
241+
<data key="fullname">John Doe</data>
242+
<data key="password">pwdTest123!</data>
243+
<data key="store_id">0</data>
244+
<data key="website_id">0</data>
245+
<requiredEntity type="address">US_With_Vat_Number</requiredEntity>
246+
</entity>
236247
<entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
237248
<data key="group_id">1</data>
238249
<data key="email" unique="prefix">[email protected]</data>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminFieldsFilledDefaultBillingAddressActionGroup.xml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AssertAdminFieldsFilledDefaultBillingAddressActionGroup">
11+
<annotations>
12+
<description>Admin assert fields filled default billing address from customer</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="firstName" type="string" defaultValue="John"/>
16+
<argument name="lastName" type="string" defaultValue="Doe"/>
17+
<argument name="company" type="string" defaultValue="Magento"/>
18+
<argument name="streetLine1" type="string" defaultValue="7700 West Parmer Lane"/>
19+
<argument name="streetLine2" type="string" defaultValue="113"/>
20+
<argument name="city" type="string" defaultValue="Los Angeles"/>
21+
<argument name="postcode" type="string" defaultValue="90001"/>
22+
<argument name="phone" type="string" defaultValue="512-345-6789"/>
23+
<argument name="vatNumber" type="string" defaultValue="U1234567891"/>
24+
</arguments>
25+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.FirstName}}" stepKey="getFirstName"/>
26+
<assertEquals stepKey="assertFirstName">
27+
<expectedResult type="string">{{firstName}}</expectedResult>
28+
<actualResult type="variable">getFirstName</actualResult>
29+
</assertEquals>
30+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.LastName}}" stepKey="getLastName"/>
31+
<assertEquals stepKey="assertLastName">
32+
<expectedResult type="string">{{lastName}}</expectedResult>
33+
<actualResult type="variable">getLastName</actualResult>
34+
</assertEquals>
35+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Company}}" stepKey="getCompany"/>
36+
<assertEquals stepKey="assertCompany">
37+
<expectedResult type="string">{{company}}</expectedResult>
38+
<actualResult type="variable">getCompany</actualResult>
39+
</assertEquals>
40+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" stepKey="getStreetLine1"/>
41+
<assertEquals stepKey="assertStreetLine1">
42+
<expectedResult type="string">{{streetLine1}}</expectedResult>
43+
<actualResult type="variable">getStreetLine1</actualResult>
44+
</assertEquals>
45+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.StreetLine2}}" stepKey="getStreetLine2"/>
46+
<assertEquals stepKey="assertStreetLine2">
47+
<expectedResult type="string">{{streetLine2}}</expectedResult>
48+
<actualResult type="variable">getStreetLine2</actualResult>
49+
</assertEquals>
50+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.City}}" stepKey="getCity"/>
51+
<assertEquals stepKey="assertCity">
52+
<expectedResult type="string">{{city}}</expectedResult>
53+
<actualResult type="variable">getCity</actualResult>
54+
</assertEquals>
55+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" stepKey="getPostcode"/>
56+
<assertEquals stepKey="assertPostcode">
57+
<expectedResult type="string">{{postcode}}</expectedResult>
58+
<actualResult type="variable">getPostcode</actualResult>
59+
</assertEquals>
60+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Phone}}" stepKey="getPhone"/>
61+
<assertEquals stepKey="assertPhone">
62+
<expectedResult type="string">{{phone}}</expectedResult>
63+
<actualResult type="variable">getPhone</actualResult>
64+
</assertEquals>
65+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.VatNumber}}" stepKey="getVatNumber"/>
66+
<assertEquals stepKey="assertVatNumber">
67+
<expectedResult type="string">{{vatNumber}}</expectedResult>
68+
<actualResult type="variable">getVatNumber</actualResult>
69+
</assertEquals>
70+
</actionGroup>
71+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingFieldsFilledFromDefaultBillingAddressCustomerInNewOrderTest.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCheckingFieldsFilledFromDefaultBillingAddressCustomerInNewOrderTest">
11+
<annotations>
12+
<features value="Sales"/>
13+
<stories value="Create order in Admin"/>
14+
<title value="Checking fields filled from default billing address customer"/>
15+
<description value="Checking fields filled from default billing address customer on create new order page"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="MC-40646"/>
18+
<useCaseId value="MC-37657"/>
19+
<group value="Sales"/>
20+
</annotations>
21+
<before>
22+
<createData entity="Customer_With_Vat_Number" stepKey="createCustomer"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
27+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
28+
</after>
29+
30+
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
31+
<argument name="customer" value="$createCustomer$"/>
32+
</actionGroup>
33+
<actionGroup ref="AssertAdminFieldsFilledDefaultBillingAddressActionGroup" stepKey="assertFieldsFilled"/>
34+
</test>
35+
</tests>

‎app/code/Magento/Sales/etc/fieldset.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,9 @@
774774
<field name="fax">
775775
<aspect name="to_quote_address" />
776776
</field>
777+
<field name="vat_id">
778+
<aspect name="to_quote_address" />
779+
</field>
777780
</fieldset>
778781
<fieldset id="order_address">
779782
<field name="prefix">

0 commit comments

Comments
 (0)