Merge pull request #1298 from algolia/release/3.10.0

Release/3.10.0

Author: mohitalgolia

.circleci/config.yml

@@ -8,10 +8,9 @@ shared: &shared
     - run:
         name: Override the Algolia extension with the cloned one
         command: |
-          cd ~/magento_directory/vendor/algolia
-          rm -rf algoliasearch-magento-2
           cp -R ~/build_directory/algoliasearch-magento-2 ~/magento_directory/vendor/algolia
           cd ~/magento_directory
+          sudo composer require algolia/algoliasearch-magento-2
           composer dump-autoload
 
     - run:
@@ -29,7 +28,10 @@ shared: &shared
           sleep 10
           php -dmemory_limit=-1 bin/magento module:disable Magento_WebapiAsync Magento_Amqp Magento_MysqlMq Magento_MessageQueue
           php -dmemory_limit=-1 bin/magento module:enable Algolia_AlgoliaSearch
+          sudo chmod -R 777 var/ pub/ generated/
           php -dmemory_limit=-1 bin/magento setup:upgrade
+          php -dmemory_limit=-1 bin/magento setup:d:c
+          php -dmemory_limit=-1 bin/magento setup:s:d -f
 
     - run:
         name: Get the right tests config for DB and administration
@@ -55,18 +57,17 @@ shared: &shared
           cd ~/magento_directory/dev/tests/integration
           sudo service elasticsearch start # for some reasons has to be launched with the step
           sleep 10
-          php -dmemory_limit=-1 ../../../vendor/bin/phpunit --debug ../../../vendor/algolia/algoliasearch-magento-2/Test
 
 jobs:
   "magento-2.3":
     <<: *shared
     docker:
-      - image: algolia/magento2-circleci:v3-2.3.5-p2
+      - image: algolia/magento2-circleci:2.4.4-php7.4-v1
 
   "magento-2.4":
     <<: *shared
     docker:
-      - image: algolia/magento2-circleci:v3-2.4.0
+      - image: algolia/magento2-circleci:2.4.4-php7.4-v1
 
   "quality-tools":
     docker:
@@ -106,6 +107,6 @@ workflows:
   version: 2
   build:
     jobs:
-      - "magento-2.3"
       - "magento-2.4"
+      - "magento-2.3"
       - "quality-tools"

Block/Cart/Recommend.php

@@ -43,12 +43,23 @@ public function __construct(
      */
     public function getAllCartItems()
     {
-        $cartItems = array();
+        $cartItems = [];
         $itemCollection = $this->checkoutSession->getQuote()->getAllVisibleItems();
-        foreach ( $itemCollection as $item) {
+        foreach ($itemCollection as $item) {
             $cartItems[] = $item->getProductId();
         }
         return array_unique($cartItems);
     }
 
-}
+    /**
+     * @return array
+     */
+    public function getAlgoliaRecommendConfiguration()
+    {
+        return [
+            'enabledFBTInCart' => $this->configHelper->isRecommendFrequentlyBroughtTogetherEnabledOnCartPage(),
+            'enabledRelatedInCart' => $this->configHelper->isRecommendRelatedProductsEnabledOnCartPage(),
+            'isTrendItemsEnabledInCartPage' => $this->configHelper->isTrendItemsEnabledInShoppingCart()
+             ];
+    }
+}

Block/Configuration.php

@@ -69,6 +69,7 @@ public function getConfiguration()
         $path = '';
         $level = '';
         $categoryId = '';
+        $parentCategoryName = '';
 
         $addToCartParams = $this->getAddToCartParams();
 
