Merge branch 'develop' into bugfix/referenceContainer

Author: mohitalgolia

Block/Configuration.php

@@ -309,6 +309,7 @@ public function getConfiguration()
                 'relevance' => __('Relevance'),
                 'categories' => __('Categories'),
                 'products' => __('Products'),
+                'suggestions' => __('Suggestions'),
                 'searchBy' => __('Search by'),
                 'searchForFacetValuesPlaceholder' => __('Search for other ...'),
                 'showMore' => __('Show more products'),

CHANGELOG.md

@@ -1,5 +1,36 @@
 # CHANGE LOG
 
+## 3.10.2
+
+### UPDATES
+- Ensured compatibility of the extension with Magento 2.4.6
+- Updated the code to allow for convenient customization of object serialization
+- Enhanced comments for non-castable attributes in system configuration
+- Updated the code to ensure that accurate prices are indexed for bundle products when the dynamic price attribute is turned off
+- Updated autocomplete to include userToken and enablePersonalization tag in search requests
+
+
+
+### Bug Fixes
+- Fixed issue with section.label in autocomplete
+- Resolved issue with nbOfQuerySuggestions in autocomplete
+- Fixed routing error related to disabling searchBox for instant search page
+- Resolved deployment issue with prefixed Magento database tables
+- Fixed spacing issue with pagination on instant search page
+
+
+## 3.10.1
+
+### UPDATES
+- Added recommended js version in readme file.
+
+### Bug Fixes
+- Add caching on category name lookup (scoped by store) to fix slowness in indexing.
+- Prevent loss of synonyms while copying from tmp index during Indexing in Algolia Dashboard.
+- Fixed the translation issue of labels in Algolia autocomplete dropdown
+- Ensured compatibility of the extension with PHP 7.4
+- Resolved the deployment issue related to prefixing Magento database tables
+
 
 ## 3.10.0
 

Helper/Entity/CategoryHelper.php

@@ -50,6 +50,7 @@ class CategoryHelper
     protected $categoryRepository;
 
     protected $isCategoryVisibleInMenuCache;
+    protected $coreCategories;
     protected $idColumn;
     protected $categoryAttributes;
     protected $rootCategoryId = -1;
