From 3ea6b395ac35344b1449f29dd48a2b2ab90cb26e Mon Sep 17 00:00:00 2001 From: Jan Myszkier Date: Fri, 29 Nov 2019 18:37:39 +0100 Subject: [PATCH 1/4] Update Review.php support table prefixes when reading review entities --- src/module-vsbridge-indexer-review/ResourceModel/Review.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/module-vsbridge-indexer-review/ResourceModel/Review.php b/src/module-vsbridge-indexer-review/ResourceModel/Review.php index f36bb9dc..c0a0ccac 100644 --- a/src/module-vsbridge-indexer-review/ResourceModel/Review.php +++ b/src/module-vsbridge-indexer-review/ResourceModel/Review.php @@ -110,7 +110,7 @@ public function getEntityId(): int if (null === $this->entityId) { $connection = $this->getConnection(); $select = $connection->select() - ->from('review_entity', ['entity_id']) + ->from($this->resource->getTableName('review_entity'), ['entity_id']) ->where('entity_code = :entity_code'); $entityId = $connection->fetchOne( From 9abbf286b7b2493dab10a26b61e29c36fe910753 Mon Sep 17 00:00:00 2001 From: Agata Firlejczyk Date: Wed, 18 Dec 2019 17:20:17 +0100 Subject: [PATCH 2/4] Fix setting final price for configurable products. --- .../Model/Indexer/DataProvider/Product/ConfigurableData.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php b/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php index 72c73b0f..5b843c98 100644 --- a/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php +++ b/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php @@ -257,13 +257,15 @@ private function prepareConfigurableProduct(array $productDTO) if (!empty($childPrice)) { $finalPrice = min($finalPrice); - $productDTO['final_price'] = - isset($productDTO['final_price']) ? min($finalPrice, $productDTO['final_price']) : $finalPrice; if (!$hasPrice) { $minPrice = min($childPrice); $productDTO['price'] = $minPrice; $productDTO['regular_price'] = $minPrice; + $productDTO['final_price'] = $finalPrice; + } else { + $productDTO['final_price'] = + isset($productDTO['final_price']) ? min($finalPrice, $productDTO['final_price']) : $finalPrice; } } From 640a8f9c5d2a2def97e5dca696a2ebe6c2787436 Mon Sep 17 00:00:00 2001 From: Agata Firlejczyk Date: Wed, 18 Dec 2019 19:08:19 +0100 Subject: [PATCH 3/4] Fix setting final price for configurable products. --- .../Model/Indexer/DataProvider/Product/ConfigurableData.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php b/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php index 5b843c98..ceeeb6e4 100644 --- a/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php +++ b/src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php @@ -264,8 +264,7 @@ private function prepareConfigurableProduct(array $productDTO) $productDTO['regular_price'] = $minPrice; $productDTO['final_price'] = $finalPrice; } else { - $productDTO['final_price'] = - isset($productDTO['final_price']) ? min($finalPrice, $productDTO['final_price']) : $finalPrice; + $productDTO['final_price'] = min($finalPrice, $productDTO['final_price']); } } From 63211230a1f95b8c4ba97f778c275a70813da19e Mon Sep 17 00:00:00 2001 From: Agata Firlejczyk Date: Thu, 19 Dec 2019 17:41:09 +0100 Subject: [PATCH 4/4] New release 1.8.3 --- CHANGELOG.MD | 12 ++++++++++++ composer.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index a9414e09..e7b3e80b 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,18 @@ ## Unreleased + +## [1.8.3] (2019.12.19) + +### Fixes +- support table prefix with review_entity +- fix exporting final_price and price for configurable products when `final_price` equals `0` + +## [1.8.2] (2019.11.29) + +### Fixes +- fix notice undefined final_price + ## [1.8.1] (2019.11.28) ### Fixes diff --git a/composer.json b/composer.json index 2d563441..140b046a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "name": "Agata", "email": "afirlejczyk@divante.pl" }], - "version": "1.8.2", + "version": "1.8.3", "keywords": [ "magento", "magento2",