Skip to content

Commit 47e385d

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop
 - merged latest code from mainline branch
2 parents 5749410 + f5c5db7 commit 47e385d

File tree

2 files changed

+56
-3
lines changed

2 files changed

+56
-3
lines changed

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

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* seeInField COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminCreateOrderFormShippingAddressActionGroup">
12+
<annotations>
13+
<description>Verify shipping address inputs on admin create order page. Start on admin create new order page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="prefix" type="string" defaultValue="{{CustomerAddressSimple.prefix}}"/>
17+
<argument name="firstname" type="string" defaultValue="{{CustomerAddressSimple.firstname}}"/>
18+
<argument name="middleName" type="string" defaultValue="{{CustomerAddressSimple.middlename}}"/>
19+
<argument name="lastname" type="string" defaultValue="{{CustomerAddressSimple.lastname}}"/>
20+
<argument name="suffix" type="string" defaultValue="{{CustomerAddressSimple.suffix}}"/>
21+
<argument name="company" type="string" defaultValue="{{CustomerAddressSimple.company}}"/>
22+
<argument name="streetLine1" type="string" defaultValue="{{CustomerAddressSimple.street[0]}}"/>
23+
<argument name="streetLine2" type="string" defaultValue="{{CustomerAddressSimple.street[1]}}"/>
24+
<argument name="city" type="string" defaultValue="{{CustomerAddressSimple.city}}"/>
25+
<argument name="countryId" type="string" defaultValue="{{CustomerAddressSimple.country_id}}"/>
26+
<argument name="state" type="string" defaultValue="{{CustomerAddressSimple.state}}"/>
27+
<argument name="province" type="string" defaultValue=""/>
28+
<argument name="postcode" type="string" defaultValue="{{CustomerAddressSimple.postcode}}"/>
29+
<argument name="telephone" type="string" defaultValue="{{CustomerAddressSimple.telephone}}"/>
30+
<argument name="fax" type="string" defaultValue="{{CustomerAddressSimple.fax}}"/>
31+
<argument name="vatNumber" type="string" defaultValue=""/>
32+
</arguments>
33+
34+
<waitForElementVisible selector="{{AdminOrderFormShippingAddressSection.NamePrefix}}" stepKey="waitForInputVisible"/>
35+
<seeInField selector="{{AdminOrderFormShippingAddressSection.NamePrefix}}" userInput="{{prefix}}" stepKey="verifyPrefix"/>
36+
<seeInField selector="{{AdminOrderFormShippingAddressSection.FirstName}}" userInput="{{firstname}}" stepKey="verifyFirstName"/>
37+
<seeInField selector="{{AdminOrderFormShippingAddressSection.MiddleName}}" userInput="{{middleName}}" stepKey="verifyMiddleName"/>
38+
<seeInField selector="{{AdminOrderFormShippingAddressSection.LastName}}" userInput="{{lastname}}" stepKey="verifyLastName"/>
39+
<seeInField selector="{{AdminOrderFormShippingAddressSection.NameSuffix}}" userInput="{{suffix}}" stepKey="verifySuffix"/>
40+
<seeInField selector="{{AdminOrderFormShippingAddressSection.Company}}" userInput="{{company}}" stepKey="verifyCompany"/>
41+
<seeInField selector="{{AdminOrderFormShippingAddressSection.StreetLine1}}" userInput="{{streetLine1}}" stepKey="verifyStreetLine1"/>
42+
<seeInField selector="{{AdminOrderFormShippingAddressSection.StreetLine2}}" userInput="{{streetLine2}}" stepKey="verifyStreetLine2"/>
43+
<seeInField selector="{{AdminOrderFormShippingAddressSection.City}}" userInput="{{city}}" stepKey="verifyCity"/>
44+
<seeInField selector="{{AdminOrderFormShippingAddressSection.Country}}" userInput="{{countryId}}" stepKey="verifyCountry"/>
45+
<seeInField selector="{{AdminOrderFormShippingAddressSection.State}}" userInput="{{state}}" stepKey="verifyState"/>
46+
<seeInField selector="{{AdminOrderFormShippingAddressSection.Province}}" userInput="{{province}}" stepKey="verifyProvince"/>
47+
<seeInField selector="{{AdminOrderFormShippingAddressSection.PostalCode}}" userInput="{{postcode}}" stepKey="verifyPostalCode"/>
48+
<seeInField selector="{{AdminOrderFormShippingAddressSection.Phone}}" userInput="{{telephone}}" stepKey="verifyPhone"/>
49+
<seeInField selector="{{AdminOrderFormShippingAddressSection.Fax}}" userInput="{{fax}}" stepKey="verifyFax"/>
50+
<seeInField selector="{{AdminOrderFormShippingAddressSection.VatNumber}}" userInput="{{vatNumber}}" stepKey="verifyVatNumber"/>
51+
</actionGroup>
52+
</actionGroups>

‎app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml

+4-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,10 @@ endif; ?>
142142
order.bindAddressFields('{$block->escapeJs($_addressChoiceContainerId)}');
143143
144144
script;
145-
if ($block->getIsShipping() && $block->getIsAsBilling()):
146-
$scriptString .= <<<script
147-
order.disableShippingAddress(true);
145+
if ($block->getIsShipping()):
146+
$disable = $block->getIsAsBilling() ? 'true' : 'false';
147+
$scriptString .= <<<script
148+
order.disableShippingAddress({$disable});
148149
149150
script;
150151
endif;

0 commit comments

Comments
 (0)