use default number currency

.github/workflows/back-end.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-22.04"]
-        php: ["8.1", "8.2"]
+        php: ["8.2", "8.3"]
         laravel: ["^10.0"]
         dependency-version: ["highest"]
 
@@ -51,7 +51,7 @@ jobs:
         run: composer exec -- phpunit
 
       - name: Send coverage to Coveralls
-        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.php == '8.1' && matrix.laravel == '^10.0' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.php == '8.2' && matrix.laravel == '^10.0' }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |

composer.json

@@ -22,16 +22,16 @@
         }
     },
     "require": {
-        "php": "^8.1 || ^8.2",
+        "php": "^8.2 || ^8.3",
         "conedevelopment/root": "@dev"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/laravel": "^10.0",
         "mockery/mockery": "^1.4.4",
         "phpunit/phpunit": "^10.0",
-        "nunomaduro/larastan": "^2.1.6",
-        "laravel/pint": "^1.6"
+        "laravel/pint": "^1.6",
+        "larastan/larastan": "^2.8"
     },
     "extra": {
         "laravel": {

resources/views/emails/customer-new-order.blade.php

@@ -15,7 +15,7 @@
 @foreach ($order->items as $item)
 | {{ $item->name }} | {{ $item->quantity }} | {{ $item->formattedTax }} | {{ $item->formattedPrice }} |
 @endforeach
-| **Subtotal** ||| {{ Str::currency($order->items->sum('total'), $order->currency) }} |
+| **Subtotal** ||| {{ $order->formattedSubtotal }} |
 @endcomponent
 
 **Discount**: {{ $order->formattedDiscount }}

src/BazarServiceProvider.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 
 class BazarServiceProvider extends ServiceProvider
 {
@@ -58,7 +57,6 @@ public function boot(): void
         }
 
         $this->registerEvents();
-        $this->registerMacros();
         $this->registerViews();
     }
 
@@ -99,18 +97,6 @@ protected function registerCommands(): void
         ]);
     }
 
-    /**
-     * Register macros.
-     */
-    protected function registerMacros(): void
-    {
-        Str::macro('currency', static function (int|float $value, string $currency = null): string {
-            return sprintf(
-                '%s %s', number_format($value), strtoupper($currency ?: Bazar::getCurrency())
-            );
-        });
-    }
-
     /**
      * Register events.
      */

src/Fields/Items.php

@@ -11,7 +11,7 @@
 use Cone\Root\Fields\Text;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number as NumberFormatter;
 
 class Items extends MorphMany
 {
@@ -61,14 +61,14 @@ public function fields(Request $request): array
                 ->min(0)
                 ->required()
                 ->format(static function (Request $request, Model $model, ?float $value): string {
-                    return Str::currency($value, $model->itemable->currency);
+                    return NumberFormatter::currency($value, $model->itemable->currency);
                 }),
 
             Number::make(__('TAX'), 'tax')
                 ->min(0)
                 ->required()
                 ->format(static function (Request $request, Model $model, ?float $value): string {
-                    return Str::currency($value, $model->itemable->currency);
+                    return NumberFormatter::currency($value, $model->itemable->currency);
                 }),
 
             Number::make(__('Quantity'), 'quantity')

src/Fields/Price.php

@@ -6,6 +6,7 @@
 use Cone\Root\Fields\Meta;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
+use Illuminate\Support\Number;
 use Illuminate\Support\Str;
 
 class Price extends Meta
@@ -29,7 +30,7 @@ public function __construct(string $label, string $currency = null)
         $this->field->min(0);
 
         $this->field->format(function (Request $request, Model $model, mixed $value): ?string {
-            return is_null($value) ? null : Str::currency($value, $this->currency);
+            return is_null($value) ? null : Number::currency($value, $this->currency);
         });
     }
 

src/Fields/Transactions.php

@@ -13,6 +13,7 @@
 use Cone\Root\Fields\Text;
 use Cone\Root\Fields\URL;
 use Illuminate\Http\Request;
+use Illuminate\Support\Number as NumberFormatter;
 use Illuminate\Support\Str;
 
 class Transactions extends HasMany
@@ -50,7 +51,7 @@ public function fields(Request $request): array
                 ->min(0)
                 ->required()
                 ->format(static function (Request $request, Transaction $transaction, ?float $value): string {
-                    return Str::currency($value, $transaction->order->currency);
+                    return NumberFormatter::currency($value, $transaction->order->currency);
                 }),
 
             Select::make(__('Driver'), 'driver')

src/Models/Item.php

