Merge pull request #211 from lukepolo/bug/dont-caulculate-discount-twice

Bug/dont caulculate discount twice
lukepolo · Oct 16, 2017 · 2552123 · 2552123
2 parents e9e0492 + 0922ed4
commit 2552123
Show file tree

Hide file tree

Showing 6 changed files with 185 additions and 170 deletions.
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
diff --git a/src/CartItem.php b/src/CartItem.php
@@ -284,7 +284,7 @@ public function getDiscount($format = true)
     public function tax($amountNotTaxable = 0)
     {
         if (!$this->taxable) {
-            $amountNotTaxable = $amountNotTaxable + ($this->price * $this->qty);
+            $amountNotTaxable = $this->price * $this->qty;
         }
 
         if (config('laracart.tax_by_item')) {

diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -575,7 +575,7 @@ public function taxTotal($format = true, $withFees = true)
                 } else {
                     $itemPrice = $item->subTotal(false);
                     if (($discounted + $itemPrice) > $totalDiscount) {
-                        $totalTax += config('laracart.discountTaxable', true) ? $item->tax($totalDiscount - $discounted) : $item->tax();
+                        $totalTax += config('laracart.discountTaxable', true) ? $item->tax() : $item->tax($totalDiscount - $discounted);
                     }
 
                     $discounted += $itemPrice;

diff --git a/src/config/laracart.php b/src/config/laracart.php
@@ -67,7 +67,7 @@
     |--------------------------------------------------------------------------
     |
     */
-    'discountTaxable' => true,
+    'discountTaxable' => false,
 
     /*
     |--------------------------------------------------------------------------

diff --git a/tests/CouponsTest.php b/tests/CouponsTest.php
@@ -207,9 +207,12 @@ public function testSetDiscountOnItem()
 
         $item = $this->addItem();
 
+        $this->app['config']->set('laracart.discountTaxable', true);
+
         $this->assertEquals('54.57', $this->laracart->total(false));
 
         $this->app['config']->set('laracart.discountTaxable', false);
+
         $this->assertEquals('55.27', $this->laracart->total(false));
 
         $this->laracart->removeCoupon('10OFF');
@@ -283,9 +286,9 @@ public function testCouponsTaxableItem()
 
         $this->app['config']->set('laracart.discountTaxable', false);
 
-        $this->assertEquals('0.07', $this->laracart->taxTotal(false));
+        $this->assertEquals('0.06', $this->laracart->taxTotal(false));
 
-        $this->assertEquals('0.87', $this->laracart->total(false));
+        $this->assertEquals('0.86', $this->laracart->total(false));
     }
 
     /**

diff --git a/tests/TotalsTest.php b/tests/TotalsTest.php
@@ -230,4 +230,16 @@ public function testTotalWithoutFees()
 
         $this->assertEquals('5.00', $this->laracart->total(false, true, false, false));
     }
+
+    public function testTaxTotalWithDiscounts()
+    {
+        $this->laracart->add(1, 'Test Product', 1, 100, ['tax' => 0.21]);
+
+        $coupon = new LukePOLO\LaraCart\Coupons\Percentage('test', 0.05, [
+            'name'        => '5% off',
+            'description' => '5% off test',
+        ]);
+
+        $this->laracart->addCoupon($coupon);
+    }
 }