@@ -548,7 +549,12 @@ public function isCategoryVisibleInMenu($categoryId, $storeId)
      */
     public function getCoreCategories($filterNotIncludedCategories = true, $storeId = null)
     {
-        $key = $filterNotIncludedCategories ? 'filtered' : 'non_filtered';
+        // Cache category look up by store scope
+        $key = ($filterNotIncludedCategories ? 'filtered' : 'non_filtered') . "-$storeId";
+
+        if (isset($this->coreCategories[$key])) {
+            return $this->coreCategories[$key];
+        }
 
         $collection = $this->categoryCollectionFactory->create()
             ->distinct(true)
@@ -562,14 +568,14 @@ public function getCoreCategories($filterNotIncludedCategories = true, $storeId
             $collection->addAttributeToFilter('include_in_menu', '1');
         }
 
-        $coreCategories[$key] = [];
+        $this->coreCategories[$key] = [];
 
         /** @var \Magento\Catalog\Model\Category $category */
         foreach ($collection as $category) {
-                $coreCategories[$key][$category->getId()] = $category;
+                $this->coreCategories[$key][$category->getId()] = $category;
         }
 
-        return $coreCategories[$key];
+        return $this->coreCategories[$key];
     }
 
     /**

Helper/Entity/Product/PriceManager/Bundle.php

@@ -19,13 +19,14 @@ class Bundle extends ProductWithChildren
      */
     protected function addAdditionalData($product, $withTax, $subProducts, $currencyCode, $field) {
         $data = $this->getMinMaxPrices($product, $withTax, $subProducts, $currencyCode);
-        $dashedFormat = $this->getDashedPriceFormat($data['min_price'], $data['max'], $currencyCode);
-        if ($data['min_price'] !== $data['max']) {
-            $this->handleBundleNonEqualMinMaxPrices($field, $currencyCode, $data['min_price'], $data['max'], $dashedFormat);
+        $dashedFormat = $this->getDashedPriceFormat($data['min_price'], $data['max_price'], $currencyCode);
+        if ($data['min_price'] !== $data['max_price']) {
+            $this->handleBundleNonEqualMinMaxPrices($field, $currencyCode, $data['min_price'], $data['max_price'], $dashedFormat);
         }
-        $this->handleOriginalPrice($field, $currencyCode, $data['min_price'], $data['max'], $data['min_original'], $data['max_original']);
+
+        $this->handleOriginalPrice($field, $currencyCode, $data['min_price'], $data['max_price'], $data['min_original'], $data['max_original']);
         if (!$this->customData[$field][$currencyCode]['default']) {
-            $this->handleZeroDefaultPrice($field, $currencyCode, $data['min_price'], $data['max']);
+            $this->handleZeroDefaultPrice($field, $currencyCode, $data['min_price'], $data['max_price']);
         }
         if ($this->areCustomersGroupsEnabled) {
             $groupedDashedFormat = $this->getBundleDashedPriceFormat($data['min'], $data['max'], $currencyCode);
@@ -42,25 +43,29 @@ protected function addAdditionalData($product, $withTax, $subProducts, $currency
      */
     protected function getMinMaxPrices(Product $product, $withTax, $subProducts, $currencyCode)
     {
-        $regularPrice = $product->getPriceInfo()->getPrice('regular_price')->getMinimalPrice()->getValue();
+        $product->setData('website_id', $product->getStore()->getWebsiteId());
         $minPrice = $product->getPriceInfo()->getPrice('final_price')->getMinimalPrice()->getValue();
         $minOriginalPrice = $product->getPriceInfo()->getPrice('regular_price')->getMinimalPrice()->getValue();
         $maxOriginalPrice = $product->getPriceInfo()->getPrice('regular_price')->getMaximalPrice()->getValue();
         $max = $product->getPriceInfo()->getPrice('final_price')->getMaximalPrice()->getValue();
         $minArray = [];
+        $maxArray = [];
         foreach ($this->groups as $group) {
             $groupId = (int) $group->getData('customer_group_id');
-            foreach ($subProducts as $subProduct) {
-                $subProduct->setData('customer_group_id', $groupId);
-                $subProductFinalPrice = $this->getTaxPrice($product, $subProduct->getPriceModel()->getFinalPrice(1, $subProduct), $withTax);
-                $priceDiff = $subProduct->getPrice() - $subProductFinalPrice;
-                $minArray[$groupId][] = $regularPrice - $priceDiff;
-            }
+            $product->setData('customer_group_id', $groupId);
+            $minPrice = $product->getPriceInfo()->getPrice('final_price')->getMinimalPrice()->getValue();
+            $minArray[$groupId] = $product->getPriceInfo()->getPrice('final_price')->getMinimalPrice()->getValue();
+            $maxArray[$groupId] = $product->getPriceInfo()->getPrice('final_price')->getMaximalPrice()->getValue();
+            $product->setData('customer_group_id', null);
         }
 
         $minPriceArray = [];
         foreach ($minArray as $groupId => $min) {
-            $minPriceArray[$groupId] = min($min);
+            $minPriceArray[$groupId] = $min;
+        }
+        $maxPriceArray = [];
+        foreach ($maxArray as $groupId => $max) {
+            $maxPriceArray[$groupId] = $max;
         }
 
         if ($currencyCode !== $this->baseCurrencyCode) {
@@ -70,15 +75,15 @@ protected function getMinMaxPrices(Product $product, $withTax, $subProducts, $cu
             foreach ($minPriceArray as $groupId => $price) {
                 $minPriceArray[$groupId] = $this->convertPrice($price, $currencyCode);
             }
-            if ($min !== $max) {
+            if ($minPrice !== $max) {
                 $max = $this->convertPrice($max, $currencyCode);
             }
         }
-
         return [
             'min' => $minPriceArray,
-            'max' => $max,
+            'max' => $maxPriceArray,
             'min_price' => $minPrice,
+            'max_price' => $max,
             'min_original' => $minOriginalPrice,
             'max_original' => $maxOriginalPrice
         ];
@@ -117,10 +122,10 @@ protected function handleBundleNonEqualMinMaxPrices($field, $currencyCode, $min,
     protected function getBundleDashedPriceFormat($minPrices, $max, $currencyCode) {
         $dashedFormatPrice = [];
         foreach ($minPrices as $groupId => $min) {
-            if ($min === $max) {
+            if ($min === $max[$groupId]) {
                 $dashedFormatPrice [$groupId] =  '';
             }
-            $dashedFormatPrice[$groupId] = $this->formatPrice($min, $currencyCode) . ' - ' . $this->formatPrice($max, $currencyCode);
+            $dashedFormatPrice[$groupId] = $this->formatPrice($min, $currencyCode) . ' - ' . $this->formatPrice($max[$groupId], $currencyCode);
         }
         return $dashedFormatPrice;
     }
@@ -139,12 +144,12 @@ protected function setFinalGroupPricesBundle($field, $currencyCode, $min, $max,
         foreach ($this->groups as $group) {
             $groupId = (int) $group->getData('customer_group_id');
             $this->customData[$field][$currencyCode]['group_' . $groupId] = $min[$groupId];
-            if ($min === $max) {
+            if ($min[$groupId] === $max[$groupId]) {
                 $this->customData[$field][$currencyCode]['group_' . $groupId . '_formated'] =
                     $this->customData[$field][$currencyCode]['default_formated'];
             } else {
                 $this->customData[$field][$currencyCode]['group_' . $groupId . '_formated'] = $dashedFormat[$groupId];
             }
         }
     }
-}
+}