Merge branch 'fix-validation' into 'master'

fix validation issue on backend

See merge request mohit.panjvani/crater-web!59
This commit is contained in:
Mohit Panjwani
2019-11-20 06:40:47 +00:00
5 changed files with 17 additions and 25 deletions

View File

@ -27,22 +27,18 @@ class EstimatesRequest extends FormRequest
'expiry_date' => 'required', 'expiry_date' => 'required',
'estimate_number' => 'required|unique:estimates,estimate_number', 'estimate_number' => 'required|unique:estimates,estimate_number',
'user_id' => 'required', 'user_id' => 'required',
'discount' => 'required|digits_between:1,20', 'discount' => 'required',
'discount_val' => 'required|digits_between:1,20', 'discount_val' => 'required',
'sub_total' => 'required|digits_between:1,20', 'sub_total' => 'required',
'total' => 'required|digits_between:1,20', 'total' => 'required',
'tax' => 'required|digits_between:1,20', 'tax' => 'required',
'estimate_template_id' => 'required', 'estimate_template_id' => 'required',
'items' => 'required|array', 'items' => 'required|array',
'items.*.description' => 'max:255', 'items.*.description' => 'max:255',
'items.*' => 'required|max:255', 'items.*' => 'required|max:255',
'items.*.name' => 'required', 'items.*.name' => 'required',
'items.*.quantity' => 'required|digits_between:1,20', 'items.*.quantity' => 'required',
'items.*.price' => 'required|digits_between:1,20', 'items.*.price' => 'required'
'items.*.discount' => 'digits_between:1,20',
'items.*.discount_val' => 'digits_between:1,20',
'items.*.tax' => 'digits_between:1,20',
'items.*.total' => 'digits_between:1,20',
]; ];
if ($this->getMethod() == 'PUT') { if ($this->getMethod() == 'PUT') {

View File

@ -25,7 +25,7 @@ class ExpenseRequest extends FormRequest
return [ return [
'expense_date' => 'required', 'expense_date' => 'required',
'expense_category_id' => 'required', 'expense_category_id' => 'required',
'amount' => 'required|digits_between:1,20' 'amount' => 'required'
]; ];
} }
} }

View File

@ -27,22 +27,18 @@ class InvoicesRequest extends FormRequest
'due_date' => 'required', 'due_date' => 'required',
'invoice_number' => 'required|unique:invoices,invoice_number', 'invoice_number' => 'required|unique:invoices,invoice_number',
'user_id' => 'required', 'user_id' => 'required',
'discount' => 'required|digits_between:1,20', 'discount' => 'required',
'discount_val' => 'required|digits_between:1,20', 'discount_val' => 'required',
'sub_total' => 'required|digits_between:1,20', 'sub_total' => 'required',
'total' => 'required|digits_between:1,20', 'total' => 'required',
'tax' => 'required|digits_between:1,20', 'tax' => 'required',
'invoice_template_id' => 'required', 'invoice_template_id' => 'required',
'items' => 'required|array', 'items' => 'required|array',
'items.*' => 'required|max:255', 'items.*' => 'required|max:255',
'items.*.description' => 'max:255', 'items.*.description' => 'max:255',
'items.*.name' => 'required', 'items.*.name' => 'required',
'items.*.quantity' => 'required|digits_between:1,20', 'items.*.quantity' => 'required',
'items.*.price' => 'required|digits_between:1,20', 'items.*.price' => 'required'
'items.*.discount' => 'digits_between:1,20',
'items.*.discount_val' => 'digits_between:1,20',
'items.*.tax' => 'digits_between:1,20',
'items.*.total' => 'digits_between:1,20',
]; ];
if ($this->getMethod() == 'PUT') { if ($this->getMethod() == 'PUT') {

View File

@ -24,7 +24,7 @@ class ItemsRequest extends FormRequest
{ {
return [ return [
'name' => 'required', 'name' => 'required',
'price' => 'required|digits_between:1,20', 'price' => 'required',
]; ];
} }
} }

View File

@ -26,7 +26,7 @@ class PaymentRequest extends FormRequest
'payment_date' => 'required', 'payment_date' => 'required',
'payment_number' => 'required|unique:payments,payment_number', 'payment_number' => 'required|unique:payments,payment_number',
'user_id' => 'required', 'user_id' => 'required',
'amount' => 'required|digits_between:1,20', 'amount' => 'required',
]; ];
if ($this->getMethod() == 'PUT') { if ($this->getMethod() == 'PUT') {