Fixes for validation

This commit is contained in:
David Bomba 2024-12-07 09:43:09 +11:00
parent 4fb2a74d7e
commit 8e588016df
8 changed files with 35 additions and 33 deletions

View File

@ -81,10 +81,10 @@ class StoreCreditRequest extends Request
$rules['exchange_rate'] = 'bail|sometimes|numeric';
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['date'] = 'bail|sometimes|date:Y-m-d';

View File

@ -84,10 +84,10 @@ class UpdateCreditRequest extends Request
$rules['exchange_rate'] = 'bail|sometimes|numeric';
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}

View File

@ -83,10 +83,10 @@ class StoreInvoiceRequest extends Request
$rules['partial'] = 'bail|sometimes|nullable|numeric|gte:0';
$rules['partial_due_date'] = ['bail', 'sometimes', 'nullable', 'exclude_if:partial,0', 'date', 'before:due_date', 'after_or_equal:date'];
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}

View File

@ -82,10 +82,12 @@ class UpdateInvoiceRequest extends Request
$rules['exchange_rate'] = 'bail|sometimes|numeric';
$rules['partial'] = 'bail|sometimes|nullable|numeric';
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['date'] = 'bail|sometimes|date:Y-m-d';

View File

@ -77,10 +77,10 @@ class StorePurchaseOrderRequest extends Request
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}

View File

@ -76,11 +76,11 @@ class UpdatePurchaseOrderRequest extends Request
$rules['status_id'] = 'sometimes|integer|in:1,2,3,4,5';
$rules['exchange_rate'] = 'bail|sometimes|numeric';
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}

View File

@ -84,10 +84,10 @@ class StoreQuoteRequest extends Request
$rules['partial_due_date'] = ['bail', 'sometimes', 'nullable', 'exclude_if:partial,0', 'date', 'before:due_date', 'after_or_equal:date'];
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}

View File

@ -72,10 +72,10 @@ class UpdateQuoteRequest extends Request
$rules['due_date'] = ['bail', 'sometimes', 'nullable', 'after:partial_due_date', 'after_or_equal:date', Rule::requiredIf(fn () => strlen($this->partial_due_date) > 1), 'date'];
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge1'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge2'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge3'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
$rules['custom_surcharge4'] = ['sometimes', 'nullable', 'bail', 'numeric', 'max:99999999999999'];
return $rules;
}