From 4405ba2ea9241b0cc2d94efe33673a1168525c3d Mon Sep 17 00:00:00 2001 From: ariaieboy Date: Mon, 1 Apr 2024 12:02:22 +0330 Subject: [PATCH] use new laravel-money env for configuration --- config/filament-currency.php | 9 +++++++++ src/FilamentCurrencyServiceProvider.php | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 config/filament-currency.php diff --git a/config/filament-currency.php b/config/filament-currency.php new file mode 100644 index 0000000..5ad8ff4 --- /dev/null +++ b/config/filament-currency.php @@ -0,0 +1,9 @@ +=1 we used `CURRENCY_DEFAULT` env that is used in laravel-money 1<=version<=4 + * from version 5 laravel-money introduced a new config and env variable `MONEY_DEFAULTS_CURRENCY` + * we use it in the fallback to support the laravel-money version 5. + */ + 'default_currency' => env('CURRENCY_DEFAULT', env('MONEY_DEFAULTS_CURRENCY', config('money.defaults.currency', 'USD'))), +]; diff --git a/src/FilamentCurrencyServiceProvider.php b/src/FilamentCurrencyServiceProvider.php index 18dc018..f5a9509 100644 --- a/src/FilamentCurrencyServiceProvider.php +++ b/src/FilamentCurrencyServiceProvider.php @@ -19,6 +19,7 @@ class FilamentCurrencyServiceProvider extends PackageServiceProvider public function configurePackage(Package $package): void { $package->name(static::$name) + ->hasConfigFile() ->hasViews(); } @@ -34,7 +35,7 @@ public function bootingPackage(): void } if (blank($currency)) { - $currency = env('DEFAULT_CURRENCY', 'USD'); + $currency = config('filament-currency.default_currency'); } return (new Money\Money(