@@ -13,7 +13,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 class Item extends Model implements Contract
 {
@@ -198,7 +198,7 @@ public function getPrice(): float
      */
     public function getFormattedPrice(): string
     {
-        return Str::currency($this->getPrice(), $this->itemable->getCurrency());
+        return Number::currency($this->getPrice(), $this->itemable->getCurrency());
     }
 
     /**
@@ -214,7 +214,7 @@ public function getTotal(): float
      */
     public function getFormattedTotal(): string
     {
-        return Str::currency($this->getTotal(), $this->itemable->getCurrency());
+        return Number::currency($this->getTotal(), $this->itemable->getCurrency());
     }
 
     /**
@@ -230,7 +230,7 @@ public function getSubtotal(): float
      */
     public function getFormattedSubtotal(): string
     {
-        return Str::currency($this->getSubtotal(), $this->itemable->getCurrency());
+        return Number::currency($this->getSubtotal(), $this->itemable->getCurrency());
     }
 
     /**

src/Models/Shipping.php

@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Number;
 use Illuminate\Support\Str;
 use Throwable;
 
@@ -202,7 +203,7 @@ public function getPrice(): float
      */
     public function getFormattedPrice(): string
     {
-        return Str::currency($this->getPrice(), $this->shippable->getCurrency());
+        return Number::currency($this->getPrice(), $this->shippable->getCurrency());
     }
 
     /**
@@ -218,7 +219,7 @@ public function getTotal(): float
      */
     public function getFormattedTotal(): string
     {
-        return Str::currency($this->getTotal(), $this->shippable->getCurrency());
+        return Number::currency($this->getTotal(), $this->shippable->getCurrency());
     }
 
     /**
@@ -234,7 +235,7 @@ public function getSubtotal(): float
      */
     public function getFormattedSubtotal(): string
     {
-        return Str::currency($this->getSubtotal(), $this->shippable->getCurrency());
+        return Number::currency($this->getSubtotal(), $this->shippable->getCurrency());
     }
 
     /**

src/Traits/HasPrices.php

@@ -6,7 +6,7 @@
 use Cone\Bazar\Models\Price;
 use Cone\Bazar\Relations\Prices;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 trait HasPrices
 {
@@ -65,7 +65,7 @@ public function getFormattedPrice(string $currency = null): ?string
 
         $price = $this->getPrice($currency);
 
-        return is_null($price) ? null : Str::currency($price, $currency);
+        return is_null($price) ? null : Number::currency($price, $currency);
     }
 
     /**

src/Traits/InteractsWithDiscounts.php

@@ -4,6 +4,7 @@
 
 use Cone\Bazar\Support\Facades\Discount;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Number;
 use Illuminate\Support\Str;
 
 trait InteractsWithDiscounts
@@ -33,7 +34,7 @@ public function getDiscount(): float
      */
     public function getFormattedDiscount(): string
     {
-        return Str::currency($this->getDiscount(), $this->currency);
+        return Number::currency($this->getDiscount(), $this->currency);
     }
 
     /**

src/Traits/InteractsWithItems.php

@@ -17,7 +17,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 trait InteractsWithItems
 {
@@ -221,7 +221,7 @@ public function getTotal(): float
      */
     public function getFormattedTotal(): string
     {
-        return Str::currency($this->getTotal(), $this->getCurrency());
+        return Number::currency($this->getTotal(), $this->getCurrency());
     }
 
     /**
@@ -241,7 +241,7 @@ public function getSubtotal(): float
      */
     public function getFormattedSubtotal(): string
     {
-        return Str::currency($this->getSubtotal(), $this->getCurrency());
+        return Number::currency($this->getSubtotal(), $this->getCurrency());
     }
 
     /**
@@ -261,7 +261,7 @@ public function getFeeTotal(): float
      */
     public function getFormattedFeeTotal(): string
     {
-        return Str::currency($this->getFeeTotal(), $this->getCurrency());
+        return Number::currency($this->getFeeTotal(), $this->getCurrency());
     }
 
     /**
@@ -281,7 +281,7 @@ public function getTax(): float
      */
     public function getFormattedTax(): string
     {
-        return Str::currency($this->getTax(), $this->getCurrency());
+        return Number::currency($this->getTax(), $this->getCurrency());
     }
 
     /**

src/Traits/InteractsWithTaxes.php

@@ -7,7 +7,7 @@
 use Cone\Bazar\Models\Shipping;
 use Cone\Bazar\Support\Facades\Tax;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 trait InteractsWithTaxes
 {
@@ -44,7 +44,7 @@ public function getFormattedTax(): string
             $currency = $this->shippable->currency;
         }
 
-        return Str::currency($this->getTax(), $currency);
+        return Number::currency($this->getTax(), $currency);
     }
 
     /**

tests/Models/ItemTest.php

@@ -8,7 +8,7 @@
 use Cone\Bazar\Models\Product;
 use Cone\Bazar\Support\Facades\Tax;
 use Cone\Bazar\Tests\TestCase;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 class ItemTest extends TestCase
 {
@@ -35,15 +35,15 @@ public function setUp(): void
     public function test_item_is_taxable(): void
     {
         $this->assertInstanceOf(Taxable::class, $this->item);
-        $this->assertSame(Str::currency($this->item->tax, $this->item->itemable->currency), $this->item->getFormattedTax());
+        $this->assertSame(Number::currency($this->item->tax, $this->item->itemable->currency), $this->item->getFormattedTax());
         $this->assertSame($this->item->getFormattedTax(), $this->item->formattedTax);
     }
 
     public function test_item_has_price_attribute(): void
     {
         $this->assertSame($this->item->price, $this->item->getPrice());
         $this->assertSame(
-            Str::currency($this->item->price, $this->item->itemable->currency), $this->item->getFormattedPrice()
+            Number::currency($this->item->price, $this->item->itemable->currency), $this->item->getFormattedPrice()
         );
         $this->assertSame($this->item->getFormattedPrice(), $this->item->formattedPrice);
     }
@@ -56,14 +56,14 @@ public function test_item_has_total_attribute(): void
         );
         $this->assertSame($this->item->getTotal(), $this->item->total);
         $this->assertSame(
-            Str::currency($this->item->total, $this->item->itemable->currency),
+            Number::currency($this->item->total, $this->item->itemable->currency),
             $this->item->getFormattedTotal()
         );
         $this->assertSame($this->item->getFormattedTotal(), $this->item->formattedTotal);
         $this->assertSame($this->item->price * $this->item->quantity, $this->item->getSubtotal());
         $this->assertSame($this->item->getSubtotal(), $this->item->subtotal);
         $this->assertSame(
-            Str::currency($this->item->subtotal, $this->item->itemable->currency),
+            Number::currency($this->item->subtotal, $this->item->itemable->currency),
             $this->item->getFormattedSubtotal()
         );
         $this->assertSame($this->item->getFormattedSubtotal(), $this->item->formattedSubtotal);

tests/Models/ShippingTest.php

@@ -10,7 +10,7 @@
 use Cone\Bazar\Support\Facades\Shipping as ShippingManager;
 use Cone\Bazar\Support\Facades\Tax;
 use Cone\Bazar\Tests\TestCase;
-use Illuminate\Support\Str;
+use Illuminate\Support\Number;
 
 class ShippingTest extends TestCase
 {
@@ -84,7 +84,7 @@ public function testt_is_taxable(): void
         $this->assertInstanceOf(Taxable::class, $this->shipping);
         $this->assertSame($this->shipping->price * 0.1, $this->shipping->tax);
         $this->assertSame(
-            Str::currency($this->shipping->tax, $this->shipping->shippable->currency), $this->shipping->getFormattedTax()
+            Number::currency($this->shipping->tax, $this->shipping->shippable->currency), $this->shipping->getFormattedTax()
         );
         $this->assertSame($this->shipping->getFormattedTax(), $this->shipping->formattedTax);
     }
@@ -97,14 +97,14 @@ public function testt_has_total_attribute(): void
         );
         $this->assertSame($this->shipping->getTotal(), $this->shipping->total);
         $this->assertSame(
-            Str::currency($this->shipping->total, $this->shipping->shippable->currency),
+            Number::currency($this->shipping->total, $this->shipping->shippable->currency),
             $this->shipping->getFormattedTotal()
         );
         $this->assertSame($this->shipping->getFormattedTotal(), $this->shipping->formattedTotal);
         $this->assertSame($this->shipping->cost, $this->shipping->getSubtotal());
         $this->assertSame($this->shipping->getSubtotal(), $this->shipping->subtotal);
         $this->assertSame(
-            Str::currency($this->shipping->subtotal, $this->shipping->shippable->currency),
+            Number::currency($this->shipping->subtotal, $this->shipping->shippable->currency),
             $this->shipping->getFormattedSubtotal()
         );
         $this->assertSame($this->shipping->getFormattedSubtotal(), $this->shipping->formattedSubtotal);