From 76b9e18c262efc6780125fd292a1dea622716ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:37:04 +0300 Subject: [PATCH] removed required decimal mark in currency request --- app/Http/Controllers/Wizard/Currencies.php | 2 +- app/Http/Requests/Setting/Currency.php | 2 +- app/Http/Requests/Wizard/Currency.php | 35 ---------------------- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 app/Http/Requests/Wizard/Currency.php diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php index 693b2e56b..4c39a5e98 100644 --- a/app/Http/Controllers/Wizard/Currencies.php +++ b/app/Http/Controllers/Wizard/Currencies.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Wizard; use Akaunting\Money\Currency as MoneyCurrency; use App\Abstracts\Http\Controller; -use App\Http\Requests\Wizard\Currency as Request; +use App\Http\Requests\Setting\Currency as Request; use App\Jobs\Setting\CreateCurrency; use App\Jobs\Setting\DeleteCurrency; use App\Jobs\Setting\UpdateCurrency; diff --git a/app/Http/Requests/Setting/Currency.php b/app/Http/Requests/Setting/Currency.php index cf54f0d02..33000d5c8 100644 --- a/app/Http/Requests/Setting/Currency.php +++ b/app/Http/Requests/Setting/Currency.php @@ -29,7 +29,7 @@ class Currency extends FormRequest 'rate' => 'required|gt:0', 'enabled' => 'integer|boolean', 'default_currency' => 'nullable|boolean', - 'decimal_mark' => 'required|string|different:thousands_separator|regex:/^[A-Za-z.,_\s-]+$/', + 'decimal_mark' => 'nullable|string|different:thousands_separator|regex:/^[A-Za-z.,_\s-]+$/', 'symbol_first' => 'nullable|boolean', 'thousands_separator' => 'nullable|different:decimal_mark|regex:/^[A-Za-z.,_\s-]+$/', ]; diff --git a/app/Http/Requests/Wizard/Currency.php b/app/Http/Requests/Wizard/Currency.php deleted file mode 100644 index 4b48cb462..000000000 --- a/app/Http/Requests/Wizard/Currency.php +++ /dev/null @@ -1,35 +0,0 @@ -getMethod(), ['PATCH', 'PUT'])) { - $id = is_numeric($this->currency) ? $this->currency : $this->currency->getAttribute('id'); - } else { - $id = null; - } - - // Get company id - $company_id = (int) $this->request->get('company_id'); - - return [ - 'name' => 'required|string', - 'code' => 'required|string|currency_code|unique:currencies,NULL,' . ($id ?? 'null') . ',id,company_id,' . $company_id . ',deleted_at,NULL', - 'rate' => 'required|gt:0', - 'enabled' => 'integer|boolean', - 'default_currency' => 'nullable|boolean', - 'symbol_first' => 'nullable|boolean', - ]; - } -}