From 2197d00d626e8ee7b3ed3a91ba49dc5b60d92bc8 Mon Sep 17 00:00:00 2001
From: Gaurav Agarwal <37572719+gauravagarwal1001@users.noreply.github.com>
Date: Sun, 5 Apr 2020 07:24:37 +0530
Subject: [PATCH 01/13] Added configuration for showing address fields

---
 app/code/Magento/Customer/etc/adminhtml/system.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index fca625d847a1d..8c29f1ed2d46e 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -246,6 +246,13 @@
                     <source_model>Magento\Config\Model\Config\Source\Nooptreq</source_model>
                     <backend_model>Magento\Customer\Model\Config\Backend\Show\Customer</backend_model>
                 </field>
+                <field id="show_address_fields" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Show Address Information</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>
+                        Enable this for adding address information fields on the registration form.
+                    </comment>
+                </field>
                 <field id="telephone_show" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Show Telephone</label>
                     <source_model>Magento\Config\Model\Config\Source\Nooptreq</source_model>

From 34d04a2d18b8435c4fdd7f39895a2acdb8881aa1 Mon Sep 17 00:00:00 2001
From: Gaurav Agarwal <37572719+gauravagarwal1001@users.noreply.github.com>
Date: Sun, 5 Apr 2020 07:43:56 +0530
Subject: [PATCH 02/13] Update register.phtml

---
 .../Customer/view/frontend/templates/form/register.phtml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index f7d10f6df1728..def0006ef9aaf 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -11,6 +11,10 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Customer\Block\Form\Register $block */
 /** @var \Magento\Framework\Escaper $escaper */
 $formData = $block->getFormData();
+$showAddressFileds = false;
+if($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')){
+    $showAddressFileds = true;
+}
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
 <?= $block->getChildHtml('form_fields_before') ?>
@@ -64,7 +68,7 @@ $formData = $block->getFormData();
             <?= $_gender->setGender($formData->getGender())->toHtml() ?>
         <?php endif ?>
     </fieldset>
-    <?php if ($block->getShowAddressFields()): ?>
+    <?php if ($showAddressFileds): ?>
         <?php $cityValidationClass = $this->helper(Address::class)->getAttributeValidationClass('city'); ?>
         <?php $postcodeValidationClass = $this->helper(Address::class)->getAttributeValidationClass('postcode'); ?>
         <?php $regionValidationClass = $this->helper(Address::class)->getAttributeValidationClass('region'); ?>
@@ -310,7 +314,7 @@ require([
 
 });
 </script>
