Merge branch 'master' of github.com:lukepolo/laracart

alnatour · Jan 27, 2018 · 91cbbdd · 91cbbdd
2 parents f20a873 + c15ed9c
commit 91cbbdd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/CartItem.php b/src/CartItem.php
@@ -291,6 +291,7 @@ public function addCoupon(CouponContract $coupon)
         $this->code = $coupon->code;
         $this->couponInfo = $coupon->options;
         $this->discount = $coupon->forItem($this);
+
         return $this;
     }
 

diff --git a/src/Coupons/Percentage.php b/src/Coupons/Percentage.php
@@ -45,8 +45,8 @@ public function __construct($code, $value, $options = [])
      */
     public function forItem(CartItem $item)
     {
-        if(config('laracart.tax_item_before_discount')) {
-            return $item->subTotal(false, false, false , true) * $this->value;
+        if (config('laracart.tax_item_before_discount')) {
+            return $item->subTotal(false, false, false, true) * $this->value;
         }
 
         return $item->price * $this->value;

diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -654,7 +654,7 @@ public function subTotal($format = true, $withDiscount = true)
             }
         }
 
-        if($total < 0) {
+        if ($total < 0) {
             $total = 0;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            if($total < 0) {
+            if ($total < 0) {
                 $total = 0;
             }
@@ Expand Down @@