Skip to content

3468 no pickup locations are rendered when customer account shipping address postcode yields no searh results #3469

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

Open
novikor wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

3468 no pickup locations are rendered when customer account shipping address postcode yields no searh results #3469

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
7833a58
Reset locations list after empty-result preselect attempts from saved…
novikor Sep 2, 2026
8fe7315
Unified In-Store Pickup Rest API search criterias.
novikor Sep 2, 2026
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
40 changes: 40 additions & 0 deletions InventoryInStorePickupFrontend/view/frontend/web/js/model/pickup-locations-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,46 @@ define([
}.bind(this));
},

/**
* Sole owner of the nearby search criteria shape. Requests issued from different components
* must be structurally identical, otherwise they miss each other in locationsCache.
*
* @param {String} searchTerm
* @param {Number} radius
* @param {Number} pageSize
* @returns {Object}
*/
getNearbyLocationsCriteria: function (searchTerm, radius, pageSize) {
var criteria,
// Composite items are skipped - their children carry the salable skus.
productsInfo = _.chain(quote.getItems())
.filter(function (item) {
return item['qty_options'] === undefined || item['qty_options'].length === 0;
})
.map(function (item) {
return {
sku: item.sku
};
})
.value();

criteria = {
extensionAttributes: {
productsInfo: productsInfo
},
pageSize: pageSize
};

if (searchTerm) {
criteria.area = {
radius: radius,
searchTerm: searchTerm
};
}

return criteria;
},

/**
* Get nearby pickup locations based on given search criteria.
*
Expand Down
32 changes: 9 additions & 23 deletions InventoryInStorePickupFrontend/view/frontend/web/js/view/store-pickup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,7 @@ define([
selectedSource,
selectedSourceCode,
nearestLocation,
self = this,
productsInfo = [],
items = quote.getItems();
self = this;

if (!this.isStorePickupSelected()) {
return;
Expand Down Expand Up @@ -279,27 +277,15 @@ define([
pickupLocationsService.selectForShipping(location);
});
} else if (shippingAddress.city && shippingAddress.postcode) {
_.each(items, function (item) {
if (item['qty_options'] === undefined || item['qty_options'].length === 0) {
productsInfo.push(
{
sku: item.sku
}
);
}
});
pickupLocationsService
.getNearbyLocations({
area: {
radius: this.nearbySearchRadius,
searchTerm: shippingAddress.postcode + this.delimiter +
shippingAddress.countryId || this.defaultCountry
},
extensionAttributes: {
productsInfo: productsInfo
},
pageSize: this.nearbySearchLimit
})
.getNearbyLocations(
pickupLocationsService.getNearbyLocationsCriteria(
shippingAddress.postcode + this.delimiter +
(shippingAddress.countryId || this.defaultCountry),
this.nearbySearchRadius,
this.nearbySearchLimit
)
)
.then(function (locations) {
nearestLocation = locations[0];

Expand Down
46 changes: 15 additions & 31 deletions InventoryInStorePickupFrontend/view/frontend/web/js/view/store-selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ define([
* @returns void
*/
openPopup: function () {
var shippingAddress = quote.shippingAddress(),
var self = this,
shippingAddress = quote.shippingAddress(),
country = shippingAddress.countryId ? shippingAddress.countryId :
this.defaultCountryId,
searchTerm = '';
Expand All @@ -137,7 +138,11 @@ define([
searchTerm = this.getSearchTerm(shippingAddress.postcode, country);
}

this.updateNearbyLocations(searchTerm);
this.updateNearbyLocations(searchTerm).done(function () {
if (searchTerm && !self.searchQuery() && !self.nearbyLocations().length) {
self.updateNearbyLocations('');
}
});
},

/**
Expand All @@ -162,37 +167,16 @@ define([
* @returns {*}
*/
updateNearbyLocations: function (searchQuery) {
var self = this,
productsInfo = [],
items = quote.getItems(),
searchCriteria;

_.each(items, function (item) {
if (item['qty_options'] === undefined || item['qty_options'].length === 0) {
productsInfo.push(
{
sku: item.sku
}
);
}
});

searchCriteria = {
extensionAttributes: {
productsInfo: productsInfo
},
pageSize: this.nearbySearchLimit
};

if (searchQuery) {
searchCriteria.area = {
radius: this.nearbySearchRadius,
searchTerm: searchQuery
};
}
const self = this;

return pickupLocationsService
.getNearbyLocations(searchCriteria)
.getNearbyLocations(
pickupLocationsService.getNearbyLocationsCriteria(
searchQuery,
this.nearbySearchRadius,
this.nearbySearchLimit
)
)
.then(function (locations) {
self.nearbyLocations(locations);
})
Expand Down