@@ -94,6 +95,8 @@ public function getConfiguration()
                 foreach ($category->getPathIds() as $treeCategoryId) {
                     if ($path !== '') {
                         $path .= ' /// ';
+                    }else{
+                        $parentCategoryName = $categoryHelper->getCategoryName($treeCategoryId, $this->getStoreId());
                     }
 
                     $path .= $categoryHelper->getCategoryName($treeCategoryId, $this->getStoreId());
@@ -150,6 +153,7 @@ public function getConfiguration()
                 'addToCartParams' => $addToCartParams,
                 'infiniteScrollEnabled' => $config->isInfiniteScrollEnabled(),
                 'urlTrackedParameters' => $this->getUrlTrackedParameters(),
+                'isSearchBoxEnabled' => $config->isInstantSearchBoxEnabled(),
             ],
             'autocomplete' => [
                 'enabled' => $config->isAutoCompleteEnabled(),
@@ -159,6 +163,7 @@ public function getConfiguration()
                 'nbOfCategoriesSuggestions' => $config->getNumberOfCategoriesSuggestions(),
                 'nbOfQueriesSuggestions' => $config->getNumberOfQueriesSuggestions(),
                 'isDebugEnabled' => $config->isAutocompleteDebugEnabled(),
+                'isNavigatorEnabled' => $config->isAutocompleteNavigatorEnabled()
             ],
             'landingPage' => [
                 'query' => $this->getLandingPageQuery(),
@@ -180,6 +185,9 @@ public function getConfiguration()
                 'isAddToCartEnabledInFBT' => $config->isAddToCartEnabledInFrequentlyBoughtTogether(),
                 'isAddToCartEnabledInRelatedProduct' => $config->isAddToCartEnabledInRelatedProducts(),
                 'isAddToCartEnabledInTrendsItem' => $config->isAddToCartEnabledInTrendsItem(),
+                'FBTTitle' => __($config->getFBTTitle()),
+                'relatedProductsTitle' => __($config->getRelatedProductsTitle()),
+                'trendingItemsTitle' => __($config->getTrendingItemsTitle()),
                 'addToCartParams' => $addToCartParams,
             ],
             'extensionVersion' => $config->getExtensionVersion(),
@@ -224,6 +232,7 @@ public function getConfiguration()
                 'landingPageId' => $this->getLandingPageId(),
                 'path' => $path,
                 'level' => $level,
+                'parentCategory' => $parentCategoryName,
             ],
             'showCatsNotIncludedInNavigation' => $config->showCatsNotIncludedInNavigation(),
             'showSuggestionsOnNoResultsPage' => $config->showSuggestionsOnNoResultsPage(),
@@ -303,6 +312,9 @@ public function getConfiguration()
                 'searchBy' => __('Search by'),
                 'searchForFacetValuesPlaceholder' => __('Search for other ...'),
                 'showMore' => __('Show more products'),
+                'searchTitle' => __('Search results for'),
+                'placeholder' => __('Search for products, categories, ...'),
+                'addToCart' => __('Add to Cart'),
             ],
         ];
 
@@ -369,4 +381,4 @@ protected function getLandingPageConfiguration()
     {
         return $this->isLandingPage() ? $this->getCurrentLandingPage()->getConfiguration() : json_encode([]);
     }
-}
+}

