From 70da2bc15425b8f2e54e9495df9faeec69e47319 Mon Sep 17 00:00:00 2001 From: "Rav [RedChamps]" Date: Sun, 5 Jul 2020 16:58:13 +0530 Subject: [PATCH 1/8] added company field value to shipping & billing address renderers --- .../view/frontend/web/template/billing-address/details.html | 3 +++ .../template/shipping-address/address-renderer/default.html | 3 +++ .../shipping-information/address-renderer/default.html | 3 +++ 3 files changed, 9 insertions(+) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html index 23bbce48fee2c..4fba07960c1d1 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html @@ -7,6 +7,9 @@

+ +
+
,

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html index b14f4da3f5f7d..b3ba4122d3aae 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html @@ -7,6 +7,9 @@

+ +
+
,

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html index 26dd7742d1da8..ffafdec1d67bd 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html @@ -7,6 +7,9 @@
+ +
+
,

From e567abf1e3c6a6d8e66ecf2b123c8a22fa5d1e01 Mon Sep 17 00:00:00 2001 From: "Rav [RedChamps]" Date: Fri, 10 Jul 2020 12:23:41 +0530 Subject: [PATCH 2/8] added Vat Id field to address renderers --- .../view/frontend/web/template/billing-address/details.html | 3 +++ .../template/shipping-address/address-renderer/default.html | 3 +++ .../shipping-information/address-renderer/default.html | 3 +++ 3 files changed, 9 insertions(+) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html index 4fba07960c1d1..f54b275cba6a3 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html @@ -10,6 +10,9 @@
+ +
+
,

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html index b3ba4122d3aae..72f30a93f99f7 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html @@ -10,6 +10,9 @@
+ +
+
,

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html index ffafdec1d67bd..47d443895cb30 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html @@ -10,6 +10,9 @@
+ +
+
,

From 937c4cbe540ed156acea0c39620d4e946cbed26a Mon Sep 17 00:00:00 2001 From: "taras.gamanov" Date: Mon, 28 Dec 2020 18:00:22 +0200 Subject: [PATCH 3/8] Fix has been updated --- .../frontend/web/template/billing-address/details.html | 8 +++++++- .../shipping-address/address-renderer/default.html | 5 ++--- .../shipping-information/address-renderer/default.html | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html index 6b3de69d1a21d..4724664a5e1c5 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html @@ -7,8 +7,14 @@

-
+ +
+ +
,
+ +
+

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html index 72f30a93f99f7..d5158b3e0b7cf 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html @@ -10,14 +10,13 @@
+
+ ,

-
- ,


-
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html index 47d443895cb30..047606973c82f 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html @@ -10,11 +10,11 @@
+
+ ,

-
- ,