-<?php if ($block->getShowAddressFields()): ?>
+<?php if ($showAddressFileds): ?>
 <script type="text/x-magento-init">
     {
         "#country": {

From 2a76acdc6dbfbd6281766971533deee6c56a9679 Mon Sep 17 00:00:00 2001
From: Gaurav Agarwal <37572719+gauravagarwal1001@users.noreply.github.com>
Date: Sun, 5 Apr 2020 07:46:03 +0530
Subject: [PATCH 03/13] Update config.xml

---
 app/code/Magento/Customer/etc/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index ab2020580a2eb..34e04a883e86c 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -55,6 +55,7 @@
                 <dob_show />
                 <taxvat_show />
                 <gender_show />
+                <show_address_fields>0</show_address_fields>
                 <telephone_show>req</telephone_show>
                 <company_show>opt</company_show>
                 <fax_show/>

From f963bc71da617cf56179d7df928f97f08a78eb72 Mon Sep 17 00:00:00 2001
From: Gaurav Agarwal <37572719+gauravagarwal1001@users.noreply.github.com>
Date: Sun, 5 Apr 2020 16:07:33 +0530
Subject: [PATCH 04/13] fixed static test

---
 .../Customer/view/frontend/templates/form/register.phtml       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index def0006ef9aaf..e757455b77f78 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -12,9 +12,10 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Framework\Escaper $escaper */
 $formData = $block->getFormData();
 $showAddressFileds = false;
-if($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')){
+if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')){
     $showAddressFileds = true;
 }
+
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
 <?= $block->getChildHtml('form_fields_before') ?>

From 5c358b2331bb66041f430527d3e040c72762ca96 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 19 Jun 2020 14:34:39 +0300
Subject: [PATCH 05/13] MFTF test

---
 ...ntWithAdditionalInformationActionGroup.xml | 33 ++++++++++
 .../Section/AdminCustomerConfigSection.xml    |  1 +
 .../StorefrontCustomerCreateFormSection.xml   | 12 ++++
 ...eCustomerWithAdditionalInformationTest.xml | 61 +++++++++++++++++++
 4 files changed, 107 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
new file mode 100644
index 0000000000000..1c0e95f043cac
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup" extends="SignUpNewUserFromStorefrontActionGroup">
+        <annotations>
+            <description>EXTENDS: SignUpNewUserFromStorefrontActionGroup. Fills prefix, suffix, DOB, VAT number, gender, company, telephone, fax, address fields.</description>
+        </annotations>
+        <arguments>
+            <argument name="dob" defaultValue="{{EN_US_DATE.short4DigitYear}}" type="string"/>
+            <argument name="address" type="entity"/>
+            <argument name="customerGender" defaultValue="{{Gender.male}}" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.prefixField}}" userInput="{{Customer.prefix}}" after="fillLastName" stepKey="fillPrefixName"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.suffixField}}" userInput="{{Customer.suffix}}" after="fillPrefixName" stepKey="fillSuffixName"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.dobField}}" userInput="{{dob}}" after="fillSuffixName" stepKey="fillDob"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.taxvatField}}" userInput="{{Customer.taxvat}}" after="fillDob" stepKey="fillTaxvat"/>
+        <selectOption selector="{{StorefrontCustomerCreateFormSection.genderField}}" userInput="{{customerGender}}" after="fillTaxvat" stepKey="fillGender"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.companyField}}" userInput="{{address.company}}" after="fillGender" stepKey="fillCompany"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.telephoneField}}" userInput="{{address.telephone}}" after="fillCompany" stepKey="fillPhoneNumber"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.faxField}}" userInput="{{address.fax}}" after="fillPhoneNumber" stepKey="fillFax"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.streetField}}" userInput="{{address.street[0]}}" after="fillFax" stepKey="fillStreetAddress"/>
+        <selectOption selector="{{StorefrontCustomerCreateFormSection.countryField}}" userInput="{{address.country_id}}" after="fillStreetAddress" stepKey="selectCounty"/>
+        <selectOption selector="{{StorefrontCustomerCreateFormSection.regionField}}" userInput="{{address.state}}" after="selectCounty" stepKey="selectRegion" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.cityField}}" userInput="{{address.city}}" after="selectRegion" stepKey="fillCityName"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.postcodeField}}" userInput="{{address.postcode}}" after="fillCityName" stepKey="fillZip"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
index f8a441e40a792..d9ea04c9f702b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
@@ -13,5 +13,6 @@
         <element name="shareCustomerAccount" type="select" selector="#customer_account_share_scope"/>
         <element name="showDateOfBirth" type="select" selector="#customer_address_dob_show"/>
         <element name="showDateOfBirthInherit" type="select" selector="#customer_address_dob_show_inherit"/>
+        <element name="showAddressInformationInherit" type="select" selector="#customer_address_show_address_fields_inherit"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection/StorefrontCustomerCreateFormSection.xml
index 6b65ef861472c..c063177438870 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection/StorefrontCustomerCreateFormSection.xml
@@ -8,10 +8,22 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerCreateFormSection">
+        <element name="prefixField" type="input" selector="#prefix"/>
+        <element name="suffixField" type="input" selector="#suffix"/>
         <element name="firstnameField" type="input" selector="#firstname"/>
         <element name="lastnameField" type="input" selector="#lastname"/>
         <element name="lastnameLabel" type="text" selector="//label[@for='lastname']"/>
         <element name="dobField" type="input" selector="#dob"/>
