Merge branch 'MAGETWO-63101' into MPI-Bugfixes

Author: YevSent

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -13,6 +13,7 @@
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
+use Magento\Directory\Model\AllowedCountries;
 
 /**
  * Multishipping checkout model
@@ -146,12 +147,19 @@ class Multishipping extends \Magento\Framework\DataObject
      */
     private $cartExtensionFactory;
 
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountryReader;
+
     /**
      * @var \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor
      */
     private $shippingAssignmentProcessor;
 
     /**
+     * Multishipping constructor.
+     *
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
@@ -174,6 +182,7 @@ class Multishipping extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
      * @param array $data
+     * @param AllowedCountries|null $allowedCountryReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -198,7 +207,8 @@ public function __construct(
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
-        array $data = []
+        array $data = [],
+        AllowedCountries $allowedCountryReader = null
     ) {
         $this->_eventManager = $eventManager;
         $this->_scopeConfig = $scopeConfig;
@@ -221,6 +231,8 @@ public function __construct(
         $this->quotePaymentToOrderPayment = $quotePaymentToOrderPayment;
         $this->quoteAddressToOrderAddress = $quoteAddressToOrderAddress;
         $this->totalsCollector = $totalsCollector;
+        $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
+            ->get(AllowedCountries::class);
         parent::__construct($data);
         $this->_init();
     }
@@ -696,6 +708,18 @@ protected function _validate()
                     __('Please specify shipping methods for all addresses.')
                 );
             }
+
+            // Checks if a country id present in the allowed countries list.
+            if (
+                !in_array(
+                    $address->getCountryId(),
+                    $this->allowedCountryReader->getAllowedCountries()
+                )
+            ) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Some addresses cannot be used due to country-specific configurations.')
+                );
+            }
         }
         $addressValidation = $quote->getBillingAddress()->validate();
         if ($addressValidation !== true) {

app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

@@ -44,6 +44,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit_Framework_MockObject_MockObject;
 use PHPUnit_Framework_TestCase;
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Directory\Model\AllowedCountries;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -146,6 +149,13 @@ protected function setUp()
         $this->customerSessionMock->expects($this->atLeastOnce())->method('getCustomerDataObject')
             ->willReturn($this->customerMock);
         $this->totalsCollectorMock = $this->createSimpleMock(TotalsCollector::class);
+        $allowedCountryReaderMock = $this->getMockBuilder(AllowedCountries::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllowedCountries'])
+            ->getMock();
+        $allowedCountryReaderMock->method('getAllowedCountries')
+            ->willReturn(['EN'=>'EN']);
+
         $this->model = new Multishipping(
             $this->checkoutSessionMock,
             $this->customerSessionMock,
@@ -168,7 +178,8 @@ protected function setUp()
             $this->searchCriteriaBuilderMock,
             $this->filterBuilderMock,
             $this->totalsCollectorMock,
-            $data
+            $data,
+            $allowedCountryReaderMock
         );
 
         $this->cartExtensionFactoryMock = $this->getMockBuilder(CartExtensionFactory::class)
@@ -357,6 +368,49 @@ public function testSetShippingMethods()
         $this->model->setShippingMethods($methodsArray);
     }
 
+    /**
+     * Tests exception for addresses with country id not in the allowed countries list.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some addresses cannot be used due to country-specific configurations.
+     */
+    public function testCreateOrdersCountryNotPresentInAllowedListException()
+    {
+        $abstractMethod = $this->getMockBuilder(AbstractMethod::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAvailable'])
+            ->getMockForAbstractClass();
+        $abstractMethod->method('isAvailable')
+            ->willReturn(true);
+
+        $paymentMock = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMethodInstance'])
+            ->getMock();
+        $paymentMock->method('getMethodInstance')
+            ->willReturn($abstractMethod);
+
+        $shippingAddressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['validate', 'getShippingMethod', 'getShippingRateByCode', 'getCountryId'])
+            ->getMock();
+        $shippingAddressMock->method('validate')
+            ->willReturn(true);
+        $shippingAddressMock->method('getShippingMethod')
+            ->willReturn('carrier');
+        $shippingAddressMock->method('getShippingRateByCode')
+            ->willReturn('code');
+        $shippingAddressMock->method('getCountryId')
+            ->willReturn('EU');
+
+        $this->quoteMock->method('getPayment')
+            ->willReturn($paymentMock);
+        $this->quoteMock->method('getAllShippingAddresses')
+            ->willReturn([$shippingAddressMock]);
+
+        $this->model->createOrders();
+    }
+
     /**
      * @param ShippingAssignment $shippingAssignmentMock
      * @return CartExtension|PHPUnit_Framework_MockObject_MockObject

app/code/Magento/Multishipping/composer.json

@@ -11,7 +11,8 @@
         "magento/module-customer": "100.2.*",
         "magento/module-theme": "100.2.*",
         "magento/module-quote": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/framework": "100.2.*",
+        "magento/module-directory": "100.2.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/Multishipping/i18n/en_US.csv

@@ -87,3 +87,4 @@ Options,Options
 "Review Order","Review Order"
 "Select Shipping Method","Select Shipping Method"
 "We received your order!","We received your order!"
+"Some addresses cannot be used due to country-specific configurations.","Some addresses cannot be used due to country-specific configurations."

app/code/Magento/Quote/Model/QuoteValidator.php

@@ -7,6 +7,8 @@
 namespace Magento\Quote\Model;
 
 use Magento\Quote\Model\Quote as QuoteEntity;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * @api
@@ -18,6 +20,22 @@ class QuoteValidator
      */
     const MAXIMUM_AVAILABLE_NUMBER = 99999999;
 
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountryReader;
+
+    /**
+     * QuoteValidator constructor.
+     *
+     * @param AllowedCountries|null $allowedCountryReader
+     */
+    public function __construct(AllowedCountries $allowedCountryReader = null)
+    {
+        $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
+            ->get(AllowedCountries::class);
+    }
+
     /**
      * Validate quote amount
      *
@@ -69,6 +87,19 @@ public function validateBeforeSubmit(QuoteEntity $quote)
         if (!$quote->getPayment()->getMethod()) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please select a valid payment method.'));
         }
+
+        // Checks if country id present in the allowed countries list.
+        if (
+            !in_array(
+                $quote->getShippingAddress()->getCountryId(),
+                $this->allowedCountryReader->getAllowedCountries()
+            )
+        ) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Some addresses cannot be used due to country-specific configurations.')
+            );
+        }
+
         return $this;
     }
 }

app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php

@@ -6,6 +6,10 @@
 namespace Magento\Quote\Test\Unit\Model;
 
 use \Magento\Quote\Model\QuoteValidator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Paymen;
 
 /**
  * Class QuoteValidatorTest
@@ -175,4 +179,58 @@ public function testValidateBeforeSubmitThrowsExceptionIfPaymentMethodIsNotSelec
 
         $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
     }
+
+    /**
+     * Test case when country id not present in allowed countries list.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some addresses cannot be used due to country-specific configurations.
+     */
+    public function testValidateBeforeSubmitThrowsExceptionIfCountrySpecificConfigurations()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $allowedCountryReader = $this->getMockBuilder(AllowedCountries::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllowedCountries'])
+            ->getMock();
+        $allowedCountryReader->method('getAllowedCountries')
+            ->willReturn(['EE' => 'EE']);
+
+        $addressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountryId'])
+            ->getMock();
+        $addressMock->method('getCountryId')
+            ->willReturn('EU');
+
+        $paymentMock = $this->getMockBuilder(Paymen::class)
+            ->setMethods(['getMethod'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $paymentMock->method('getMethod')
+            ->willReturn(true);
+
+        $billingAddressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['validate'])
+            ->getMock();
+        $billingAddressMock->method('validate')
+            ->willReturn(true);
+
+        $this->quoteMock->method('getShippingAddress')
+            ->willReturn($addressMock);
+        $this->quoteMock->method('isVirtual')
+            ->willReturn(true);
+        $this->quoteMock->method('getBillingAddress')
+            ->willReturn($billingAddressMock);
+        $this->quoteMock->method('getPayment')
+            ->willReturn($paymentMock);
+
+        $quoteValidator = $objectManagerHelper->getObject(
+            QuoteValidator::class,
+            ['allowedCountryReader' => $allowedCountryReader]
+        );
+
+        $quoteValidator->validateBeforeSubmit($this->quoteMock);
+    }
 }

app/code/Magento/Quote/i18n/en_US.csv

@@ -55,3 +55,4 @@ error123,error123
 error345,error345
 Carts,Carts
 "Manage carts","Manage carts"
+"Some addresses cannot be used due to country-specific configurations.","Some addresses cannot be used due to country-specific configurations."

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -93,6 +93,7 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
         $rate->setCode('freeshipping_freeshipping');
 
         $this->_model->getQuote()->getShippingAddress()->addShippingRate($rate);
+        $this->_model->getQuote()->getShippingAddress()->setCountryId('EE');
         $this->_model->setShippingAsBilling(0);
         $this->_model->setPaymentData(['method' => 'checkmo']);