From f18aa2542714aa970085a64f1592a19b71e1ec87 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" Date: Mon, 28 Dec 2020 18:01:08 +0200 Subject: [PATCH 4/8] Test has been added --- .../Mftf/Section/CheckoutShippingSection.xml | 1 + ...frontCompanyAndVatIdDataAtCheckoutTest.xml | 90 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml index 4b8b1745c16df..bd550ad56b15a 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml @@ -46,5 +46,6 @@ + diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml new file mode 100644 index 0000000000000..ed4633b21da11 --- /dev/null +++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml @@ -0,0 +1,90 @@ + + + + + + + + + + <description value="Company name and VAT Id should be visible at the checkout step in address if it switched on at configuration"/> + <severity value="MAJOR"/> + <testCaseId value="MC-*"/> + <group value="customer"/> + <group value="create"/> + </annotations> + <before> + <magentoCLI command="config:set customer/address/company_show opt" stepKey="setShowCompanyName"/> + <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/> + <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBefore"> + <argument name="tags" value="config"/> + </actionGroup> + <createData entity="CustomerEntityOne" stepKey="createCustomer"/> + <createData stepKey="category" entity="SimpleSubCategory"/> + <createData stepKey="product1" entity="SimpleProduct"> + <requiredEntity createDataKey="category"/> + </createData> + </before> + <after> + <magentoCLI command="config:set customer/address/company_show 0" stepKey="setShowCompanyNameBack"/> + <magentoCLI command="config:set customer/address/taxvat_show 0" stepKey="setShowTaxNumberBack"/> + <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfter"> + <argument name="tags" value="config"/> + </actionGroup> + <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> + <deleteData stepKey="deleteCategory" createDataKey="category"/> + <deleteData stepKey="deleteProduct1" createDataKey="product1"/> + </after> + <!--Login customer on storefront--> + <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer"> + <argument name="Customer" value="$$createCustomer$$" /> + </actionGroup> + <!-- Add product to the cart --> + <amOnPage url="$$product1.name$$.html" stepKey="goToProductPage"/> + <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart"> + <argument name="productName" value="$$product1.name$$"/> + </actionGroup> + <!--Go to Checkout--> + <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/> + <waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/> + <!--Check Company and Vat Id data at checkout shipping--> + <executeJS function="return document.querySelectorAll('{{CheckoutShippingSection.selectedShippingAddressData}}')[0].innerText;" stepKey="grabShipping"/> + <assertStringContainsString stepKey="checkCompanyAtShipping"> + <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult> + <actualResult type="variable">grabShipping</actualResult> + </assertStringContainsString> + <assertStringContainsString stepKey="checkVatIdAtShipping"> + <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult> + <actualResult type="variable">grabShipping</actualResult> + </assertStringContainsString> + <!--Move to 'Review & Payments'--> + <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/> + <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/> + <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/> + <!--Check Company and Vat Id data at checkout 'Review & Payments'--> + <executeJS function="return document.querySelectorAll('{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}')[0].innerText;" stepKey="grabPaymentMethodInfo"/> + <assertStringContainsString stepKey="checkCompanyAtPaymentMethodInfo"> + <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult> + <actualResult type="variable">grabPaymentMethodInfo</actualResult> + </assertStringContainsString> + <assertStringContainsString stepKey="checkVatIdAtPaymentMethodInfo"> + <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult> + <actualResult type="variable">grabPaymentMethodInfo</actualResult> + </assertStringContainsString> + <executeJS function="return document.querySelectorAll('{{CheckoutPaymentSection.shippingInformationSection}}')[0].innerText;" stepKey="grabPaymentShippingTo"/> + <assertStringContainsString stepKey="checkCompanyAtShippingTo"> + <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult> + <actualResult type="variable">grabPaymentShippingTo</actualResult> + </assertStringContainsString> + <assertStringContainsString stepKey="checkVatIdAtShippingTo"> + <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult> + <actualResult type="variable">grabPaymentShippingTo</actualResult> + </assertStringContainsString> + </test> +</tests> From 4c174045d4cfeb835c4d5297c04053e3acf81b9d Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Mon, 28 Dec 2020 18:12:11 +0200 Subject: [PATCH 5/8] Fix has been updated --- .../view/frontend/web/template/billing-address/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html index 4724664a5e1c5..ea26c2fbfbb95 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html @@ -10,7 +10,7 @@ <if args="currentBillingAddress().company"> <text args="currentBillingAddress().company"/><br/> </if> - <text args="_.values(currentBillingAddress().street).join(', ')"/><br/> + <text args="currentBillingAddress().street.join(', ')"/><br/> <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/> <if args="currentBillingAddress().vatId"> <text args="currentBillingAddress().vatId"/><br/> From ae9db74d37a3141329fa4738b299a53588ebd860 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Tue, 29 Dec 2020 12:45:37 +0200 Subject: [PATCH 6/8] Test has been updated --- .../Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml index ed4633b21da11..328817244995e 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml @@ -20,7 +20,6 @@ <group value="create"/> </annotations> <before> - <magentoCLI command="config:set customer/address/company_show opt" stepKey="setShowCompanyName"/> <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/> <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBefore"> <argument name="tags" value="config"/> @@ -32,7 +31,6 @@ </createData> </before> <after> - <magentoCLI command="config:set customer/address/company_show 0" stepKey="setShowCompanyNameBack"/> <magentoCLI command="config:set customer/address/taxvat_show 0" stepKey="setShowTaxNumberBack"/> <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfter"> <argument name="tags" value="config"/> From 66dfbbcd5d06e2743bf50bbb4c7188f49caa5087 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Fri, 15 Jan 2021 12:35:56 +0200 Subject: [PATCH 7/8] Test case id has been added. --- .../Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml index 328817244995e..b2b45feb56767 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml @@ -15,7 +15,7 @@ <title value="Check if Company name and VAT Id visible at the checkout"/> <description value="Company name and VAT Id should be visible at the checkout step in address if it switched on at configuration"/> <severity value="MAJOR"/> - <testCaseId value="MC-*"/> + <testCaseId value="MC-40437"/> <group value="customer"/> <group value="create"/> </annotations> From 5d24c6d0d291f5f566bb7fc18664ea572b80bd2f Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com> Date: Thu, 27 May 2021 16:14:18 +0300 Subject: [PATCH 8/8] magento/magento2#31652: Adding the company and VAT Number values at OPC address - MFTF test fix. --- ...frontCompanyAndVatIdDataAtCheckoutTest.xml | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml index b2b45feb56767..0ff7e594c98cb 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml @@ -21,32 +21,28 @@ </annotations> <before> <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/> - <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBefore"> - <argument name="tags" value="config"/> - </actionGroup> <createData entity="CustomerEntityOne" stepKey="createCustomer"/> - <createData stepKey="category" entity="SimpleSubCategory"/> - <createData stepKey="product1" entity="SimpleProduct"> - <requiredEntity createDataKey="category"/> + <createData entity="SimpleSubCategory" stepKey="createCategory" /> + <createData entity="SimpleProduct" stepKey="createProduct" > + <requiredEntity createDataKey="createCategory"/> </createData> </before> <after> <magentoCLI command="config:set customer/address/taxvat_show 0" stepKey="setShowTaxNumberBack"/> - <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfter"> - <argument name="tags" value="config"/> - </actionGroup> <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> - <deleteData stepKey="deleteCategory" createDataKey="category"/> - <deleteData stepKey="deleteProduct1" createDataKey="product1"/> + <deleteData stepKey="deleteCategory" createDataKey="createCategory"/> + <deleteData stepKey="deleteProduct" createDataKey="createProduct"/> </after> <!--Login customer on storefront--> <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer"> <argument name="Customer" value="$$createCustomer$$" /> </actionGroup> <!-- Add product to the cart --> - <amOnPage url="$$product1.name$$.html" stepKey="goToProductPage"/> + <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage"> + <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/> + </actionGroup> <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart"> - <argument name="productName" value="$$product1.name$$"/> + <argument name="productName" value="$$createProduct.name$$"/> </actionGroup> <!--Go to Checkout--> <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>