wip

Author: iamgergo

src/Interfaces/Discountable.php

@@ -4,6 +4,7 @@
 
 namespace Cone\Bazar\Interfaces;
 
+use Cone\Bazar\Enums\Currency;
 use Cone\Bazar\Models\DiscountRule;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Support\Collection;
@@ -64,4 +65,9 @@ public function getDiscountableQuantity(): float;
      * Get the applicable discount rules.
      */
     public function getApplicableDiscountRules(): Collection;
+
+    /**
+     * Get the discountable currency.
+     */
+    public function getDiscountableCurrency(): Currency;
 }

src/Models/Item.php

@@ -5,6 +5,7 @@
 namespace Cone\Bazar\Models;
 
 use Cone\Bazar\Database\Factories\ItemFactory;
+use Cone\Bazar\Enums\Currency;
 use Cone\Bazar\Interfaces\Buyable;
 use Cone\Bazar\Interfaces\Models\Item as Contract;
 use Cone\Bazar\Traits\InteractsWithDiscounts;
@@ -350,10 +351,10 @@ public function getApplicableDiscountRules(): Collection
     }
 
     /**
-     * Get the formatted discount.
+     * Get the discountable currency.
      */
-    public function getFormattedDiscount(): string
+    public function getDiscountableCurrency(): Currency
     {
-        return $this->checkoutable->getCurrency()->format($this->getDiscount());
+        return $this->checkoutable->getCurrency();
     }
 }

src/Models/Shipping.php

@@ -5,6 +5,7 @@
 namespace Cone\Bazar\Models;
 
 use Cone\Bazar\Database\Factories\ShippingFactory;
+use Cone\Bazar\Enums\Currency;
 use Cone\Bazar\Interfaces\Models\Shipping as Contract;
 use Cone\Bazar\Support\Facades\Shipping as Manager;
 use Cone\Bazar\Traits\Addressable;
@@ -350,11 +351,11 @@ public function getDiscountableQuantity(): float
     }
 
     /**
-     * Get the formatted discount.
+     * Get the discountable currency.
      */
-    public function getFormattedDiscount(): string
+    public function getDiscountableCurrency(): Currency
     {
-        return $this->shippable->getCurrency()->format($this->getDiscount());
+        return $this->shippable->getCurrency();
     }
 
     /**

src/Traits/AsOrder.php

@@ -29,7 +29,6 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Number;
 use Throwable;
 
 trait AsOrder
@@ -342,7 +341,6 @@ public function calculateTax(): float
      */
     public function findItem(array $attributes): ?Item
     {
-
         $attributes = array_merge(['properties' => null], $attributes, [
             'checkoutable_id' => $this->getKey(),
             'checkoutable_type' => static::class,
@@ -459,19 +457,11 @@ public function getDiscount(): float
     }
 
     /**
-     * Get the formatted discount.
-     */
-    public function getFormattedDiscount(): string
-    {
-        return $this->getCurrency()->format($this->getDiscount());
-    }
-
-    /**
-     * Get the formatted discount rate.
+     * Get the discountable currency.
      */
-    public function getFormattedDiscountRate(): string
+    public function getDiscountableCurrency(): Currency
     {
-        return Number::percentage($this->getDiscountRate());
+        return $this->getCurrency();
     }
 
     /**

src/Traits/InteractsWithDiscounts.php

@@ -110,4 +110,12 @@ public function calculateDiscount(): float
 
         return $this->getDiscount();
     }
+
+    /**
+     * Get the formatted discount.
+     */
+    public function getFormattedDiscount(): string
+    {
+        return $this->getDiscountableCurrency()->format($this->getDiscount());
+    }
 }