wip

Author: iamgergo

src/Interfaces/Checkoutable.php

@@ -133,4 +133,14 @@ public function removeCoupon(string|Coupon $coupon): void;
      * Get the applicable discount rules.
      */
     public function getApplicableDiscountRules(): Collection;
+
+    /**
+     * Get the discount total.
+     */
+    public function getDiscountTotal(): float;
+
+    /**
+     * Get the formatted discount total.
+     */
+    public function getFormattedDiscountTotal(): string;
 }

src/Models/Cart.php

@@ -209,6 +209,7 @@ public function toOrder(): Order
                     $this->order->applyCoupon($coupon);
                 });
 
+                $this->order->calculateDiscount();
                 $this->order->calculateTax();
             });
         } catch (Throwable $exception) {

src/Models/Item.php

@@ -246,7 +246,7 @@ public function getFormattedGrossPrice(): string
      */
     public function getTotal(): float
     {
-        return $this->getGrossPrice() * $this->getQuantity();
+        return ($this->getGrossPrice() * $this->getQuantity()) - $this->getDiscount();
     }
 
     /**

src/Models/Shipping.php

@@ -248,7 +248,7 @@ public function getFormattedGrossPrice(): string
      */
     public function getTotal(): float
     {
-        return $this->getGrossPrice() * $this->getQuantity();
+        return ($this->getGrossPrice() * $this->getQuantity()) - $this->getDiscount();
     }
 
     /**

src/Traits/AsOrder.php

@@ -449,6 +449,16 @@ public function getDiscount(): float
     {
         $value = $this->__getDiscount();
         $value += $this->coupons->sum('coupon.value');
+
+        return $value;
+    }
+
+    /**
+     * Get the discount total.
+     */
+    public function getDiscountTotal(): float
+    {
+        $value = $this->getDiscount();
         $value += ($this->needsShipping() ? $this->shipping->getDiscount() : 0);
         $value += $this->items->sum(static function (Item $item): float {
             return $item->getDiscount();
@@ -457,6 +467,14 @@ public function getDiscount(): float
         return $value;
     }
 
+    /**
+     * Get the formatted discount total.
+     */
+    public function getFormattedDiscountTotal(): string
+    {
+        return $this->getCurrency()->format($this->getDiscountTotal());
+    }
+
     /**
      * Get the discountable currency.
      */