Minor bugfixes and improvements

trustpilot · May 13, 2022 · 4af52e0 · 4af52e0
1 parent 503d04e
commit 4af52e0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Block/Success.php b/Block/Success.php
@@ -29,7 +29,7 @@ public function __construct(
         Data $helper,
         OrderData $orderData,
         TrustpilotLog $trustpilotLog,
-        array $data = [],
+        array $data,
         TrustpilotPluginStatus $pluginStatus)
     {
         $this->_salesFactory = $salesOrderFactory;

diff --git a/Block/Trustbox.php b/Block/Trustbox.php
@@ -134,7 +134,7 @@ public function loadCategoryProductInfo($scope, $storeId, $category = null) {
                 $block = $this->getLayout()->getBlock('category.products.list');
                 $products = $block->getLoadedProductCollection();
             } else {
-                $products = $cat->getProductCollection();
+                $products = $category->getProductCollection();
             }
             return $this->_helper->loadCategoryProductInfo($products, $scope, $storeId);
         } catch(\Throwable $e) {

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -130,10 +130,10 @@ private function getDefaultConfigValues($key)
 
     public function getWebsiteOrStoreId()
     {
-        if (strlen($this->_request->getParam('store'))) {
+        if ($this->_request->getParam('store') !== null && strlen($this->_request->getParam('store'))) {
             return (int) $this->_request->getParam('store', 0);
         }
-        if (strlen($this->_request->getParam('website'))) {
+        if ($this->_request->getParam('website') !== null && strlen($this->_request->getParam('website'))) {
             return (int) $this->_request->getParam('website', 0);
         }
         if ($this->isAdminPage() && $this->_storeManager->getStore()->getWebsiteId()) {
@@ -148,11 +148,11 @@ public function getWebsiteOrStoreId()
     public function getScope()
     {
         // user is on the admin store level
-        if (strlen($this->_request->getParam('store'))) {
+        if ($this->_request->getParam('store') !== null && strlen($this->_request->getParam('store'))) {
             return StoreScopeInterface::SCOPE_STORES;
         }
         // user is on the admin website level
-        if (strlen($this->_request->getParam('website'))) {
+        if ($this->_request->getParam('website') !== null && strlen($this->_request->getParam('website'))) {
             return StoreScopeInterface::SCOPE_WEBSITES;
         }
         // is user is on admin page, try to automatically detect his website scope

diff --git a/Model/Config.php b/Model/Config.php
@@ -16,7 +16,7 @@ class Config
     const TRUSTPILOT_GENERAL_CONFIGURATION      = 'general';
     const TRUSTPILOT_TRUSTBOX_CONFIGURATION     = 'trustbox';
     const TRUSTPILOT_INTEGRATION_KEY            = 'key';
-    const TRUSTPILOT_PLUGIN_VERSION             = '2.6.566';
+    const TRUSTPILOT_PLUGIN_VERSION             = '2.6.572';
     const TRUSTPILOT_SCRIPT                     = 'TrustpilotScriptUrl';
     const TRUSTPILOT_INTEGRATION_APP            = 'IntegrationAppUrl';
     const TRUSTPILOT_WIDGET_SCRIPT              = 'WidgetScriptUrl';

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "trustpilot/module-reviews",
     "description": "The Trustpilot Review extension makes it simple and easy for merchants to collect reviews from their customers to power their marketing efforts, increase sales conversion, build their online reputation and draw business insights.",
     "type": "magento2-module",
-    "version": "2.6.566",
+    "version": "2.6.572",
     "license": [
       "OSL-3.0"
     ],