Merge pull request #78 from lukepolo/coupon_taxation

Coupon taxation
lukepolo · Feb 10, 2016 · 10316f5 · 10316f5
2 parents 448de3e + df73033
commit 10316f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -448,6 +448,12 @@ public function taxTotal($format = true)
             }
         }
 
+        foreach ($this->getFees() as $fee) {
+            if ($fee->taxable) {
+                $totalTax += $fee->amount * $this->cart->tax;
+            }
+        }
+
         return $this->formatMoney($totalTax, null, null, $format);
     }
 
@@ -556,9 +562,6 @@ public function feeTotals($format = true)
 
         foreach ($this->getFees() as $fee) {
             $feeTotal += $fee->amount;
-            if ($fee->taxable) {
-                $feeTotal += $fee->amount * $this->cart->tax;
-            }
         }
 
         return $this->formatMoney($feeTotal, null, null, $format);

diff --git a/tests/TotalsTest.php b/tests/TotalsTest.php
@@ -83,8 +83,11 @@ public function testTaxableFees()
     {
         $this->laracart->addFee('test_2', 1, true);
 
-        $this->assertEquals('$1.07', $this->laracart->feeTotals());
-        $this->assertEquals('1.07', $this->laracart->feeTotals(false));
+        $this->assertEquals('$1.00', $this->laracart->feeTotals());
+        $this->assertEquals(1, $this->laracart->feeTotals(false));
+
+        $this->assertEquals("$0.07", $this->laracart->taxTotal());
+        $this->assertEquals("0.07", $this->laracart->taxTotal(false));
     }
 
     /**