math dependency

composer.json

@@ -19,6 +19,7 @@
  {
  "doctrine/orm": "^2.17",
  "doctrine/doctrine-bundle": "^2.11",
- "twig/twig": "^3.10"
+ "twig/twig": "^3.10",
+ "psys/utils": "^1.0"
  }
 }

src/Model/OrderManager/OrderManager.php

@@ -6,6 +6,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Psys\OrderInvoiceManagerBundle\Entity\Product;
+use Psys\Utils\Math;
 use Symfony\Component\Filesystem\Filesystem;
 
 
@@ -16,6 +17,7 @@ public function __construct
  private EntityManagerInterface $entityManager,
  private LoggerInterface $vLogger,
  private Filesystem $filesystem,
+ private Math $math,
  private $projectDir,
  )
  {} 
@@ -111,14 +113,14 @@ private function calculateProductTotals (Product $product) : array
  // Calculate price exclusive of VAT from price inclusive of VAT
  if (!empty($priceVatIncluded)) 
  { 
- $priceVatExcludedRes = $this->subtractPercentage ($priceVatIncluded, $product->getVatRate());
+ $priceVatExcludedRes = $this->math->subtractPercentage($priceVatIncluded, $product->getVatRate());
  $product->setPriceVatExcluded($priceVatExcludedRes);
  }
 
  // Calculate price inclusive of VAT from price exclusive of VAT
  else if (!empty($priceVatExcluded)) 
  {
- $priceVatIncluded = ($priceVatExcluded * (100 + $product->getVatRate())) / 100;
+ $priceVatIncluded = $this->math->addPercentage($priceVatExcluded, $product->getVatRate());
  $product->setPriceVatIncluded($priceVatIncluded);
  }
 
@@ -130,11 +132,6 @@ private function calculateProductTotals (Product $product) : array
  'priceVatExcluded' => $priceVatExcluded,
  ];
  }
-
- private function subtractPercentage ($number, $percentage)
- {
- return $number / ('1.'.$percentage);
- }
 }
 
 ?>