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

Bug/dont caulculate discount twice
lukepolo · Oct 17, 2017 · def1f17 · def1f17
2 parents 2552123 + ca91ca0
commit def1f17
Show file tree

Hide file tree

Showing 7 changed files with 664 additions and 624 deletions.
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
diff --git a/src/CartItem.php b/src/CartItem.php
@@ -298,7 +298,7 @@ public function tax($amountNotTaxable = 0)
             return $totalTax - $amountNotTaxable;
         }
 
-        return $this->tax * ($this->subTotal(false, config('laracart.discountTaxable', true), true) - $amountNotTaxable);
+        return $this->tax * ($this->subTotal(false, !config('laracart.discountTaxable', false), true) - $amountNotTaxable);
     }
 
     /**

diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -569,13 +569,17 @@ public function taxTotal($format = true, $withFees = true)
         $totalDiscount = $this->totalDiscount(false, false);
 
         if ($this->count() != 0) {
+            /**
+             * @var 
+             * @var CartItem $item
+             */
             foreach ($this->getItems() as $index => $item) {
                 if ($discounted >= $totalDiscount) {
                     $totalTax += $item->tax();
                 } else {
-                    $itemPrice = $item->subTotal(false);
+                    $itemPrice = $item->subTotal(false, config('laracart.discountTaxable', false));
                     if (($discounted + $itemPrice) > $totalDiscount) {
-                        $totalTax += config('laracart.discountTaxable', true) ? $item->tax() : $item->tax($totalDiscount - $discounted);
+                        $totalTax += config('laracart.discountTaxable', false) ? $item->tax() : $item->tax($totalDiscount - $discounted);
                     }
 
                     $discounted += $itemPrice;

diff --git a/src/Traits/CouponTrait.php b/src/Traits/CouponTrait.php
@@ -157,14 +157,18 @@ public function checkValidTimes(Carbon $startDate, Carbon $endDate, $throwErrors
      * Sets a discount to an item with what code was used and the discount amount.
      *
      * @param CartItem $item
+     * @param $discountAmount
      *
      * @throws InvalidPrice
      */
-    public function setDiscountOnItem(CartItem $item)
+    public function setDiscountOnItem(CartItem $item, $discountAmount)
     {
+        if (!is_numeric($discountAmount)) {
+            throw new InvalidPrice('You must use a discount amount.');
+        }
         $this->appliedToCart = false;
         $item->code = $this->code;
-        $item->discount = $this->discount();
+        $item->discount = $discountAmount;
         $item->couponInfo = $this->options;
     }
 }
diff --git a/src/config/laracart.php b/src/config/laracart.php
@@ -85,17 +85,6 @@
     */
     'multiple_coupons' => false,
 
-    /*
-    |
-    |                     **** DEPRECATED IN 1.3 ****
-    |
-    |--------------------------------------------------------------------------
-    | Applied message when using getMessage on a coupon
-    |--------------------------------------------------------------------------
-    |
-    */
-    'coupon_applied_message' => 'Coupon Applied',
-
     /*
     |--------------------------------------------------------------------------
     | The default item model for your relations

diff --git a/tests/CouponsTest.php b/tests/CouponsTest.php
@@ -191,33 +191,33 @@ public function testCheckValidTimes()
      */
     public function testSetDiscountOnItem()
     {
-        $item = $this->addItem(2, 30);
+        $item = $this->addItem(1, 100);
 
         $fixedCoupon = new LukePOLO\LaraCart\Coupons\Fixed('10OFF', 10);
 
         $this->laracart->addCoupon($fixedCoupon);
 
         $coupon = $this->laracart->findCoupon('10OFF');
 
-        $this->assertEquals('53.50', $this->laracart->total(false));
+        $this->assertEquals(90 * 1.07, $this->laracart->total(false));
 
         $coupon->setDiscountOnItem($item, 10.00);
 
         $this->assertEquals('10OFF', $item->code);
 
-        $item = $this->addItem();
+        $this->assertEquals(90 * 1.07, $this->laracart->total(false));
 
         $this->app['config']->set('laracart.discountTaxable', true);
 
-        $this->assertEquals('54.57', $this->laracart->total(false));
+        $this->assertEquals(90 + (100 * .07), $this->laracart->total(false));
 
         $this->app['config']->set('laracart.discountTaxable', false);
 
-        $this->assertEquals('55.27', $this->laracart->total(false));
+        $this->assertEquals(90 * 1.07, $this->laracart->total(false));
 
         $this->laracart->removeCoupon('10OFF');
 
-        $this->assertEquals('65.27', $this->laracart->total(false));
+        $this->assertEquals(107, $this->laracart->total(false));
 
         $this->assertNull($item->code);
         $this->assertEquals(0, $item->discount);
@@ -237,7 +237,7 @@ public function testDiscountTotals()
 
         $coupon = $this->laracart->findCoupon('10OFF');
 
-        $coupon->setDiscountOnItem($item);
+        $coupon->setDiscountOnItem($item, 10.00);
 
         $this->assertEquals('10OFF', $item->code);
 
@@ -261,7 +261,7 @@ public function testCouponsNotTaxableItem()
         $this->assertEquals('20%', $percentCoupon->displayValue());
         $this->assertEquals('0.20', $percentCoupon->discount());
 
-        $this->app['config']->set('laracart.discountTaxable', false);
+        $this->app['config']->set('laracart.discountTaxable', true);
 
         $this->assertEquals(0, $this->laracart->taxTotal(false));
 
@@ -284,11 +284,11 @@ public function testCouponsTaxableItem()
         $this->assertEquals('20%', $percentCoupon->displayValue());
         $this->assertEquals('0.20', $percentCoupon->discount());
 
-        $this->app['config']->set('laracart.discountTaxable', false);
+        $this->app['config']->set('laracart.discountTaxable', true);
 
-        $this->assertEquals('0.06', $this->laracart->taxTotal(false));
+        $this->assertEquals('0.07', $this->laracart->taxTotal(false));
 
-        $this->assertEquals('0.86', $this->laracart->total(false));
+        $this->assertEquals('0.87', $this->laracart->total(false));
     }
 
     /**

diff --git a/tests/TotalsTest.php b/tests/TotalsTest.php
@@ -242,4 +242,22 @@ public function testTaxTotalWithDiscounts()
 
         $this->laracart->addCoupon($coupon);
     }
+
+    public function testDoubleDiscounts()
+    {
+        $item = $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);
+        $coupon->setDiscountOnItem($item, $item->price(false) * $coupon->value);
+
+        $this->assertEquals(95, $this->laracart->subTotal(false));
+        $this->assertEquals(5, $this->laracart->totalDiscount(false));
+        $this->assertEquals(19.95, $this->laracart->taxTotal(false));
+        $this->assertEquals(114.95, $this->laracart->total(false));
+    }
 }