Merge remote-tracking branch 'l3/ACP2E-507' into PR_L3_06_04_2022

Author: veloraven

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

@@ -22,5 +22,8 @@
         <element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
         <element name="price" type="text" selector="//*[@id='checkout-shipping-method-load']//td[@class='col col-price']"/>
         <element name="shippingRatePriceByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//td//span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="showShippingVatNumber" type="text" selector="div.shipping-address-item"/>
+        <element name="showBillingVatNumber" type="text" selector="div.billing-address-details"/>
+        <element name="showShippingInfoVatNumber" type="text" selector="div.shipping-information-content"/>
     </section>
 </sections>

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

@@ -7,16 +7,21 @@
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
     <text args="currentBillingAddress().prefix"></text> <text args="currentBillingAddress().firstname"></text>
     <text args="currentBillingAddress().middlename"></text>
-    <text args="currentBillingAddress().lastname"></text> <text args="currentBillingAddress().suffix"></text><br/>
-    <text args="_.values(currentBillingAddress().street).join(', ')"></text><br/>
+    <text args="currentBillingAddress().lastname"></text> <text args="currentBillingAddress().suffix"></text><br>
+    <if args="currentBillingAddress().company">
+        <text args="currentBillingAddress().company"></text><br>
+    </if>
+    <text args="_.values(currentBillingAddress().street).join(', ')"></text><br>
     <text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
-    <text args="currentBillingAddress().postcode"></text><br/>
-    <text args="getCountryName(currentBillingAddress().countryId)"></text><br/>
-    <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
-
+    <text args="currentBillingAddress().postcode"></text><br>
+    <text args="getCountryName(currentBillingAddress().countryId)"></text><br>
+    <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br>
+    <if args="currentBillingAddress().vatId">
+        VAT: <text args="currentBillingAddress().vatId"></text><br>
+    </if>
     <each args="data: currentBillingAddress().customAttributes, as: 'element'">
         <text args="$parent.getCustomAttributeLabel(element)"></text>
-        <br/>
+        <br>
     </each>
 
     <button visible="!isAddressSameAsShipping()"

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

@@ -6,15 +6,20 @@
 -->
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
     <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
-    <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
-    <text args="_.values(address().street).join(', ')"></text><br/>
-    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
-    <text args="getCountryName(address().countryId)"></text><br/>
-    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
-
+    <text args="address().lastname"></text> <text args="address().suffix"></text><br>
+    <if args="address().company">
+        <text args="address().company"></text><br>
+    </if>
+    <text args="_.values(address().street).join(', ')"></text><br>
+    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
+    <text args="getCountryName(address().countryId)"></text><br>
+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
+    <if args="address().vatId">
+        VAT: <text args="address().vatId"></text><br>
+    </if>
     <each args="data: address().customAttributes, as: 'element'">
         <text args="$parent.getCustomAttributeLabel(element)"></text>
-        <br/>
+        <br>
     </each>
 
     <button visible="address().isEditable()" type="button"

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

@@ -6,14 +6,19 @@
 -->
 <if args="visible()">
     <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
-    <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
-    <text args="_.values(address().street).join(', ')"></text><br/>
-    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
-    <text args="getCountryName(address().countryId)"></text><br/>
-    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
-
+    <text args="address().lastname"></text> <text args="address().suffix"></text><br>
+    <if args="address().company">
+        <text args="address().company"></text><br>
+    </if>
+    <text args="_.values(address().street).join(', ')"></text><br>
+    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
+    <text args="getCountryName(address().countryId)"></text><br>
+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
+    <if args="address().vatId">
+        VAT: <text args="address().vatId"></text><br>
+    </if>
     <each args="data: address().customAttributes, as: 'element'">
         <text args="$parent.getCustomAttributeLabel(element)"></text>
-        <br/>
+        <br>
     </each>
 </if>

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

@@ -47,6 +47,7 @@
         <data key="country">United States</data>
         <data key="postcode">78729</data>
         <data key="telephone">512-345-6789</data>
+        <data key="vat_id">47458714</data>
         <data key="default_billing">Yes</data>
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>