Skip to content
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

Jump to bottom

do not assume address exists #1777

Closed
wants to merge 2 commits into from
Closed

do not assume address exists #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565debf
do not assume address exists
Guite Apr 17, 2021
63ce725
add changelog entry
Guite Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...21-04-17-fix-missing-null-check-for-customer-addresses-which-prevented-login.md
View file
Open in desktop
@@ -0,0 +1,6 @@
---
title: Run app registration during app update if necessary
issue: -
---
# Core
* Made `SalesChannelContextFactory` more resilient with regards to missing customer addresses.
10 changes: 8 additions & 2 deletions src/Core/System/SalesChannel/Context/SalesChannelContextFactory.php
View file
Open in desktop
Expand Up @@ -464,8 +464,14 @@ private function loadCustomer(array $options, Context $context): ?CustomerEntity

$addresses = $this->addressRepository->search($criteria, $context);

$customer->setActiveBillingAddress($addresses->get($billingAddressId));
$customer->setActiveShippingAddress($addresses->get($shippingAddressId));
$billingAddress = $addresses->get($billingAddressId);
if (null !== $billingAddress) {
$customer->setActiveBillingAddress($billingAddress);
}
$shippingAddress = $addresses->get($shippingAddressId);
if (null !== $shippingAddress) {
$customer->setActiveShippingAddress($shippingAddress);
}

return $customer;
}
Expand Down