total vat method implementation

return types fix
Sofiosko · Feb 18, 2019 · 3ca0724 · 3ca0724
1 parent 2f8425b
commit 3ca0724
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/Taxes/CalcLogic.php b/src/Taxes/CalcLogic.php
@@ -98,6 +98,10 @@ public function getTotalsWithoutVatFromPrices($prices)
         return $totals;
     }
 
+    public function getTotalVatFromPriceObject(Price $price){
+        return round($price->getTotalPriceWithVat() - $price->getTotalPriceWithoutVat(), 2);
+    }
+
     /**
      * Returns correctly rounded var coefficient
      *

diff --git a/src/Taxes/ICalcLogic.php b/src/Taxes/ICalcLogic.php
@@ -56,6 +56,14 @@ public function getTotalsWithVatFromPrices($prices);
      */
     public function getTotalsWithoutVatFromPrices($prices);
 
+    /**
+     * Method for calculating amout of vat
+     *
+     * @param Price $price
+     * @return mixed
+     */
+    public function getTotalVatFromPriceObject(Price $price);
+
     /**
      * Returns correctly rounded var coefficient
      *

diff --git a/src/Taxes/Price.php b/src/Taxes/Price.php
@@ -94,6 +94,10 @@ public function getTotalPriceWithoutVat()
         return $this->calcLogic->getTotalPriceWithoutVatFromPriceObject($this);
     }
 
+    public function getTotalVat(){
+        return $this->calcLogic->getTotalVatFromPriceObject($this);
+    }
+
     /**
      * @return float
      */

diff --git a/src/Taxes/PriceList.php b/src/Taxes/PriceList.php
@@ -44,7 +44,7 @@ public function addWithVat($priceWithVat, $quantity = 1.0, $vatPercent = null, $
         if (!isset($vatPercent))
             $vatPercent = $this->defaultVatPercent;
         $this->prices[] = $price = Price::createFromPriceWithVat($this->calcLogic, $vatPercent, $priceWithVat, $quantity);
-        if(isset($priceId))
+        if (isset($priceId))
             $this->pricesMap[$priceId] = $price;
         return $price;
     }
@@ -61,17 +61,18 @@ public function addWithoutVat($priceWithoutVat, $quantity = 1.0, $vatPercent = n
         if (!isset($vatPercent))
             $vatPercent = $this->defaultVatPercent;
         $this->prices[] = $price = Price::createFromPriceWithoutVat($this->calcLogic, $vatPercent, $priceWithoutVat, $quantity);
-        if(isset($priceId))
+        if (isset($priceId))
             $this->pricesMap[$priceId] = $price;
         return $price;
     }
 
     /**
      * @param $priceId
-     * @return mixed|null
+     * @return Price|null
      */
-    public function getPriceById($priceId){
-        if(isset($this->pricesMap[$priceId]))
+    public function getPriceById($priceId)
+    {
+        if (isset($this->pricesMap[$priceId]))
             return $this->pricesMap[$priceId];
         return null;
     }