Merge remote-tracking branch 'af/MC-13877' into MC-13852

Author: rganin

app/code/Magento/Customer/Block/Address/Edit.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Block\Address;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
@@ -46,6 +47,11 @@ class Edit extends \Magento\Directory\Block\Data
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var \Magento\Customer\Api\AddressMetadataInterface
+     */
+    private $addressMetadata;
+
     /**
      * Constructor
      *
@@ -61,6 +67,7 @@ class Edit extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array $data
+     * @param \Magento\Customer\Api\AddressMetadataInterface|null $addressMetadata
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -76,13 +83,15 @@ public function __construct(
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        array $data = []
+        array $data = [],
+        \Magento\Customer\Api\AddressMetadataInterface $addressMetadata = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressRepository = $addressRepository;
         $this->addressDataFactory = $addressDataFactory;
         $this->currentCustomer = $currentCustomer;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->addressMetadata = $addressMetadata;
         parent::__construct(
             $context,
             $directoryHelper,
@@ -103,6 +112,32 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
 
+        $this->initAddressObject();
+
+        $this->pageConfig->getTitle()->set($this->getTitle());
+
+        if ($postedData = $this->_customerSession->getAddressFormData(true)) {
+            $postedData['region'] = [
+                'region_id' => isset($postedData['region_id']) ? $postedData['region_id'] : null,
+                'region' => $postedData['region'],
+            ];
+            $this->dataObjectHelper->populateWithArray(
+                $this->_address,
+                $postedData,
+                \Magento\Customer\Api\Data\AddressInterface::class
+            );
+        }
+        $this->precheckRequiredAttributes();
+        return $this;
+    }
+
+    /**
+     * Initialize address object.
+     *
+     * @return void
+     */
+    private function initAddressObject()
+    {
         // Init address object
         if ($addressId = $this->getRequest()->getParam('id')) {
             try {
@@ -124,22 +159,26 @@ protected function _prepareLayout()
             $this->_address->setLastname($customer->getLastname());
             $this->_address->setSuffix($customer->getSuffix());
         }
+    }
 
-        $this->pageConfig->getTitle()->set($this->getTitle());
-
-        if ($postedData = $this->_customerSession->getAddressFormData(true)) {
-            $postedData['region'] = [
-                'region_id' => isset($postedData['region_id']) ? $postedData['region_id'] : null,
-                'region' => $postedData['region'],
-            ];
-            $this->dataObjectHelper->populateWithArray(
-                $this->_address,
-                $postedData,
-                \Magento\Customer\Api\Data\AddressInterface::class
-            );
+    /**
+     * Precheck attributes that may be required in attribute configuration.
+     *
+     * @return void
+     */
+    private function precheckRequiredAttributes()
+    {
+        $precheckAttributes = $this->getData('check_attributes_on_render');
+        $requiredAttributesPrechecked = [];
+        if (!empty($precheckAttributes) && is_array($precheckAttributes)) {
+            foreach ($precheckAttributes as $attributeCode) {
+                $attributeMetadata = $this->addressMetadata->getAttributeMetadata($attributeCode);
+                if ($attributeMetadata && $attributeMetadata->isRequired()) {
+                    $requiredAttributesPrechecked[$attributeCode] = $attributeCode;
+                }
+            }
         }
-
-        return $this;
+        $this->setData('required_attributes_prechecked', $requiredAttributesPrechecked);
     }
 
     /**

app/code/Magento/Customer/Helper/Address.php

@@ -417,23 +417,4 @@ public function isAttributeVisible($code)
         }
         return false;
     }
-
-    /**
-     * Retrieve attribute required
-     *
-     * @param string $code
-     * @return bool
-     * @throws NoSuchEntityException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function isAttributeRequired($code)
-    {
-        $attributeMetadata = $this->_addressMetadataService->getAttributeMetadata($code);
-
-        if ($attributeMetadata) {
-            return $attributeMetadata->isRequired();
-        }
-
-        return false;
-    }
 }

app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php

@@ -415,32 +415,6 @@ public function isAttributeVisibleDataProvider()
         ];
     }
 
-    /**
-     * Test is required filed by attribute code
-     *
-     * @param string $attributeCode
-     * @param bool $isMetadataExists
-     * @dataProvider isAttributeRequiredDataProvider
-     * @covers \Magento\Customer\Helper\Address::isAttributeRequired()
-     * @return void
-     */
-    public function testIsAttributeRequired($attributeCode, $isMetadataExists)
-    {
-        $attributeMetadata = null;
-        if ($isMetadataExists) {
-            $attributeMetadata = $this->getMockBuilder(\Magento\Customer\Api\Data\AttributeMetadataInterface::class)
-                ->getMockForAbstractClass();
-            $attributeMetadata->expects($this->once())
-                ->method('isRequired')
-                ->willReturn(true);
-        }
-        $this->addressMetadataService->expects($this->once())
-            ->method('getAttributeMetadata')
-            ->with($attributeCode)
-            ->willReturn($attributeMetadata);
-        $this->assertEquals($isMetadataExists, $this->helper->isAttributeRequired($attributeCode));
-    }
-
     /**
      * Data provider for test  testIsAttributeRequire
      *