Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit c171485

Browse files
authored
Merge pull request #178 from DivanteLtd/develop
Merge develop branch
2 parents 2fb27c2 + ef56556 commit c171485

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

CHANGELOG.MD

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
## Unreleased
44

5+
6+
## [1.8.3] (2019.12.19)
7+
8+
### Fixes
9+
- support table prefix with review_entity
10+
- fix exporting final_price and price for configurable products when `final_price` equals `0`
11+
12+
## [1.8.2] (2019.11.29)
13+
14+
### Fixes
15+
- fix notice undefined final_price
16+
517
## [1.8.1] (2019.11.28)
618

719
### Fixes

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"name": "Agata",
77
"email": "[email protected]"
88
}],
9-
"version": "1.8.2",
9+
"version": "1.8.3",
1010
"keywords": [
1111
"magento",
1212
"magento2",

src/module-vsbridge-indexer-catalog/Model/Indexer/DataProvider/Product/ConfigurableData.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,14 @@ private function prepareConfigurableProduct(array $productDTO)
257257

258258
if (!empty($childPrice)) {
259259
$finalPrice = min($finalPrice);
260-
$productDTO['final_price'] =
261-
isset($productDTO['final_price']) ? min($finalPrice, $productDTO['final_price']) : $finalPrice;
262260

263261
if (!$hasPrice) {
264262
$minPrice = min($childPrice);
265263
$productDTO['price'] = $minPrice;
266264
$productDTO['regular_price'] = $minPrice;
265+
$productDTO['final_price'] = $finalPrice;
266+
} else {
267+
$productDTO['final_price'] = min($finalPrice, $productDTO['final_price']);
267268
}
268269
}
269270

src/module-vsbridge-indexer-review/ResourceModel/Review.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function getEntityId(): int
110110
if (null === $this->entityId) {
111111
$connection = $this->getConnection();
112112
$select = $connection->select()
113-
->from('review_entity', ['entity_id'])
113+
->from($this->resource->getTableName('review_entity'), ['entity_id'])
114114
->where('entity_code = :entity_code');
115115

116116
$entityId = $connection->fetchOne(

0 commit comments

Comments
 (0)