Merge pull request #1370 from algolia/feature/MAGE-674

Feature/mage 674

Author: mohitalgolia

Block/Algolia.php

@@ -270,13 +270,12 @@ public function getLastOrder()
         return $this->checkoutSession->getLastRealOrder();
     }
 
-    public function getAddToCartParams()
+    public function getAddToCartParams() : array
     {
-        $url = $this->getAddToCartUrl();
-
         return [
-            'action' => $url,
+            'action' => $this->_urlBuilder->getUrl('checkout/cart/add', []),
             'formKey' => $this->formKey->getFormKey(),
+            'redirectUrlParam' => ActionInterface::PARAM_NAME_URL_ENCODED
         ];
     }
 
@@ -285,6 +284,9 @@ public function getTimestamp()
         return $this->date->gmtTimestamp('today midnight');
     }
 
+    /**
+     * @deprecated This function is deprecated as redirect routes must be derived on the frontend not backend
+     */
     protected function getAddToCartUrl($additional = [])
     {
         $continueUrl = $this->urlHelper->getEncodedUrl($this->_urlBuilder->getCurrentUrl());

Block/Configuration.php

@@ -234,6 +234,7 @@ public function getConfiguration()
                 'path' => $path,
                 'level' => $level,
                 'parentCategory' => $parentCategoryName,
+                'url' => $this->getUrl('*/*/*', ['_use_rewrite' => true, '_forced_secure' => true])
             ],
             'showCatsNotIncludedInNavigation' => $config->showCatsNotIncludedInNavigation(),
             'showSuggestionsOnNoResultsPage' => $config->showSuggestionsOnNoResultsPage(),

view/frontend/templates/instant/hit.phtml

@@ -86,7 +86,7 @@ $origFormatedVar = $block->escapeHtml('price' . $priceKey . '_original_formated'
                             <input type="hidden" name="queryID" value="{{__queryID}}">
                             <input type="hidden" name="product" value="{{objectID}}">
                             {{#_highlightResult.default_bundle_options}}<input type="hidden" name="bundle_option[{{ optionId }}]" value="{{selectionId}}">{{/_highlightResult.default_bundle_options}}
-                            <input type="hidden" name="uenc" value="{{ addToCart.uenc }}">
+                            <input type="hidden" name="{{ addToCart.redirectUrlParam }}" value="{{ addToCart.uenc }}">
                             <input name="form_key" type="hidden" value="{{ addToCart.formKey }}">
                             <button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart primary"
                             data-objectid="{{objectID}}"

view/frontend/web/instantsearch.js

@@ -644,6 +644,20 @@ define(
 
             var isStarted = false;
 
+            // Capture active redirect URL with IS facet params for add to cart from PLP
+            if (algoliaConfig.instant.isAddToCartEnabled) {
+                search.on('render', () => {
+                    const cartForms = document.querySelectorAll('[data-role="tocart-form"]');
+                    cartForms.forEach((form, i) => {
+                        const ts = Date.now();
+                        form.addEventListener('submit', e => {
+                            const url = `${algoliaConfig.request.url}${window.location.search}`;
+                            e.target.elements[algoliaConfig.instant.addToCartParams.redirectUrlParam].value = AlgoliaBase64.mageEncode(url);
+                        })
+                    });
+                });
+            }
+
             function startInstantSearch() {
                 if (isStarted === true) {
                     return;

view/frontend/web/internals/common.js

@@ -198,6 +198,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
 
         hit.addToCart = {
             'action': action,
+            'redirectUrlParam': algoliaConfig.instant.addToCartParams.redirectUrlParam,
             'uenc': AlgoliaBase64.mageEncode(action),
             'formKey': algoliaConfig.instant.addToCartParams.formKey
         };