Feature/multiple item discount (#266)

lukepolo · Apr 3, 2020 · 696de54 · 696de54
1 parent d6721f2
commit 696de54
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - 7.2
   - 7.3
-  - 7.4
 
 addons:
   code_climate:

diff --git a/src/CartItem.php b/src/CartItem.php
@@ -243,7 +243,7 @@ public function subTotal($format = true, $withDiscount = true, $taxedItemsOnly =
     public function netTotal($format = true)
     {
         return LaraCart::formatMoney(
-            ($this->price(false, false, true) * $this->qty) - $this->discount - $this->tax(false, true),
+            ($this->price(false, false, true) * $this->qty) - $this->getDiscount(false) - $this->tax(false, true),
             $this->locale,
             $this->internationalFormat,
             $format
@@ -291,8 +291,10 @@ public function getDiscount($format = true)
             $amount = $this->discount;
         }
 
+        $amount = $amount * $this->qty;
+
         if ($amount < 0) {
-            $amount = $this->price;
+            $amount = $this->price * $this->qty;
         }
 
         return LaraCart::formatMoney(

diff --git a/tests/TotalsTest.php b/tests/TotalsTest.php
@@ -606,4 +606,33 @@ public function testPreTaxationAndDiscountSubTotalOnItem()
 
         $this->assertEquals(1, $item->subTotal(false, true, false, true));
     }
+
+    public function testDiscountsOnMultiQtyItems()
+    {
+        $this->laracart->emptyCart();
+        $this->laracart->destroyCart();
+
+        $item = $this->laracart->add(123, 'T-Shirt', 2, 100, ['tax' => .2], true);
+
+        $coupon = new \LukePOLO\LaraCart\Coupons\Percentage('10%OFF', 0.10);
+        $this->laracart->addCoupon($coupon);
+        $coupon->setDiscountOnItem($item);
+
+        $resume = [
+            'subTotal'             => $this->laracart->subTotal(true, false),
+            'totalDiscount'        => $this->laracart->totalDiscount(true),
+            'subTotalWithDiscount' => $this->laracart->subTotal(true, true),
+            'taxTotal'             => $this->laracart->taxTotal(true),
+            'netTotal'             => $this->laracart->netTotal(true),
+            'feeTotals'            => $this->laracart->feeTotals(true, true),
+            'total'                => $this->laracart->total(true, true),
+        ];
+
+        $this->assertEquals($item->getDiscount(false), 20);
+        $this->assertEquals($this->laracart->subTotal(false, false), 200);
+
+        $this->assertEquals($this->laracart->netTotal(false), 184);
+        $this->assertEquals($this->laracart->taxTotal(false, false), 36);
+        $this->assertEquals($this->laracart->total(false, false), 216);
+    }
 }