From 9ada3f3beffef691ae9293b5559e43a5ea3d225f Mon Sep 17 00:00:00 2001 From: Marvin-Magmodules Date: Fri, 23 Apr 2021 15:31:08 +0200 Subject: [PATCH 1/3] Customer grid filter fix --- Plugin/CustomerGridCollection.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plugin/CustomerGridCollection.php b/Plugin/CustomerGridCollection.php index c7503a5..db8862d 100755 --- a/Plugin/CustomerGridCollection.php +++ b/Plugin/CustomerGridCollection.php @@ -31,7 +31,11 @@ public function afterSearch($intercepter, $collection) ['status'] ); $where = $collection->getSelect()->getPart(\Magento\Framework\DB\Select::WHERE); - + foreach ($where as &$item) { + if (strpos($item, 'status') !== false) { + $item = substr_replace($item, "`main_table`.", strpos($item, '`'), 0); + } + } $collection->getSelect()->setPart(\Magento\Framework\DB\Select::WHERE, $where); $collection->addFilterToMap('status', 'datatrics_profile.status'); } From a5132ea7ef67a90f204856d4874d69f7a305bc6d Mon Sep 17 00:00:00 2001 From: Marvin-Magmodules Date: Fri, 23 Apr 2021 15:33:17 +0200 Subject: [PATCH 2/3] Fixed quote plugin --- Plugin/Quote.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugin/Quote.php b/Plugin/Quote.php index 5c7d311..cc65b51 100755 --- a/Plugin/Quote.php +++ b/Plugin/Quote.php @@ -58,14 +58,14 @@ public function afterRemoveItem( * Fire event after item was added to the cart (only after post request) * * @param QuoteModel $subject - * @param Item $result + * @param mixed $result * @param Product $product * * @return Item */ public function afterAddProduct( QuoteModel $subject, - Item $result, + $result, Product $product ) { $this->checkoutSession->create()->setCartTrigger(true); From 9b6752118016f6d77ad1d58d18f86725842ac98a Mon Sep 17 00:00:00 2001 From: Marvin-Magmodules Date: Fri, 23 Apr 2021 15:33:42 +0200 Subject: [PATCH 3/3] Version bump --- composer.json | 2 +- etc/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bcacc6c..e0a7be2 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "datatrics/magento2-integration", "description": "Datatrics Connect extension for Magento 2", "type": "magento2-module", - "version": "1.3.2", + "version": "1.3.3", "license": [ "BSD-2-Clause" ], diff --git a/etc/config.xml b/etc/config.xml index 755bcb5..85c1e56 100755 --- a/etc/config.xml +++ b/etc/config.xml @@ -10,7 +10,7 @@ - v1.3.2 + v1.3.3 0 Magento 2 0