Merge branch 'develop' into ACQE-functional-deployment-v4-5

Author: Karishmathakare19

InventoryInStorePickupApi/Test/Api/GetPickupLocationsTest.php

@@ -1099,7 +1099,7 @@ private function sendRequest(array $requestData)
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
-                'httpMethod' => Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,

InventoryInStorePickupApi/etc/webapi.xml

@@ -13,4 +13,10 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
+    <route url="/V1/inventory/in-store-pickup/pickup-locations/" method="POST">
+        <service class="Magento\InventoryInStorePickupApi\Api\GetPickupLocationsInterface" method="execute"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
 </routes>

InventoryInStorePickupFrontend/view/frontend/web/js/model/pickup-locations-service.js

@@ -82,22 +82,24 @@ define([
          */
         getNearbyLocations: function (searchCriteria) {
             var self = this,
-                serviceUrl = resourceUrlManager.getUrlForNearbyPickupLocations(websiteCode, searchCriteria);
+                serviceUrl = resourceUrlManager.getUrlForNearbyPickupLocations(),
+                requestData = resourceUrlManager.getNearbyPickupLocationsRequestData(websiteCode, searchCriteria),
+                cacheKey = serviceUrl + JSON.stringify(requestData);
 
-            if (self.locationsCache[serviceUrl]) {
-                return $.Deferred().resolve(self.locationsCache[serviceUrl]).promise();
+            if (self.locationsCache[cacheKey]) {
+                return $.Deferred().resolve(self.locationsCache[cacheKey]).promise();
             }
 
             self.isLoading(true);
 
             return storage
-                .get(serviceUrl, {}, false)
+                .post(serviceUrl, JSON.stringify(requestData), false)
                 .then(function (result) {
-                    self.locationsCache[serviceUrl] = _.map(result.items, function (address) {
+                    self.locationsCache[cacheKey] = _.map(result.items, function (address) {
                         return self.formatAddress(address);
                     });
 
-                    return self.locationsCache[serviceUrl];
+                    return self.locationsCache[cacheKey];
                 })
                 .fail(function (response) {
                     self.processError(response);

InventoryInStorePickupFrontend/view/frontend/web/js/model/resource-url-manager.js

@@ -11,33 +11,38 @@ define(['jquery', 'Magento_Checkout/js/model/resource-url-manager'], function (
 
     return {
         /**
-         * Returns URL for REST API to fetch nearby pickup locations defined for given sales channel.
+         * Returns URL for REST API to fetch nearby pickup locations.
+         */
+        getUrlForNearbyPickupLocations: function () {
+            var urls = {
+                default: '/inventory/in-store-pickup/pickup-locations/'
+            };
+
+            return resourceUrlManager.getUrl(urls, {});
+        },
+
+        /**
+         * Prepares search criteria for nearby pickup locations request.
          *
          * @param {String} salesChannelCode - Code of the sales channel.
          * @param {Object} searchCriteria
+         * @returns {Object}
          */
-        getUrlForNearbyPickupLocations: function (
+        getNearbyPickupLocationsRequestData: function (
             salesChannelCode,
             searchCriteria
         ) {
-            var urls = {
-                    default: '/inventory/in-store-pickup/pickup-locations/'
-                },
-                criteria = {
-                    searchRequest: {
-                        scopeCode: salesChannelCode
-                    }
-                };
+            var criteria = {
+                searchRequest: {
+                    scopeCode: salesChannelCode
+                }
+            };
 
             searchCriteria = {
                 searchRequest: searchCriteria
             };
 
-            return (
-                resourceUrlManager.getUrl(urls, {}) +
-                '?' +
-                $.param($.extend(true, criteria, searchCriteria))
-            );
+            return $.extend(true, criteria, searchCriteria);
         },
 
         /**