Merge remote-tracking branch 'origin/2.3.5-develop' into 2.3.5-develop-pr109

Author: zakdma

app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js

@@ -117,7 +117,7 @@ define([
                 options.bin = context.paymentPayload.details.bin;
             }
 
-            if (shippingAddress) {
+            if (shippingAddress && this.isValidShippingAddress(shippingAddress)) {
                 options.additionalInformation = {
                     shippingGivenName: shippingAddress.firstname,
                     shippingSurname: shippingAddress.lastname,
@@ -206,6 +206,25 @@ define([
             }
 
             return false;
+        },
+
+        /**
+         * Validate shipping address
+         *
+         * @param {Object} shippingAddress
+         * @return {Boolean}
+         */
+        isValidShippingAddress: function (shippingAddress) {
+            var isValid = false;
+
+            // check that required fields are not empty
+            if (shippingAddress.firstname && shippingAddress.lastname && shippingAddress.telephone &&
+                shippingAddress.street && shippingAddress.city && shippingAddress.regionCode &&
+                shippingAddress.postcode && shippingAddress.countryId) {
+                isValid = true;
+            }
+
+            return isValid;
         }
     };
 });

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -92,7 +92,7 @@ define(
                     })
                     .then(function (hostedFieldsInstance) {
                         self.hostedFieldsInstance = hostedFieldsInstance;
-                        self.isPlaceOrderActionAllowed(true);
+                        self.isPlaceOrderActionAllowed(false);
                         self.initFormValidationEvents(hostedFieldsInstance);
 
                         return self.hostedFieldsInstance;

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -36,6 +36,7 @@
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <!--Login as admin-->
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <createData entity="CustomerAccountSharingGlobal" stepKey="setConfigCustomerAccountToGlobal"/>
         </before>
 
         <!--Create website, Sore adn Store View-->
@@ -328,6 +329,7 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
+            <createData entity="CustomerAccountSharingDefault" stepKey="setConfigCustomerAccountDefault"/>
             <actionGroup ref="logout" stepKey="logout"/>
 
             <!--Do reindex and flush cache-->

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartEstimateShippingAndTaxAddressActionGroup.xml

@@ -0,0 +1,31 @@
+<?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="AssertStorefrontCheckoutCartEstimateShippingAndTaxAddressActionGroup">
+        <annotations>
+            <description>Check address data in Estimate Shipping And Tax section of shopping cart on storefront</description>
+        </annotations>
+        <arguments>
+            <argument name="country" type="string" defaultValue="{{US_Address_TX.country}}"/>
+            <argument name="state" type="string" defaultValue="{{US_Address_TX.state}}"/>
+            <argument name="postcode" type="string" defaultValue="{{US_Address_TX.postcode}}"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="waitForSubtotalVisible"/>
+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxIfNeeded" />
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{country}}" stepKey="checkCountry"/>
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{state}}" stepKey="checkState" />
+        <grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabPostCodeText"/>
+        <assertEquals  message="Address postcode is invalid" stepKey="checkPostcode">
+            <expectedResult type="string">{{postcode}}</expectedResult>
+            <actualResult type="variable">grabPostCodeText</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutCartFillEstimateShippingAndTaxActionGroup.xml

@@ -0,0 +1,28 @@
+<?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="StorefrontCheckoutCartFillEstimateShippingAndTaxActionGroup">
+        <annotations>
+            <description>Fill address data in Estimate Shipping And Tax section of shopping cart on storefront</description>
+        </annotations>
+        <arguments>
+            <argument name="country" type="string" defaultValue="{{US_Address_TX.country}}"/>
+            <argument name="state" type="string" defaultValue="{{US_Address_TX.state}}"/>
+            <argument name="postcode" type="string" defaultValue="{{US_Address_TX.postcode}}"/>
+        </arguments>
+
+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openEestimateShippingAndTaxSection"/>
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{country}}" stepKey="selectCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{state}}" stepKey="selectState"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{postcode}}" stepKey="selectPostCode"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -320,12 +320,13 @@ public function execute()
                     ['customer' => $customer, 'request' => $this->getRequest()]
                 );
 
