Merge pull request #13 from Dropelikeit/tax_fix

Fix tax calculation bug
Dropelikeit · Nov 3, 2018 · 6c2d0fe · 6c2d0fe
2 parents 61fbf0a + 64d5c8c
commit 6c2d0fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/PriceCalculator.php b/src/PriceCalculator.php
@@ -6,9 +6,7 @@
 use MarcelStrahl\PriceCalculator\Helpers\Types\VatInterface;
 
 /**
- * Class PriceCalculator
  * @author Marcel Strahl <[email protected]>
- * @package Src
  */
 class PriceCalculator implements PriceCalculatorInterface
 {
@@ -18,7 +16,7 @@ class PriceCalculator implements PriceCalculatorInterface
     private $vat;
 
     /**
-     * @param $vat
+     * @param VatInterface $vat
      */
     public function __construct(VatInterface $vat)
     {
@@ -70,7 +68,8 @@ public function mulPrice(float $amount, float $price): float
      */
     public function calculatePriceWithSalesTax(float $netPrice): float
     {
-        return (float)round((float)bcmul($netPrice, $this->vat->getVatToCalculate(), 2));
+        $vat = (float)round((float)bcmul($netPrice, bcdiv($this->vat->getVat(), 100, 2), 4), 2);
+        return (float)bcadd($netPrice, $vat, 2);
     }
 
     /**

diff --git a/tests/PriceCalculatorTest.php b/tests/PriceCalculatorTest.php
@@ -10,9 +10,7 @@
 use MarcelStrahl\PriceCalculator\PriceCalculator;
 
 /**
- * Class PriceCalculatorTest
  * @author Marcel Strahl <[email protected]>
- * @package Tests
  */
 class PriceCalculatorTest extends TestCase
 {
@@ -184,16 +182,19 @@ public function dataProviderPriceWithSalesTax(): array
     {
         return [
             [
-                252, 300
+                31.51, 37.50
             ],
             [
-                340, 405
+                252, 299.88
+            ],
+            [
+                340, 404.60
             ],
             [
                 200, 238
             ],
             [
-                13, 15
+                13, 15.47
             ],
             [
                 64000, 76160