Merge pull request #178 from DivanteLtd/develop

Merge develop branch
vuestorefront · Dec 20, 2019 · c171485 · c171485
2 parents 2fb27c2 + ef56556
commit c171485
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git 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
@@ -6,7 +6,7 @@
     "name": "Agata",
     "email": "[email protected]"
   }],
-  "version": "1.8.2",
+  "version": "1.8.3",
   "keywords": [
     "magento",
     "magento2",

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
@@ -257,13 +257,14 @@ 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'] = min($finalPrice, $productDTO['final_price']);
             }
         }
 

diff --git 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(