MAGETWO-99624: [Magento Cloud] Checkout not possible with zero sum checkout for virtual products

Author: rostyslav-hymon

app/code/Magento/Checkout/Model/PaymentInformationManagement.php

@@ -112,6 +112,12 @@ public function savePaymentInformation(
             $quoteRepository = $this->getCartRepository();
             /** @var \Magento\Quote\Model\Quote $quote */
             $quote = $quoteRepository->getActive($cartId);
+            $customerId = $quote->getBillingAddress()
+                ->getCustomerId();
+            if (!$billingAddress->getCustomerId() && $customerId) {
+                //It's necessary to verify the price rules with the customer data
+                $billingAddress->setCustomerId($customerId);
+            }
             $quote->removeAddress($quote->getBillingAddress()->getId());
             $quote->setBillingAddress($billingAddress);
             $quote->setDataChanges(true);

app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php

@@ -179,7 +179,7 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
             ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
         );
         $this->cartRepositoryMock->expects($this->any())->method('getActive')->with($cartId)->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($quoteBillingAddress);
+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
         $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteShippingAddress);
         $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
         $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);