-                if (isset($customerData['sendemail_store_id'])) {
+                if (isset($customerData['sendemail_store_id']) && $customerData['sendemail_store_id'] !== false) {
                     $customer->setStoreId($customerData['sendemail_store_id']);
                 }
 
                 // Save customer
                 if ($customerId) {
+                    $this->customerAccountManagement->validateCustomerStoreIdByWebsiteId($customer);
                     $this->_customerRepository->save($customer);
 
                     $this->getEmailNotification()->credentialsChanged($customer, $currentCustomer->getEmail());

app/code/Magento/Customer/Model/AccountManagement.php

@@ -864,7 +864,6 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         if ($customer->getId()) {
             $customer = $this->customerRepository->get($customer->getEmail());
             $websiteId = $customer->getWebsiteId();
-
             if ($this->isCustomerInStore($websiteId, $customer->getStoreId())) {
                 throw new InputException(__('This customer already exists in this store.'));
             }
@@ -888,13 +887,10 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             $customer->setWebsiteId($websiteId);
         }
 
+        $this->validateCustomerStoreIdByWebsiteId($customer);
+
         // Update 'created_in' value with actual store name
         if ($customer->getId() === null) {
-            $websiteId = $customer->getWebsiteId();
-            if ($websiteId && !$this->isCustomerInStore($websiteId, $customer->getStoreId())) {
-                throw new LocalizedException(__('The store view is not in the associated website.'));
-            }
-
             $storeName = $this->storeManager->getStore($customer->getStoreId())->getName();
             $customer->setCreatedIn($storeName);
         }
@@ -1136,6 +1132,22 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
         return in_array($storeId, $ids);
     }
 
+    /**
+     * Validate customer store id by customer website id.
+     *
+     * @param CustomerInterface $customer
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function validateCustomerStoreIdByWebsiteId(CustomerInterface $customer)
+    {
+        if (!$this->isCustomerInStore($customer->getWebsiteId(), $customer->getStoreId())) {
+            throw new LocalizedException(__('The store view is not in the associated website.'));
+        }
+
+        return true;
+    }
+
     /**
      * Validate the Reset Password Token for a customer.
      *

app/code/Magento/Customer/Model/Address/Validator/General.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Address\Validator;
 
+use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Customer\Model\Address\ValidatorInterface;
 
@@ -87,6 +88,7 @@ private function checkRequiredFields(AbstractAddress $address)
      */
     private function checkOptionalFields(AbstractAddress $address)
     {
+        $this->reloadAddressAttributes($address);
         $errors = [];
         if ($this->isTelephoneRequired()
             && !\Zend_Validate::is($address->getTelephone(), 'NotEmpty')
@@ -148,4 +150,17 @@ private function isFaxRequired()
     {
         return $this->eavConfig->getAttribute('customer_address', 'fax')->getIsRequired();
     }
+
+    /**
+     * Reload address attributes for the certain store
+     *
+     * @param AbstractAddress $address
+     * @return void
+     */
+    private function reloadAddressAttributes(AbstractAddress $address): void
+    {
+        $attributeSetId = $address->getAttributeSetId() ?: AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS;
+        $address->setData('attribute_set_id', $attributeSetId);
+        $this->eavConfig->getEntityAttributes(AddressMetadataInterface::ENTITY_TYPE_ADDRESS, $address);
+    }
 }

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php

@@ -231,7 +231,7 @@ protected function setUp()
             ->getMock();
         $this->managementMock = $this->getMockBuilder(\Magento\Customer\Model\AccountManagement::class)
             ->disableOriginalConstructor()
-            ->setMethods(['createAccount'])
+            ->setMethods(['createAccount', 'validateCustomerStoreIdByWebsiteId'])
             ->getMock();
         $this->addressDataFactoryMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterfaceFactory::class)
             ->disableOriginalConstructor()
@@ -501,6 +501,9 @@ public function testExecuteWithExistentCustomer()
             ->with('customer/*/edit', ['id' => $customerId, '_current' => true])
             ->willReturn(true);
 
+        $this->managementMock->method('validateCustomerStoreIdByWebsiteId')
+            ->willReturn(true);
+
         $this->assertEquals($redirectMock, $this->model->execute());
     }