Skip to content

Commit

Permalink
Merge pull request #35 from Datatrics/release/1.6.5
Browse files Browse the repository at this point in the history
Release/1.6.5
  • Loading branch information
Marvin-Magmodules authored Nov 14, 2022
2 parents 90f5bee + 8d8181b commit d114379
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Service/ProductData/AttributeCollector/Data/Price.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public function execute(
'sales_price' => $percent * $this->salesPrice,
'min_price' => $percent * $this->minPrice,
'max_price' => $percent * $this->maxPrice,
'special_price' => $percent * $this->specialPrice,
'total_price' => $percent * $this->totalPrice,
'sales_date_range' => $this->getSpecialPriceDateRang($product),
'discount_perc' => $this->getDiscountPercentage(),
Expand Down Expand Up @@ -357,8 +358,8 @@ private function setSimplePrices($product)
$this->price = $product->getData('price') !== (float)0 ? $product->getData('price') : null;
$this->finalPrice = $product->getData('final_price') !== (float)0
? $product->getData('final_price') : null;
$this->specialPrice = $product->getData('special_price') !== (float)0
? $product->getData('special_price') : null;
$this->specialPrice = $product->getData('special_price')
? $product->getData('special_price') : 0;
$this->minPrice = $product['min_price'] >= 0 ? $product['min_price'] : null;
$this->maxPrice = $product['max_price'] >= 0 ? $product['max_price'] : null;
}
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.6.4",
"version": "1.6.5",
"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.6.4</version>
<version>v1.6.5</version>
<enable>0</enable>
<source>Magento 2</source>
<debug>0</debug>
Expand Down

0 comments on commit d114379

Please sign in to comment.