From 8e588016df90c4cdc6fba15d7c2a96fa14e9a69f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 7 Dec 2024 09:43:09 +1100 Subject: [PATCH] Fixes for validation --- app/Http/Requests/Credit/StoreCreditRequest.php | 8 ++++---- app/Http/Requests/Credit/UpdateCreditRequest.php | 8 ++++---- app/Http/Requests/Invoice/StoreInvoiceRequest.php | 8 ++++---- app/Http/Requests/Invoice/UpdateInvoiceRequest.php | 10 ++++++---- .../PurchaseOrder/StorePurchaseOrderRequest.php | 8 ++++---- .../PurchaseOrder/UpdatePurchaseOrderRequest.php | 10 +++++----- app/Http/Requests/Quote/StoreQuoteRequest.php | 8 ++++---- app/Http/Requests/Quote/UpdateQuoteRequest.php | 8 ++++---- 8 files changed, 35 insertions(+), 33 deletions(-) diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php index d9698c539f..23f4f85538 100644 --- a/app/Http/Requests/Credit/StoreCreditRequest.php +++ b/app/Http/Requests/Credit/StoreCreditRequest.php @@ -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'; diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php index 501d1c75d0..e78951b106 100644 --- a/app/Http/Requests/Credit/UpdateCreditRequest.php +++ b/app/Http/Requests/Credit/UpdateCreditRequest.php @@ -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; } diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index ed8392aa23..b8a1dc23ab 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -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; } diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php index 89687a0f60..4055891cd0 100644 --- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php +++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php @@ -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'; diff --git a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php index 65954d0aac..4814de7bf7 100644 --- a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php +++ b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php @@ -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; } diff --git a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php index 0a83f466bc..dde6a97c68 100644 --- a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php +++ b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php @@ -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; } diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php index cb686ad259..f5cd9839f1 100644 --- a/app/Http/Requests/Quote/StoreQuoteRequest.php +++ b/app/Http/Requests/Quote/StoreQuoteRequest.php @@ -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; } diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php index 79163edcc6..307ddc05b9 100644 --- a/app/Http/Requests/Quote/UpdateQuoteRequest.php +++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php @@ -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; }