Fix
parent
adaddba5ce
commit
c857350b52
|
|
@ -22,8 +22,8 @@ class MaterielStoreRequest extends FormRequest
|
||||||
'quarter' => ['bail', 'required', new Quarter()],
|
'quarter' => ['bail', 'required', new Quarter()],
|
||||||
'name' => ['bail', 'required', 'string', 'max:255'],
|
'name' => ['bail', 'required', 'string', 'max:255'],
|
||||||
'type' => ['bail', 'required', new Enum(MaterielType::class)],
|
'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})?$/'],
|
'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:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
|
'highest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ class MaterielUpdateRequest extends FormRequest
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'name' => ['filled', 'string', 'max:255'],
|
'name' => ['filled', 'string', 'max:255'],
|
||||||
'type' => ['filled', new Enum(MaterielType::class)],
|
'type' => ['filled', new Enum(MaterielType::class)],
|
||||||
'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999.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'],
|
'highest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
|
||||||
'unit' => ['filled', 'string'],
|
'unit' => ['filled', 'string'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest
|
||||||
'year' => ['required', 'int', new Year()],
|
'year' => ['required', 'int', new Year()],
|
||||||
'quarter' => ['required', new Quarter()],
|
'quarter' => ['required', new Quarter()],
|
||||||
'area' => ['required', 'string'],
|
'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'],
|
'unit' => ['required', 'string'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest
|
||||||
'year' => ['filled', 'int', new Year()],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'area' => ['filled', 'string'],
|
'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'],
|
'unit' => ['filled', 'string'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,11 @@ class RiceShrimpIndustryStoreRequest extends FormRequest
|
||||||
return [
|
return [
|
||||||
'year' => ['required', 'int', new Year()],
|
'year' => ['required', 'int', new Year()],
|
||||||
'quarter' => ['required', new Quarter()],
|
'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'],
|
'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_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'],
|
'product_value_unit' => ['required', 'string'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,11 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int', new Year()],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'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'],
|
'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_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'],
|
'product_value_unit' => ['filled', 'string'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue