Merge branch 'MC-30258' into MC-23986

# Conflicts:
#	app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
#	app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php

Author: nikita-shcherbatykh

app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php

@@ -7,11 +7,12 @@
 namespace Magento\CheckoutAgreements\Model\Checkout\Plugin;
 
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
-use Magento\Store\Model\ScopeInterface;
 use Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
- * Checkout agreements validation.
+ * Class Validation validates the agreement based on the payment method
  */
 class Validation
 {
@@ -35,22 +36,32 @@ class Validation
      */
     private $activeStoreAgreementsFilter;
 
+    /**
+     * Quote repository.
+     *
+     * @var \Magento\Quote\Api\CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList
      * @param ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
+     * @param CartRepositoryInterface $quoteRepository
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
         \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList,
-        \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
+        \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter,
+        CartRepositoryInterface $quoteRepository
     ) {
         $this->agreementsValidator = $agreementsValidator;
         $this->scopeConfiguration = $scopeConfiguration;
         $this->checkoutAgreementsList = $checkoutAgreementsList;
         $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -76,13 +87,37 @@ public function beforeSavePaymentInformationAndPlaceOrder(
     }
 
     /**
-     * Validates agreements.
+     * Check validation before saving the payment information
+     *
+     * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $subject
+     * @param int $cartId
+     * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
+     * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     */
+    public function beforeSavePaymentInformation(
+        \Magento\Checkout\Api\PaymentInformationManagementInterface $subject,
+        $cartId,
+        \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
+        \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
+    ) {
+        $quote = $this->quoteRepository->getActive($cartId);
+        if ($this->isAgreementEnabled() && !$quote->getIsMultiShipping()) {
+            $this->validateAgreements($paymentMethod);
+        }
+    }
+
+    /**
+     * Validate agreements base on the payment method
      *
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      */
-    private function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $paymentMethod)
+    protected function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $paymentMethod)
     {
         $agreements = $paymentMethod->getExtensionAttributes() === null
             ? []

app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php

@@ -10,6 +10,7 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Class ValidationTest validates the agreement based on the payment method
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ValidationTest extends \PHPUnit\Framework\TestCase
@@ -59,12 +60,24 @@ class ValidationTest extends \PHPUnit\Framework\TestCase
      */
     private $agreementsFilterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteRepositoryMock;
+
     protected function setUp()
     {
         $this->agreementsValidatorMock = $this->createMock(\Magento\Checkout\Api\AgreementsValidatorInterface::class);
         $this->subjectMock = $this->createMock(\Magento\Checkout\Api\PaymentInformationManagementInterface::class);
         $this->paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $this->addressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
+        $this->quoteMock = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getIsMultiShipping']);
+        $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
         $this->extensionAttributesMock = $this->createPartialMock(
             \Magento\Quote\Api\Data\PaymentExtension::class,
             ['getAgreementIds']
@@ -81,7 +94,8 @@ protected function setUp()
             $this->agreementsValidatorMock,
             $this->scopeConfigMock,
             $this->checkoutAgreementsListMock,
-            $this->agreementsFilterMock
+            $this->agreementsFilterMock,
+            $this->quoteRepositoryMock
         );
     }
 
@@ -95,6 +109,15 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->quoteMock
+            ->expects($this->once())
+            ->method('getIsMultiShipping')
+            ->willReturn(false);
+        $this->quoteRepositoryMock
+            ->expects($this->once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($this->quoteMock);
         $this->agreementsFilterMock->expects($this->once())
             ->method('buildSearchCriteria')
             ->willReturn($searchCriteriaMock);
@@ -128,6 +151,15 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->quoteMock
+            ->expects($this->once())
+            ->method('getIsMultiShipping')
+            ->willReturn(false);
+        $this->quoteRepositoryMock
+            ->expects($this->once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($this->quoteMock);
         $this->agreementsFilterMock->expects($this->once())
             ->method('buildSearchCriteria')
             ->willReturn($searchCriteriaMock);
@@ -151,4 +183,38 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
         );
     }
+
+    public function testBeforeSavePaymentInformation()
+    {
+        $cartId = 100;
+        $agreements = [1, 2, 3];
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('isSetFlag')
+            ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+        $this->quoteMock
+            ->expects($this->once())
+            ->method('getIsMultiShipping')
+            ->willReturn(false);
+        $this->quoteRepositoryMock
+            ->expects($this->once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($this->quoteMock);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
+        $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
+        $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
+        $this->paymentMock->expects(static::atLeastOnce())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->extensionAttributesMock);
+        $this->model->beforeSavePaymentInformation($this->subjectMock, $cartId, $this->paymentMock, $this->addressMock);
+    }
 }