Skip to content

Commit

Permalink
Merge pull request #15 from Datatrics/1.3.3
Browse files Browse the repository at this point in the history
1.3.3
  • Loading branch information
Marvin-Magmodules authored Apr 23, 2021
2 parents ad8ade7 + 9b67521 commit 2434a96
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Plugin/CustomerGridCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
4 changes: 2 additions & 2 deletions Plugin/Quote.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
2 changes: 1 addition & 1 deletion etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<default>
<datatrics_connect_general>
<general>
<version>v1.3.2</version>
<version>v1.3.3</version>
<enable>0</enable>
<source>Magento 2</source>
<debug>0</debug>
Expand Down

0 comments on commit 2434a96

Please sign in to comment.