Getting the correct discount

lukepolo · Nov 6, 2015 · 04c1454 · 04c1454
1 parent 6082de5
commit 04c1454
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Cart.php b/src/Cart.php
@@ -20,7 +20,7 @@ class Cart
     public $internationalFormat;
     protected $instance;
 
-    function __construct($instance)
+    public function __construct($instance)
     {
         $this->instance = $instance;
         $this->tax = config('laracart.tax');

diff --git a/src/CartItem.php b/src/CartItem.php
@@ -294,10 +294,16 @@ public function subItemsTotal($tax = false, $format = true)
      */
     public function getDiscount($format = true)
     {
+        if(\LaraCart::findCoupon($this->code)) {
+            $discount = $this->discount;
+        } else {
+            $discount = 0;
+        }
+
         if($format) {
-            return \LaraCart::formatMoney($this->discount, $this->locale, $this->internationalFormat);
+            return \LaraCart::formatMoney($discount, $this->locale, $this->internationalFormat);
         } else {
-            return $this->discount;
+            return $discount;
         }
 
     }