diff --git a/app/Http/Requestes/MaterielStoreRequest.php b/app/Http/Requestes/MaterielStoreRequest.php index ad3e3d5..acc2d00 100644 --- a/app/Http/Requestes/MaterielStoreRequest.php +++ b/app/Http/Requestes/MaterielStoreRequest.php @@ -22,8 +22,8 @@ class MaterielStoreRequest extends FormRequest 'quarter' => ['bail', 'required', new Quarter()], 'name' => ['bail', 'required', 'string', 'max:255'], 'type' => ['bail', 'required', new Enum(MaterielType::class)], - 'lowest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], - 'highest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], + 'lowest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'highest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], ]; } diff --git a/app/Http/Requestes/MaterielUpdateRequest.php b/app/Http/Requestes/MaterielUpdateRequest.php index b394cc6..1c895f7 100644 --- a/app/Http/Requestes/MaterielUpdateRequest.php +++ b/app/Http/Requestes/MaterielUpdateRequest.php @@ -22,8 +22,8 @@ class MaterielUpdateRequest extends FormRequest 'quarter' => ['filled', new Quarter()], 'name' => ['filled', 'string', 'max:255'], 'type' => ['filled', new Enum(MaterielType::class)], - 'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], - 'highest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], + 'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'highest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], 'unit' => ['filled', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php index 7202c0c..e6d139c 100644 --- a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php @@ -19,7 +19,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], 'area' => ['required', 'string'], - 'sales' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'sales' => ['required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'unit' => ['required', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php index c372b17..8b1f2d2 100644 --- a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php @@ -19,7 +19,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], 'area' => ['filled', 'string'], - 'sales' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'sales' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'unit' => ['filled', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php index d1f9f5b..5662a3e 100644 --- a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php @@ -18,11 +18,11 @@ class RiceShrimpIndustryStoreRequest extends FormRequest return [ 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], - 'area' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'area' => ['required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['required', 'string'], - 'product_output' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_output' => ['required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_output_unit' => ['required', 'string'], - 'product_value' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_value' => ['required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_value_unit' => ['required', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php index 61bf741..621456b 100644 --- a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php @@ -18,11 +18,11 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest return [ 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], - 'area' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'area' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['filled', 'string'], - 'product_output' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_output' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_output_unit' => ['filled', 'string'], - 'product_value' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_value' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_value_unit' => ['filled', 'string'], ]; }