diff --git a/.gitignore b/.gitignore index 4acd5ee..375ffad 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ node_modules/ dist/ .magento/ +.env # Compiled Java class files *.class diff --git a/Block/CategoryInfoBlock.php b/Block/CategoryInfoBlock.php index d3ea967..e4c7793 100644 --- a/Block/CategoryInfoBlock.php +++ b/Block/CategoryInfoBlock.php @@ -1,10 +1,34 @@ _registry->registry('current_category'); } + /** + * @return mixed|null + */ public function getCurrentProduct() { return $this->_registry->registry('current_product'); } } -?> diff --git a/Observer/ConfigObserver.php b/Observer/ConfigObserver.php index ed66931..e3e8bfd 100644 --- a/Observer/ConfigObserver.php +++ b/Observer/ConfigObserver.php @@ -12,6 +12,10 @@ class ConfigObserver implements ObserverInterface * @var RequestInterface */ private $request; + /** + * @var WriterInterface + */ + private $configWriter; /** * ConfigChange constructor. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 496a80e..81df95d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,13 @@ +## 1.8.0 + +## Added + +- [`ADDED`]: Added support for [Bloomreach Discovery Facet Response V3](https://documentation.bloomreach.com/discovery/reference/facet-response-v3-unified-ranking). + +## Fixed + +- [`FIXED`]: When adding multiple Recommendations widgets in storefronts, only one was showing. + ## 1.7.1 ## Fixed diff --git a/ViewModel/Head/ScriptInit.php b/ViewModel/Head/ScriptInit.php index 335314b..c314c1a 100644 --- a/ViewModel/Head/ScriptInit.php +++ b/ViewModel/Head/ScriptInit.php @@ -40,7 +40,6 @@ use Magento\Framework\Pricing\PriceCurrencyInterface; use Magento\Directory\Model\Currency; - /** * Class ScriptInit * package Bloomreach\Connector\ViewModel\Head @@ -687,7 +686,6 @@ public function isPixelDevelopment() { $val = $this->getStoreConfigValue(self::RECOMM_PIXEL_DEVELOPMENT); return 1 == $val; - } /** @@ -730,8 +728,7 @@ public function getAccountId() } /** - * Get current customer unique id. This will become a visitor ID if customer - * is not logged in. + * Get current customer unique id. This will become a visitor ID if customer is not logged in. */ public function getCustomerId() { diff --git a/bin/main.js b/bin/main.js index 72ad395..4b300af 100755 --- a/bin/main.js +++ b/bin/main.js @@ -2,6 +2,7 @@ const commander = require("commander"); const path = require("path"); const shell = require("shelljs"); +require('dotenv').config(); const { Command } = commander; const program = new Command(); diff --git a/composer.json b/composer.json index 0944629..b257f3b 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "bloomreach/bloomreach-connector-magento", "description": "Bloomreach connector for autosuggest,collection and product search", - "version": "1.7.1", + "version": "1.8.0", "type": "magento2-module", "license": "proprietary", "authors": [ diff --git a/etc/config.xml b/etc/config.xml index b6cc1be..3ce1b66 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -203,15 +203,9 @@ <%= checkedFacets.price ? config.format_money(checkedFacets.price[0] * 100) : config.format_money(priceRangeFacet.start * 100) %> - <% if (checkedFacets.price) { %> - - <%= checkedFacets.price ? config.format_money(checkedFacets.price[1] * 100) : config.format_money(priceRangeFacet.start * 100) %> - - <% } else { %> - - <%= config.format_money(priceRangeFacet.end * 100) %> - - <% } %> + + <%= checkedFacets.price ? config.format_money(checkedFacets.price[1] * 100) : config.format_money(priceRangeFacet.end * 100) %> + <% if (checkedFacets.price) { %>
active<% } %>\">\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\nactive<% } %>\">\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\n\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class="blm-product-search-details-container__price--strike-through"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class="blm-product-search-details-container__price--strike-through"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\nactive<% } %>\">\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\nactive<% } %>\">\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\n\n <% if (config.format_money) { %>\n <%= config.format_money(product.sale_price.toFixed(2) * 100) %> <%= config.format_money(product.price.toFixed(2) * 100) %>\n <% } else { %>\n <%= config.default_currency %><%= product.sale_price.toFixed(2) %> <%= config.default_currency %><%= product.price.toFixed(2) %>\n <% } %>\n
\n <% if (config.format_money) { %>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n <% } else { %>\n <%= config.default_currency %><%= product.price.toFixed(2) %>\n <% } %>\n
\n <% } %>\n\n <% if (config.format_money) { %>\n <%= config.format_money(product.sale_price.toFixed(2) * 100) %> <%= config.format_money(product.price.toFixed(2) * 100) %>\n <% } else { %>\n <%= config.default_currency %><%= product.sale_price.toFixed(2) %> <%= config.default_currency %><%= product.price.toFixed(2) %>\n <% } %>\n
\n <% if (config.format_money) { %>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n <% } else { %>\n <%= config.default_currency %><%= product.price.toFixed(2) %>\n <% } %>\n
\n <% } %>\nactive<% } %>\">\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class=\"blm-product-search-details-container__price--strike-through\"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\n\n <%\n const salePrice = variant.sku_sale_price !== undefined ? variant.sku_sale_price : product.sale_price;\n const price = variant.sku_price !== undefined ? variant.sku_price : product.price;\n %>\n <%= config.format_money((salePrice !== undefined ? salePrice : price).toFixed(2) * 100) %>\n <% if (salePrice !== undefined) { %>\n class="blm-product-search-details-container__price--strike-through"<% } %>>\n <%= config.format_money(price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% }); %>\n <% } else { %>\n\n <%= config.format_money((product.sale_price !== undefined ? product.sale_price : product.price).toFixed(2) * 100) %>\n <% if (product.sale_price !== undefined) { %>\n class="blm-product-search-details-container__price--strike-through"<% } %>>\n <%= config.format_money(product.price.toFixed(2) * 100) %>\n \n <% } %>\n
\n <% } %>\n\n