Merge pull request #470 from magento-folks/checkout

[Folks] Bugfixes

Author: vpelipenko

app/code/Magento/Checkout/Block/Registration.php

@@ -29,12 +29,24 @@ class Registration extends \Magento\Framework\View\Element\Template
      */
     protected $accountManagement;
 
+    /**
+     * @var \Magento\Sales\Api\OrderRepositoryInterface
+     */
+    protected $orderRepository;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Address\Validator
+     */
+    protected $addressValidator;
+
     /**
      * @param Template\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Registration $registration
      * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Sales\Model\Order\Address\Validator $addressValidator
      * @param array $data
      */
     public function __construct(
@@ -43,12 +55,16 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Registration $registration,
         \Magento\Customer\Api\AccountManagementInterface $accountManagement,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Sales\Model\Order\Address\Validator $addressValidator,
         array $data = []
     ) {
         $this->checkoutSession = $checkoutSession;
         $this->customerSession = $customerSession;
         $this->registration = $registration;
         $this->accountManagement = $accountManagement;
+        $this->orderRepository = $orderRepository;
+        $this->addressValidator = $addressValidator;
         parent::__construct($context, $data);
     }
 
@@ -81,9 +97,28 @@ public function toHtml()
             $this->customerSession->isLoggedIn()
             || !$this->registration->isAllowed()
             || !$this->accountManagement->isEmailAvailable($this->getEmailAddress())
+            || !$this->validateAddresses()
         ) {
             return '';
         }
         return parent::toHtml();
     }
+
+    /**
+     * Validate order addresses
+     *
+     * @return bool
+     */
+    protected function validateAddresses()
+    {
+        $order = $this->orderRepository->get($this->checkoutSession->getLastOrderId());
+        $addresses = $order->getAddresses();
+        foreach ($addresses as $address) {
+            $result = $this->addressValidator->validateForCustomer($address);
+            if (is_array($result) && !empty($result)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

app/code/Magento/Sales/Model/Order/Address/Validator.php

@@ -75,15 +75,15 @@ public function validate(Address $address)
     }
 
     /**
-     * Validate address attribute for payment operations
+     * Validate address attribute for customer creation
      *
      * @return bool|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      *
      * @param Address $address
      */
-    public function validateForPayment(Address $address)
+    public function validateForCustomer(Address $address)
     {
         if ($address->getShouldIgnoreValidation()) {
             return true;

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2352,4 +2352,9 @@
     ['loadPrices', 'Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable'],
     ['_parseVariationPrices', '\Magento\ConfigurableImportExport\Model\Import\Product\Type\Configurable'],
     ['_collectSuperDataPrice', '\Magento\ConfigurableImportExport\Model\Import\Product\Type\Configurable'],
+    [
+        'validateForPayment',
+        'Magento\Sales\Model\Order\Address\Validator',
+        'Magento\Sales\Model\Order\Address\Validator::validateForCustomer'
+    ],
 ];