浏览代码

Merge branch 'develop'

master
Guillaume 4 年前
父节点
当前提交
882cf306df
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. +4
    -4
      ShopBundle/Services/PriceUtils.php

+ 4
- 4
ShopBundle/Services/PriceUtils.php 查看文件

@@ -217,14 +217,14 @@ class PriceUtils

if(isset($reductionCatalogValue) && isset($reductionCatalogUnit) && isset($reductionCatalogBehaviorTaxRate)) {
if ($reductionCatalogUnit == 'percent') {
return $this->applyReductionPercent(
$priceWithTax = $this->applyReductionPercent(
$priceWithTax,
$reductionCatalogValue
);
}
elseif ($reductionCatalogUnit == 'amount') {
if($reductionCatalogBehaviorTaxRate == 'tax-excluded') {
return $this->applyTax(
$priceWithTax = $this->applyTax(
$this->applyReductionAmount(
$price,
$reductionCatalogValue
@@ -233,7 +233,7 @@ class PriceUtils
);
}
elseif($reductionCatalogBehaviorTaxRate == 'tax-included') {
return $this->applyReductionAmount(
$priceWithTax = $this->applyReductionAmount(
$priceWithTax,
$reductionCatalogValue
);
@@ -241,7 +241,7 @@ class PriceUtils
}
}

return $priceWithTax ;
return $this->round($priceWithTax) ;
}

public function applyTax($price, $taxRateValue)

正在加载...
取消
保存