Merge remote-tracking branch 'origin/MAGETWO-51081' into BUGS

Author: slavvka

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php

@@ -9,6 +9,16 @@
 
 class CollectTotalsObserver implements ObserverInterface
 {
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
     /**
      * @var \Magento\Customer\Helper\Address
      */
@@ -50,13 +60,17 @@ public function __construct(
         \Magento\Customer\Model\Vat $customerVat,
         VatValidator $vatValidator,
         \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerDataFactory,
-        \Magento\Customer\Api\GroupManagementInterface $groupManagement
+        \Magento\Customer\Api\GroupManagementInterface $groupManagement,
+        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
+        \Magento\Customer\Model\Session $customerSession
     ) {
         $this->customerVat = $customerVat;
         $this->customerAddressHelper = $customerAddressHelper;
         $this->vatValidator = $vatValidator;
         $this->customerDataFactory = $customerDataFactory;
         $this->groupManagement = $groupManagement;
+        $this->addressRepository = $addressRepository;
+        $this->customerSession = $customerSession;
     }
 
     /**
@@ -84,6 +98,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
         $customerCountryCode = $address->getCountryId();
         $customerVatNumber = $address->getVatId();
+
+        /** try to get data from customer if quote address needed data is empty */
+        if (empty($customerCountryCode) && empty($customerVatNumber) && $customer->getDefaultShipping()) {
+            $customerAddress = $this->addressRepository->getById($customer->getDefaultShipping());
+
+            $customerCountryCode = $customerAddress->getCountryId();
+            $customerVatNumber = $customerAddress->getVatId();
+        }
+
         $groupId = null;
         if (empty($customerVatNumber) || false == $this->customerVat->isCountryInEU($customerCountryCode)) {
             $groupId = $customer->getId() ? $this->groupManagement->getDefaultGroup(
@@ -101,6 +124,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($groupId) {
             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
             $quote->setCustomerGroupId($groupId);
+            $this->customerSession->setCustomerGroupId($groupId);
             $customer->setGroupId($groupId);
             $quote->setCustomer($customer);
         }

app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php

@@ -14,7 +14,7 @@
 class CollectTotalsObserverTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Quote\Observer\Frontend\Quote\Address\CollectTotalsObserver;
+     * @var \Magento\Quote\Observer\Frontend\Quote\Address\CollectTotalsObserver
      */
     protected $model;
 
@@ -23,11 +23,21 @@ class CollectTotalsObserverTest extends \PHPUnit_Framework_TestCase
      */
     protected $customerAddressMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerSession;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerVatMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressRepository;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -172,14 +182,21 @@ protected function setUp()
             ->method('getCustomer')
             ->will($this->returnValue($this->customerMock));
 
+        $this->addressRepository = $this->getMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->customerMock->expects($this->any())->method('getStoreId')->will($this->returnValue($this->storeId));
 
         $this->model = new \Magento\Quote\Observer\Frontend\Quote\Address\CollectTotalsObserver(
             $this->customerAddressMock,
             $this->customerVatMock,
             $this->vatValidatorMock,
             $this->customerDataFactoryMock,
-            $this->groupManagementMock
+            $this->groupManagementMock,
+            $this->addressRepository,
+            $this->customerSession
         );
     }
 
@@ -319,4 +336,75 @@ public function testDispatchWithCustomerCountryInEU()
             ->willReturn($this->customerMock);
         $this->model->execute($this->observerMock);
     }
+
+    public function testDispatchWithEmptyShippingAddress()
+    {
+        $customerCountryCode = "DE";
+        $customerVat = "123123123";
+        $defaultShipping = 1;
+
+        $customerAddress = $this->getMock(\Magento\Customer\Api\Data\AddressInterface::class);
+        $customerAddress->expects($this->once())
+            ->method("getCountryId")
+            ->willReturn($customerCountryCode);
+
+        $customerAddress->expects($this->once())
+            ->method("getVatId")
+            ->willReturn($customerVat);
+        $this->addressRepository->expects($this->once())
+            ->method("getById")
+            ->with($defaultShipping)
+            ->willReturn($customerAddress);
+
+        $this->customerMock->expects($this->atLeastOnce())
+            ->method("getDefaultShipping")
+            ->willReturn($defaultShipping);
+
+        $this->vatValidatorMock->expects($this->once())
+            ->method('isEnabled')
+            ->with($this->quoteAddressMock, $this->storeId)
+            ->will($this->returnValue(true));
+
+        $this->quoteAddressMock->expects($this->once())
+            ->method('getCountryId')
+            ->will($this->returnValue(null));
+        $this->quoteAddressMock->expects($this->once())
+            ->method('getVatId')
+            ->will($this->returnValue(null));
+
+        $this->customerVatMock->expects($this->once())
+            ->method('isCountryInEU')
+            ->with($customerCountryCode)
+            ->willReturn(true);
+
+        $this->quoteMock->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->will($this->returnValue('customerGroupId'));
+        $validationResult = ['some' => 'result'];
+        $this->customerVatMock->expects($this->once())
+            ->method('getCustomerGroupIdBasedOnVatNumber')
+            ->with($customerCountryCode, $validationResult, $this->storeId)
+            ->will($this->returnValue('customerGroupId'));
+        $this->customerSession->expects($this->once())
+            ->method("setCustomerGroupId")
+            ->with('customerGroupId');
+
+        $this->vatValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with($this->quoteAddressMock, $this->storeId)
+            ->will($this->returnValue($validationResult));
+
+        /** Assertions */
+        $this->quoteAddressMock->expects($this->once())
+            ->method('setPrevQuoteCustomerGroupId')
+            ->with('customerGroupId');
+
+        $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
+        $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
+        $this->customerDataFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->customerMock);
+        $this->model->execute($this->observerMock);
+
+    }
 }