From f1b80b132c9f211a2e85bcde94f91b3d53951e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 8 Aug 2021 21:30:08 +0300 Subject: [PATCH] Invoice/Bill item quantity character message #rah6ud --- app/Http/Requests/Document/Document.php | 9 ++++++++- app/Http/Requests/Document/DocumentItem.php | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/Document/Document.php b/app/Http/Requests/Document/Document.php index 897f930b1..0e2cc3e36 100644 --- a/app/Http/Requests/Document/Document.php +++ b/app/Http/Requests/Document/Document.php @@ -43,6 +43,12 @@ class Document extends FormRequest // Get company id $company_id = (int) $this->request->get('company_id'); + $quantity_size = 5; + + if ((Str::substrCount($this->request->get('quantity'), '.') > 1) || (Str::substrCount($this->request->get('quantity'), ',') > 1)) { + $quantity_size = 7; + } + return [ 'type' => 'required|string', 'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL', @@ -51,7 +57,7 @@ class Document extends FormRequest 'due_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:issued_at', 'amount' => 'required', 'items.*.name' => 'required|string', - 'items.*.quantity' => 'required', + 'items.*.quantity' => 'required|size:' . $quantity_size, 'items.*.price' => 'required|amount', 'currency_code' => 'required|string|currency', 'currency_rate' => 'required|gt:0', @@ -80,6 +86,7 @@ class Document extends FormRequest return [ 'items.*.name.required' => trans('validation.required', ['attribute' => Str::lower(trans('general.name'))]), 'items.*.quantity.required' => trans('validation.required', ['attribute' => Str::lower(trans('invoices.quantity'))]), + 'items.*.quantity.size' => trans('validation.size', ['attribute' => Str::lower(trans('invoices.quantity'))]), 'items.*.price.required' => trans('validation.required', ['attribute' => Str::lower(trans('invoices.price'))]), 'items.*.currency.required' => trans('validation.custom.invalid_currency'), 'items.*.currency.string' => trans('validation.custom.invalid_currency'), diff --git a/app/Http/Requests/Document/DocumentItem.php b/app/Http/Requests/Document/DocumentItem.php index c55141013..1532e04e0 100644 --- a/app/Http/Requests/Document/DocumentItem.php +++ b/app/Http/Requests/Document/DocumentItem.php @@ -3,6 +3,7 @@ namespace App\Http\Requests\Document; use App\Abstracts\Http\FormRequest; +use Illuminate\Support\Str; class DocumentItem extends FormRequest { @@ -13,11 +14,17 @@ class DocumentItem extends FormRequest */ public function rules() { + $quantity_size = 5; + + if ((Str::substrCount($this->request->get('quantity'), '.') > 1) || (Str::substrCount($this->request->get('quantity'), ',') > 1)) { + $quantity_size = 7; + } + return [ 'type' => 'required|string', 'document_id' => 'required|integer', 'name' => 'required|string', - 'quantity' => 'required', + 'quantity' => 'required|size:' . $quantity_size, 'price' => 'required|amount', 'total' => 'required', 'tax' => 'required',