Merge branch 'patch-1' of https://github.com/Aniket10Nov/magento2 int…

…o 2.4-develop
magento · Mar 17, 2020 · 756aedf · 756aedf
2 parents 047f5b9 + e5cf14c
commit 756aedf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -90,7 +90,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
             );
         }
 
-        $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
+        $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput, $sameAsShipping);
 
         $this->assignBillingAddressToCart->execute($cart, $billingAddress, $sameAsShipping);
     }
@@ -101,6 +101,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
      * @param ContextInterface $context
      * @param int|null $customerAddressId
      * @param array $addressInput
+     * @param bool $sameAsShipping
      * @return Address
      * @throws GraphQlAuthorizationException
      * @throws GraphQlInputException
@@ -109,16 +110,17 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
     private function createBillingAddress(
         ContextInterface $context,
         ?int $customerAddressId,
-        ?array $addressInput
+        ?array $addressInput,
+        $sameAsShipping
     ): Address {
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
 
             $customerId = $context->getUserId();
             // need to save address only for registered user and if save_in_address_book = true
-            if (0 !== $customerId
+            if ((0 !== $customerId
                 && isset($addressInput['save_in_address_book'])
-                && (bool)$addressInput['save_in_address_book'] === true
+                && (bool)$addressInput['save_in_address_book'] && $sameAsShipping !== true) === true
             ) {
                 $this->saveQuoteAddressToCustomerAddressBook->execute($billingAddress, $customerId);
             }