Block/RecommendProductView.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Algolia\AlgoliaSearch\Block;
+
+use Magento\Catalog\Model\Product;
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+
+class RecommendProductView extends Template
+{
+    /**
+     * @var Product
+     */
+    protected $product = null;
+
+    /**
+     * Core registry
+     *
+     * @var Registry
+     */
+    protected $coreRegistry = null;
+
+    /**
+     * @var ConfigHelper
+     */
+    protected $configHelper;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param ConfigHelper $configHelper
+     * @param array $data
+     */
+    public function __construct(
+        Context      $context,
+        Registry     $registry,
+        ConfigHelper $configHelper,
+        array        $data = []
+    ) {
+        $this->coreRegistry = $registry;
+        $this->configHelper = $configHelper;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Returns a Product
+     *
+     * @return Product
+     */
+    public function getProduct()
+    {
+        if (!$this->product) {
+            $this->product = $this->coreRegistry->registry('product');
+        }
+        return $this->product;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAlgoliaRecommendConfiguration()
+    {
+        return [
+            'enabledFBT' => $this->configHelper->isRecommendFrequentlyBroughtTogetherEnabled(),
+            'enabledRelated' => $this->configHelper->isRecommendRelatedProductsEnabled(),
+            'isTrendItemsEnabledInPDP' => $this->configHelper->isTrendItemsEnabledInPDP()
+        ];
+    }
+}

Block/Widget/TrendsItem.php

@@ -6,28 +6,37 @@
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Widget\Block\BlockInterface;
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 
 class TrendsItem extends Template implements BlockInterface
 {
+    /**
+     * @var ConfigHelper
+     */
+    protected $configHelper;
+
     protected $_template = 'recommend/widget/trends-item.phtml';
-    
+
     /**
      * @param Context $context
+     * @param ConfigHelper $configHelper
      * @param Random $mathRandom
      * @param array $data
      */
     public function __construct(
         Context $context,
+        ConfigHelper $configHelper,
         Random $mathRandom,
         array $data = []
     ) {
         $this->mathRandom = $mathRandom;
+        $this->configHelper = $configHelper;
         parent::__construct(
             $context,
             $data
         );
     }
- 
+
     /**
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -36,4 +45,12 @@ public function generateUniqueToken()
     {
         return $this->mathRandom->getRandomString(5);
     }
+
+    /**
+     * @return int
+     */
+    public function isTrendingItemEnabled()
+    {
+        return $this->configHelper->isRecommendTrendingItemsEnabled();
+    }
 }

CHANGELOG.md

@@ -1,5 +1,30 @@
 # CHANGE LOG
 
+
+## 3.10.0
+
+### UPDATES
+- Updated the sorting strategy to select between using Virtual Replica v/s Standard Replica. 
+- Deprecated the set up of Algolia synonyms from Magento admin
+- Updated Algolia Recommend version to 1.8.0 and refactored the corresponding code.
+- Added code to delete category from Algolia when the category is deleted from Magento.
+- Added keyboard navigation in autocomplete
+- Added search input placeholder translation in the autocomplete.
+- Added 10 SKU limit in SKU indexing form in the Magento admin.
+- Added configuration to enable/disable the searchBox widget on the instant search page.
+
+
+### FIXES
+- Fixed the issue with the price filter in Algolia Merchandiser.
+- Fixed the product price issue when the special price and catalog price rules are present.
+- Fixed the group price issues for all product types [Simple, Configurable, Bundle, Group, Downloadable, and Virtual Product].
+- Fixed the Algolia objectID issue in Recommend
+- Fixed the issue on the instant search page where the current search term was not reflecting on the page title.
+- Fixed the TagName error in autocomplete.
+- Fixed the issue with stock indexing when manage stock is set to No
+- Added code to prevent full indexing after placing order when MSI is disabled
+
+
 ## 3.9.1
 
 ### UPDATES

Controller/Adminhtml/Landingpage/Save.php

@@ -2,12 +2,14 @@
 
 namespace Algolia\AlgoliaSearch\Controller\Adminhtml\Landingpage;
 
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\MerchandisingHelper;
 use Algolia\AlgoliaSearch\Model\LandingPageFactory;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 
 class Save extends AbstractAction
 {
@@ -16,6 +18,16 @@ class Save extends AbstractAction
      */
     protected $dataPersistor;
 
+    /**
+     * @var CollectionFactory
+     */
+    protected $customerGroupCollectionFactory;
+
+    /**
+     * @var ConfigHelper
+     */
+    protected $configHelper;
+
     /**
      * PHP Constructor
      *
@@ -25,7 +37,7 @@ class Save extends AbstractAction
      * @param MerchandisingHelper $merchandisingHelper
      * @param StoreManagerInterface $storeManager
      * @param DataPersistorInterface $dataPersistor
-     *
+     * @param CollectionFactory $customerGroupCollectionFactory
      * @return Save
      */
     public function __construct(
@@ -34,10 +46,13 @@ public function __construct(
         LandingPageFactory $landingPageFactory,
         MerchandisingHelper $merchandisingHelper,
         StoreManagerInterface $storeManager,
-        DataPersistorInterface $dataPersistor
+        DataPersistorInterface $dataPersistor,
+        CollectionFactory $customerGroupCollectionFactory,
+        ConfigHelper $configHelper
     ) {
         $this->dataPersistor = $dataPersistor;
-
+        $this->customerGroupCollectionFactory = $customerGroupCollectionFactory;
+        $this->configHelper = $configHelper;
         parent::__construct(
             $context,
             $coreRegistry,
@@ -84,6 +99,18 @@ public function execute()
 
             if (isset($data['algolia_configuration']) && $data['algolia_configuration'] != $data['configuration']) {
                 $data['configuration'] = $data['algolia_configuration'];
+                if ($this->configHelper->isCustomerGroupsEnabled($data['store_id'])) {
+                    $configuration = json_decode($data['algolia_configuration'], true);
+                    $priceConfig = $configuration['price'.$data['price_key']];
+                    $customerGroups = $this->customerGroupCollectionFactory->create();
+                    $store = $this->storeManager->getStore($data['store_id']);
+                    $baseCurrencyCode = $store->getBaseCurrencyCode();
+                    foreach ($customerGroups as $group) {
+                        $groupId = (int) $group->getData('customer_group_id');
+                        $configuration['price.'.$baseCurrencyCode.'.group_'.$groupId] = $priceConfig;
+                    }
+                    $data['configuration'] = json_encode($configuration);
+                }
             }
 
             $landingPage->setData($data);
@@ -120,7 +147,12 @@ public function execute()
         return $resultRedirect->setPath('*/*/');
     }
 
-    private function manageQueryRules($landingPageId, $data)
+    /**
+     * @param $landingPageId
+     * @param $data
+     * @return void
+     */
+    protected function manageQueryRules($landingPageId, $data)
     {
         $positions = json_decode($data['algolia_merchandising_positions'], true);
         $stores = [];