Explorar el Código

Merge branch 'develop'

master
Guillaume hace 10 meses
padre
commit
692fc88889
Se han modificado 2 ficheros con 7 adiciones y 1 borrados
  1. +6
    -0
      common/logic/Product/Product/Service/ProductSolver.php
  2. +1
    -1
      producer/controllers/OrderController.php

+ 6
- 0
common/logic/Product/Product/Service/ProductSolver.php Ver fichero

@@ -117,6 +117,12 @@ class ProductSolver extends AbstractService implements SolverInterface
return $price;
}

public function getPriceUnitReferenceWithTax(Product $product)
{
$taxRateValue = $product->taxRate ? $product->taxRate->value : 0;
return Price::getPriceWithTax($this->getPriceUnitReference($product), $taxRateValue);
}

/**
* Retourne le prix du produit avec taxe
*/

+ 1
- 1
producer/controllers/OrderController.php Ver fichero

@@ -922,7 +922,7 @@ class OrderController extends ProducerBaseController
[
'unit_coefficient' => Product::$unitsArray[$product->unit]['coefficient'],
'prices' => $productModule->getPriceArray($product, $user, $pointSale),
'price_unit_ref' => $productModule->getSolver()->getPriceUnitReference($product),
'price_unit_ref' => $productModule->getSolver()->getPriceUnitReferenceWithTax($product),
'productDistribution' => $product['productDistribution'],
'productPointSale' => $product['productPointSale'],
]

Cargando…
Cancelar
Guardar