Skip to content

Resolved issue for Customer address is duplicated after setBillingAddressOnCart GraphQL mutation #27107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 26, 2020
Merged

Resolved issue for Customer address is duplicated after setBillingAddressOnCart GraphQL mutation #27107

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf0e98
setbilling address graphql save address in addressbook
Aniketmdp Feb 29, 2020
18954f6
Add Whitespace before the argument
Aniketmdp Mar 2, 2020
e5cf14c
Merge branch '2.4-develop' into patch-1
Aniket10Nov Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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
Expand All @@ -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);
}
Expand Down