+        <element name="taxvatField" type="input" selector="#taxvat"/>
+        <element name="genderField" type="select" selector="#gender"/>
+        <element name="telephoneField" type="input" selector="#telephone"/>
+        <element name="faxField" type="input" selector="#fax"/>
+        <element name="companyField" type="input" selector="#company"/>
+        <element name="streetField" type="input" selector="#street_1"/>
+        <element name="cityField" type="input" selector="#city"/>
+        <element name="regionField" type="select" selector="#region_id"/>
+        <element name="countryField" type="select" selector="#country"/>
+        <element name="postcodeField" type="input" selector="#zip"/>
         <element name="signUpForNewsletter" type="checkbox" selector="//div/input[@name='is_subscribed']"/>
         <element name="emailField" type="input" selector="#email_address"/>
         <element name="passwordField" type="input" selector="#password"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
new file mode 100644
index 0000000000000..44ee1ad228cde
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCreateCustomerWithAdditionalInformationTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Create a Customer via the Storefront with Additional Information"/>
+            <title value="Customer should be able to create an account with additional information via the storefront"/>
+            <description value="Customer should be able to create an account with additional information such like Company, VAT number, Phone via the storefront"/>
+            <severity value="MAJOR"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/address/show_address_fields 1" stepKey="setShowAddressInformation"/>
+            <magentoCLI command="config:set customer/address/prefix_show opt" stepKey="setShowPrefix"/>
+            <magentoCLI command="config:set customer/address/middlename_show opt" stepKey="setShowMiddleName"/>
+            <magentoCLI command="config:set customer/address/suffix_show opt" stepKey="setShowSuffix"/>
+            <magentoCLI command="config:set customer/address/dob_show opt" stepKey="setShowDOB"/>
+            <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/>
+            <magentoCLI command="config:set customer/address/gender_show opt" stepKey="setShowGender"/>
+            <magentoCLI command="config:set customer/address/telephone_show opt" stepKey="setShowTelephone"/>
+            <magentoCLI command="config:set customer/address/company_show opt" stepKey="setShowCompany"/>
+            <magentoCLI command="config:set customer/address/fax_show opt" stepKey="setShowFax"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set customer/address/show_address_fields 0" stepKey="setShowAddressInformation"/>
+            <magentoCLI command="config:set customer/address/prefix_show ''" stepKey="setShowPrefix"/>
+            <magentoCLI command="config:set customer/address/middlename_show ''" stepKey="setShowMiddleName"/>
+            <magentoCLI command="config:set customer/address/suffix_show ''" stepKey="setShowSuffix"/>
+            <magentoCLI command="config:set customer/address/dob_show ''" stepKey="setShowDOB"/>
+            <magentoCLI command="config:set customer/address/taxvat_show ''" stepKey="setShowTaxNumber"/>
+            <magentoCLI command="config:set customer/address/gender_show ''" stepKey="setShowGender"/>
+            <magentoCLI command="config:set customer/address/telephone_show ''" stepKey="setShowTelephone"/>
+            <magentoCLI command="config:set customer/address/company_show ''" stepKey="setShowCompany"/>
+            <magentoCLI command="config:set customer/address/fax_show ''" stepKey="setShowFax"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+        </after>
+
+        <actionGroup ref="StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+            <argument name="dob" value="{{EN_US_DATE.short4DigitYear}}"/>
+            <argument name="address" value="CustomerAddressSimple"/>
+        </actionGroup>
+
+    </test>
+</tests>

From aed35f91c0a92252332de676d2a8f3a29f9c5a8a Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 10 Jul 2020 18:44:54 +0300
Subject: [PATCH 06/13] Fix static test

---
 .../Customer/view/frontend/templates/form/register.phtml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index d91caaf53d49d..d9a036a55f058 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -12,7 +12,7 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Framework\Escaper $escaper */
 $formData = $block->getFormData();
 $showAddressFileds = false;
-if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')){
+if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')) {
     $showAddressFileds = true;
 }
 

From 9b0ae83e0ff4684928c87a3b0cf378a9e00d287d Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 13 Jul 2020 15:21:29 +0300
Subject: [PATCH 07/13] Correction MFTF test.

---
 ...stomerCreateAccountWithAdditionalInformationActionGroup.xml | 3 +--
 .../StorefrontCreateCustomerWithAdditionalInformationTest.xml  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
