File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed
app/code/Magento/Customer/Model/Address Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -139,9 +139,17 @@ private function prepareSelectedAddress(
139
139
$ addressId = null
140
140
): array {
141
141
if (null !== $ addressId && !isset ($ addressList [$ addressId ])) {
142
- $ selectedAddress = $ this ->prepareAddress ($ customer ->getAddresses ()[$ addressId ]);
143
- if (isset ($ selectedAddress ['id ' ])) {
144
- $ addressList [$ selectedAddress ['id ' ]] = $ selectedAddress ;
142
+ $ filteredDefaultAddress = array_filter (
143
+ $ customer ->getAddresses (),
144
+ function ($ address ) use ($ addressId ) {
145
+ return $ address ->getId () === $ addressId ;
146
+ }
147
+ );
148
+ if (!empty ($ filteredDefaultAddress )) {
149
+ $ selectedAddress = $ this ->prepareAddress (current ($ filteredDefaultAddress ));
150
+ if (isset ($ selectedAddress ['id ' ])) {
151
+ $ addressList [$ selectedAddress ['id ' ]] = $ selectedAddress ;
152
+ }
145
153
}
146
154
}
147
155
You can’t perform that action at this time.
0 commit comments