From 53648f23929adddef0afb10b8542a707343affe1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 7 Dec 2024 09:32:52 +1100 Subject: [PATCH] additional validation rules for custom surcharges --- app/Http/Requests/Credit/StoreCreditRequest.php | 5 +++++ app/Http/Requests/Credit/UpdateCreditRequest.php | 5 +++++ app/Http/Requests/Invoice/StoreInvoiceRequest.php | 4 ++++ app/Http/Requests/Invoice/UpdateInvoiceRequest.php | 4 ++++ .../Requests/PurchaseOrder/StorePurchaseOrderRequest.php | 5 +++++ .../Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php | 5 +++++ app/Http/Requests/Quote/StoreQuoteRequest.php | 5 +++++ app/Http/Requests/Quote/UpdateQuoteRequest.php | 5 +++++ 8 files changed, 38 insertions(+) diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php index 4023343e58..d9698c539f 100644 --- a/app/Http/Requests/Credit/StoreCreditRequest.php +++ b/app/Http/Requests/Credit/StoreCreditRequest.php @@ -81,6 +81,11 @@ 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['date'] = 'bail|sometimes|date:Y-m-d'; if ($this->invoice_id) { diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php index 4915ca1f6e..501d1c75d0 100644 --- a/app/Http/Requests/Credit/UpdateCreditRequest.php +++ b/app/Http/Requests/Credit/UpdateCreditRequest.php @@ -84,6 +84,11 @@ 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']; + return $rules; } diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index a10d6944e3..ed8392aa23 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -83,6 +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']; return $rules; } diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php index 77c562d16d..89687a0f60 100644 --- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php +++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php @@ -82,6 +82,10 @@ 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['date'] = 'bail|sometimes|date:Y-m-d'; diff --git a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php index 28dfb88347..65954d0aac 100644 --- a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php +++ b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php @@ -77,6 +77,11 @@ 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']; + return $rules; } diff --git a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php index c501407145..0a83f466bc 100644 --- a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php +++ b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php @@ -77,6 +77,11 @@ class UpdatePurchaseOrderRequest 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']; + return $rules; } diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php index 6906e8fec4..cb686ad259 100644 --- a/app/Http/Requests/Quote/StoreQuoteRequest.php +++ b/app/Http/Requests/Quote/StoreQuoteRequest.php @@ -84,6 +84,11 @@ 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']; + return $rules; } diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php index 739ec65fa7..79163edcc6 100644 --- a/app/Http/Requests/Quote/UpdateQuoteRequest.php +++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php @@ -72,6 +72,11 @@ 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']; + return $rules; }