index 1c0e95f043cac..048174b951465 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup.xml
@@ -23,8 +23,7 @@
         <selectOption selector="{{StorefrontCustomerCreateFormSection.genderField}}" userInput="{{customerGender}}" after="fillTaxvat" stepKey="fillGender"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.companyField}}" userInput="{{address.company}}" after="fillGender" stepKey="fillCompany"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.telephoneField}}" userInput="{{address.telephone}}" after="fillCompany" stepKey="fillPhoneNumber"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.faxField}}" userInput="{{address.fax}}" after="fillPhoneNumber" stepKey="fillFax"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.streetField}}" userInput="{{address.street[0]}}" after="fillFax" stepKey="fillStreetAddress"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.streetField}}" userInput="{{address.street[0]}}" after="fillPhoneNumber" stepKey="fillStreetAddress"/>
         <selectOption selector="{{StorefrontCustomerCreateFormSection.countryField}}" userInput="{{address.country_id}}" after="fillStreetAddress" stepKey="selectCounty"/>
         <selectOption selector="{{StorefrontCustomerCreateFormSection.regionField}}" userInput="{{address.state}}" after="selectCounty" stepKey="selectRegion" />
         <fillField selector="{{StorefrontCustomerCreateFormSection.cityField}}" userInput="{{address.city}}" after="selectRegion" stepKey="fillCityName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
index 44ee1ad228cde..7d7597376b61f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
@@ -28,7 +28,6 @@
             <magentoCLI command="config:set customer/address/gender_show opt" stepKey="setShowGender"/>
             <magentoCLI command="config:set customer/address/telephone_show opt" stepKey="setShowTelephone"/>
             <magentoCLI command="config:set customer/address/company_show opt" stepKey="setShowCompany"/>
-            <magentoCLI command="config:set customer/address/fax_show opt" stepKey="setShowFax"/>
         </before>
         <after>
             <magentoCLI command="config:set customer/address/show_address_fields 0" stepKey="setShowAddressInformation"/>
@@ -40,7 +39,6 @@
             <magentoCLI command="config:set customer/address/gender_show ''" stepKey="setShowGender"/>
             <magentoCLI command="config:set customer/address/telephone_show ''" stepKey="setShowTelephone"/>
             <magentoCLI command="config:set customer/address/company_show ''" stepKey="setShowCompany"/>
-            <magentoCLI command="config:set customer/address/fax_show ''" stepKey="setShowFax"/>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>

From 64bb6ea2f014d7c0bbe14e613e28addee3e6fdba Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 13 Jul 2020 15:31:36 +0300
Subject: [PATCH 08/13] Correct typo.

---
 .../Customer/view/frontend/templates/form/register.phtml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index d9a036a55f058..3aa75c7fdfd91 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -11,9 +11,9 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Customer\Block\Form\Register $block */
 /** @var \Magento\Framework\Escaper $escaper */
 $formData = $block->getFormData();
-$showAddressFileds = false;
+$showAddressFields = false;
 if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')) {
-    $showAddressFileds = true;
+    $showAddressFields = true;
 }
 
 ?>
@@ -69,7 +69,7 @@ if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_a
             <?= $_gender->setGender($formData->getGender())->toHtml() ?>
         <?php endif ?>
     </fieldset>
-    <?php if ($showAddressFileds): ?>
+    <?php if ($showAddressFields): ?>
         <?php $cityValidationClass = $this->helper(Address::class)->getAttributeValidationClass('city'); ?>
         <?php $postcodeValidationClass = $this->helper(Address::class)->getAttributeValidationClass('postcode'); ?>
         <?php $regionValidationClass = $this->helper(Address::class)->getAttributeValidationClass('region'); ?>
@@ -308,7 +308,7 @@ require([
     }).find('input:text').attr('autocomplete', 'off');
 });
 </script>
