yadiparfum/parfum
yadiparfum/parfum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rule): memperbaiki rule UnsignedInteger dan menyesuaikan validasi angka

Browse Source
This commit is contained in:
Yoga Pangestu 2025-10-02 19:45:04 +07:00
parent ed7ffd0d41
commit 42df909c3f
7 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Livewire/Forms/Studio/Catalog/BottleForm.php
View File

@ -33,9 +33,9 @@ public function rules(): array
{ {
return [ return [
'name' => ['required', 'string', 'max:50'], 'name' => ['required', 'string', 'max:50'],
'size' => ['required', 'numeric', new UnsignedInteger], 'size' => ['required', new UnsignedInteger],
'cost_price' => ['required', 'numeric', new UnsignedInteger], 'cost_price' => ['required', new UnsignedInteger],
'sale_price' => ['required', 'numeric', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'description' => ['nullable', 'string'], 'description' => ['nullable', 'string'],
'outlet_ids' => ['required', 'array', 'min:1'], 'outlet_ids' => ['required', 'array', 'min:1'],
'outlet_ids.*' => Rule::exists('outlets', 'id'), 'outlet_ids.*' => Rule::exists('outlets', 'id'),

4
app/Livewire/Forms/Studio/Catalog/PerfumeForm.php
View File

@ -53,8 +53,8 @@ public function rules(): array
Rule::unique('perfumes', 'sku')->ignore($this->perfume), Rule::unique('perfumes', 'sku')->ignore($this->perfume),
], ],
'brand' => ['nullable', Rule::exists('brands', 'id')], 'brand' => ['nullable', Rule::exists('brands', 'id')],
'cost_price' => ['required', 'numeric', new UnsignedInteger], 'cost_price' => ['required', new UnsignedInteger],
'sale_price' => ['required', 'numeric', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'base_notes' => ['nullable', 'string', 'max:255'], 'base_notes' => ['nullable', 'string', 'max:255'],
'middle_notes' => ['nullable', 'string', 'max:255'], 'middle_notes' => ['nullable', 'string', 'max:255'],
'top_notes' => ['nullable', 'string', 'max:255'], 'top_notes' => ['nullable', 'string', 'max:255'],

4
app/Livewire/Forms/Studio/Catalog/ProductForm.php
View File

@ -39,8 +39,8 @@ public function rules(): array
'max:20', 'max:20',
Rule::unique('products', 'sku')->ignore($this->product), Rule::unique('products', 'sku')->ignore($this->product),
], ],
'cost_price' => ['required', 'numeric', new UnsignedInteger], 'cost_price' => ['required', new UnsignedInteger],
'sale_price' => ['required', 'numeric', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'description' => ['nullable', 'string'], 'description' => ['nullable', 'string'],
'outlet_ids' => ['required', 'array', 'min:1'], 'outlet_ids' => ['required', 'array', 'min:1'],
'outlet_ids.*' => Rule::exists('outlets', 'id'), 'outlet_ids.*' => Rule::exists('outlets', 'id'),

2
app/Livewire/Forms/Studio/Finance/ExpenseForm.php
View File

@ -24,7 +24,7 @@ public function rules(): array
{ {
return [ return [
'description' => ['required', 'string', 'max:100'], 'description' => ['required', 'string', 'max:100'],
'amount' => ['required', 'numeric', new UnsignedInteger], 'amount' => ['required', new UnsignedInteger],
'image' => ['nullable', 'array'], 'image' => ['nullable', 'array'],
]; ];
} }

10
app/Livewire/Forms/Studio/Loyalty/VoucherForm.php
View File

@ -57,19 +57,19 @@ public function rules(): array
Rule::when( Rule::when(
fn () => $this->type == VoucherType::PERCENTAGE->value, fn () => $this->type == VoucherType::PERCENTAGE->value,
['integer', 'between:0,100'], ['integer', 'between:0,100'],
['numeric', new UnsignedInteger], [new UnsignedInteger],
), ),
], ],
'min_purchase' => ['nullable', 'numeric', new UnsignedInteger], 'min_purchase' => ['nullable', new UnsignedInteger],
'max_discount' => [ 'max_discount' => [
Rule::when( Rule::when(
fn () => $this->type == VoucherType::PERCENTAGE->value, fn () => $this->type == VoucherType::PERCENTAGE->value,
['required', 'numeric', new UnsignedInteger], ['required', new UnsignedInteger],
['nullable'], ['nullable'],
), ),
], ],
'quota' => ['nullable', 'numeric', new UnsignedInteger], 'quota' => ['nullable', new UnsignedInteger],
'limit_per_user' => ['nullable', 'numeric', new UnsignedInteger], 'limit_per_user' => ['nullable', new UnsignedInteger],
'start_date' => ['required', 'date'], 'start_date' => ['required', 'date'],
'end_date' => ['nullable', 'date', 'after_or_equal:start_date'], 'end_date' => ['nullable', 'date', 'after_or_equal:start_date'],
'terms_conditions' => ['nullable', 'string'], 'terms_conditions' => ['nullable', 'string'],

2
app/Livewire/Forms/Studio/Master/UserForm.php
View File

@ -45,7 +45,7 @@ public function rules(): array
'username' => ['required', 'alpha_num', 'min:5', 'max:20', Rule::unique('users', 'username')->ignore($this->user)], 'username' => ['required', 'alpha_num', 'min:5', 'max:20', Rule::unique('users', 'username')->ignore($this->user)],
'email' => ['required', 'email', 'max:100', Rule::unique('users', 'email')->ignore($this->user)], 'email' => ['required', 'email', 'max:100', Rule::unique('users', 'email')->ignore($this->user)],
'phone_number' => ['required', 'string', new PhoneNumber], 'phone_number' => ['required', 'string', new PhoneNumber],
'base_salary' => ['required', 'regex:/^[0-9.]+$/', new UnsignedInteger], 'base_salary' => ['required', new UnsignedInteger],
'birthdate' => ['required', 'date', 'before:'.Carbon::now()->subYears(18)->format('Y-m-d')], 'birthdate' => ['required', 'date', 'before:'.Carbon::now()->subYears(18)->format('Y-m-d')],
'hire_date' => ['required', 'date'], 'hire_date' => ['required', 'date'],
'address' => ['required', 'string'], 'address' => ['required', 'string'],

12
app/Rules/UnsignedInteger.php
View File

@ -9,14 +9,18 @@ class UnsignedInteger implements ValidationRule
{ {
public function validate(string $attribute, mixed $value, Closure $fail): void public function validate(string $attribute, mixed $value, Closure $fail): void
{ {
if (! ctype_digit((string) $value)) { $normalized = str_replace('.', '', (string) $value);
$fail("{$attribute} harus berupa bilangan bulat positif.");
if (! ctype_digit($normalized)) {
$fail(':Attribute harus berupa bilangan bulat positif.');
return; return;
} }
if ((int) $value < 0 || (int) $value > 4294967295) { $intValue = (int) $normalized;
$fail("{$attribute} harus berada di antara 0 dan 4294967295.");
if ($intValue < 0 || $intValue > 4294967295) {
$fail(':Attribute harus berada di antara 0 dan 4.294.967.295.');
} }
} }
} }