-<?php if ($showAddressFileds): ?>
+<?php if ($showAddressFields): ?>
 <script type="text/x-magento-init">
     {
         "#country": {

From 995e62be642af6970dab5db1465a4675708865e7 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 15 Jul 2020 15:45:54 +0300
Subject: [PATCH 09/13] Updated i18n.

---
 app/code/Magento/Customer/etc/adminhtml/system.xml | 2 +-
 app/code/Magento/Customer/i18n/en_US.csv           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index 8c29f1ed2d46e..32d65a567b27c 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -246,7 +246,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Nooptreq</source_model>
                     <backend_model>Magento\Customer\Model\Config\Backend\Show\Customer</backend_model>
                 </field>
-                <field id="show_address_fields" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="show_address_fields" translate="label comment" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Show Address Information</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 7c88ffec1170a..d7ac754862d5e 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -542,3 +542,5 @@ Addresses,Addresses
 "The store view is not in the associated website.","The store view is not in the associated website."
 "The Store View selected for sending Welcome email from is not related to the customer's associated website.","The Store View selected for sending Welcome email from is not related to the customer's associated website."
 "Add/Update Address","Add/Update Address"
+"Show Address Information","Show Address Information"
+"Enable this for adding address information fields on the registration form.","Enable this for adding address information fields on the registration form."

From 853df84de57b130e34cf99d3e95b6b29837bcbfd Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 22 Jul 2020 12:56:08 +0300
Subject: [PATCH 10/13] Added testCaseId fot MFTF test.

---
 .../StorefrontCreateCustomerWithAdditionalInformationTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
index 7d7597376b61f..3fffeafaeca14 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
@@ -15,6 +15,7 @@
             <title value="Customer should be able to create an account with additional information via the storefront"/>
             <description value="Customer should be able to create an account with additional information such like Company, VAT number, Phone via the storefront"/>
             <severity value="MAJOR"/>
+            <testCaseId value="MC-36076"/>
             <group value="customer"/>
             <group value="create"/>
         </annotations>

From 89df85056cabe9d95e808ff699f21ebf0bbd6208 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 2 Sep 2020 12:45:31 +0300
Subject: [PATCH 11/13] improve

---
 .../Magento/Customer/Block/Form/Register.php  | 20 ++++++++++++++++++-
 .../Magento/Customer/etc/adminhtml/system.xml |  2 +-
 app/code/Magento/Customer/i18n/en_US.csv      |  2 +-
 .../frontend/templates/form/register.phtml    |  9 ++-------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index d6d0d9c494c11..1a8efa9a872ae 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -7,6 +7,7 @@
 
 use Magento\Customer\Helper\Address;
 use Magento\Customer\Model\AccountManagement;
+use Magento\Directory\Block\Data;
 use Magento\Framework\App\ObjectManager;
 use Magento\Newsletter\Model\Config;
 
@@ -17,8 +18,10 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Register extends \Magento\Directory\Block\Data
+class Register extends Data
 {
+    private const XML_PATH_SHOW_ADDRESS_FIELDS = 'customer/address/show_address_fields';
+
     /**
      * @var \Magento\Customer\Model\Session
      */
@@ -228,4 +231,19 @@ public function getRequiredCharacterClassesNumber()
     {
         return $this->_scopeConfig->getValue(AccountManagement::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER);
     }
+
+    /**
+     * Returns whether to show address fields or not
+     *
+     * @return bool
+     */
+    public function isShowAddressFields(): bool
+    {
+        $result = false;
+        if ($this->getShowAddressFields() || $this->getConfig(self::XML_PATH_SHOW_ADDRESS_FIELDS)) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index 5f2368900c308..c06a55a61ad37 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -251,7 +251,7 @@
                     <label>Show Address Information</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
-                        Enable this for adding address information fields on the registration form.
+                        Enables address information fields on the registration form.
                     </comment>
                 </field>
                 <field id="telephone_show" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" canRestore="1">
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 2d3c8e74243a2..8450c61dca931 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -544,4 +544,4 @@ Addresses,Addresses
 "Add/Update Address","Add/Update Address"
 "The specified customer group id does not exist.","The specified customer group id does not exist."
 "Show Address Information","Show Address Information"
-"Enable this for adding address information fields on the registration form.","Enable this for adding address information fields on the registration form."
+"Enables address information fields on the registration form.","Enables address information fields on the registration form."
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 4b8c190a63574..59641bec8b1fe 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -15,11 +15,6 @@ $addressHelper = $block->getData('addressHelper');
 /** @var \Magento\Directory\Helper\Data $directoryHelper */
 $directoryHelper = $block->getData('directoryHelper');
 $formData = $block->getFormData();
-$showAddressFields = false;
-if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_address_fields')) {
-    $showAddressFields = true;
-}
-
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
 <?= $block->getChildHtml('form_fields_before') ?>
@@ -74,7 +69,7 @@ if ($block->getShowAddressFields() || $block->getConfig('customer/address/show_a
         <?php endif ?>
         <?= $block->getChildHtml('fieldset_create_info_additional') ?>
     </fieldset>
-    <?php if ($showAddressFields): ?>
+    <?php if ($block->isShowAddressFields()): ?>
         <?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>
         <?php $postcodeValidationClass = $addressHelper->getAttributeValidationClass('postcode'); ?>
         <?php $regionValidationClass = $addressHelper->getAttributeValidationClass('region'); ?>
@@ -321,7 +316,7 @@ $scriptString .= <<<script
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
-<?php if ($showAddressFields): ?>
+<?php if ($block->isShowAddressFields()): ?>
     <?php
     $regionJson = /* @noEscape */ $directoryHelper->getRegionJson();
     $regionId = (int) $formData->getRegionId();

From 083cb2eb558393c888d553f29fa12436e05cb4f3 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 18 Sep 2020 11:59:01 +0300
Subject: [PATCH 12/13] fix broken region selector

---
 .../view/frontend/templates/form/register.phtml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 59641bec8b1fe..a5c57afba579e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -318,9 +318,9 @@ script;
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php if ($block->isShowAddressFields()): ?>
     <?php
-    $regionJson = /* @noEscape */ $directoryHelper->getRegionJson();
-    $regionId = (int) $formData->getRegionId();
-    $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
+        $regionJson = $directoryHelper->getRegionJson();
+        $regionId = (int) $formData->getRegionId();
+        $countriesWithOptionalZip = $directoryHelper->getCountriesWithOptionalZip(true);
     ?>
 <script type="text/x-magento-init">
     {
@@ -331,9 +331,9 @@ script;
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": {$regionJson},
-                "defaultRegion": "{$regionId}",
-                "countriesWithOptionalZip": {$countriesWithOptionalZip}
+                "regionJson": <?= /* @noEscape */ $regionJson ?>,
+                "defaultRegion": "<?= /* @noEscape */ $regionId ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $countriesWithOptionalZip ?>
             }
         }
     }

From 78c9c43ea017716b72fac6edad1d031bfdde9737 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 21 Sep 2020 10:39:39 +0300
Subject: [PATCH 13/13] fix mftf

---
 ...torefrontCreateCustomerWithAdditionalInformationTest.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
index 3fffeafaeca14..6b8f936448be0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithAdditionalInformationTest.xml
@@ -28,7 +28,6 @@
             <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/>
             <magentoCLI command="config:set customer/address/gender_show opt" stepKey="setShowGender"/>
             <magentoCLI command="config:set customer/address/telephone_show opt" stepKey="setShowTelephone"/>
-            <magentoCLI command="config:set customer/address/company_show opt" stepKey="setShowCompany"/>
         </before>
         <after>
             <magentoCLI command="config:set customer/address/show_address_fields 0" stepKey="setShowAddressInformation"/>
@@ -38,8 +37,7 @@
             <magentoCLI command="config:set customer/address/dob_show ''" stepKey="setShowDOB"/>
             <magentoCLI command="config:set customer/address/taxvat_show ''" stepKey="setShowTaxNumber"/>
             <magentoCLI command="config:set customer/address/gender_show ''" stepKey="setShowGender"/>
-            <magentoCLI command="config:set customer/address/telephone_show ''" stepKey="setShowTelephone"/>
-            <magentoCLI command="config:set customer/address/company_show ''" stepKey="setShowCompany"/>
+            <magentoCLI command="config:set customer/address/telephone_show req" stepKey="setShowTelephone"/>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
@@ -47,7 +45,6 @@
                 <argument name="email" value="{{CustomerEntityOne.email}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-
         </after>
 
         <actionGroup ref="StorefrontCustomerCreateAccountWithAdditionalInformationActionGroup" stepKey="SignUpNewUser">
@@ -55,6 +52,5 @@
             <argument name="dob" value="{{EN_US_DATE.short4DigitYear}}"/>
             <argument name="address" value="CustomerAddressSimple"/>
         </actionGroup>
-
     </test>
 </tests>