shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invoice/Bill item quantity character message #rah6ud

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-08-08 21:30:08 +03:00
parent 47aa58e198
commit f1b80b132c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Requests/Document/Document.php
View File

@ -43,6 +43,12 @@ class Document extends FormRequest
// Get company id // Get company id
$company_id = (int) $this->request->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 [ return [
'type' => 'required|string', 'type' => 'required|string',
'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL', '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', 'due_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:issued_at',
'amount' => 'required', 'amount' => 'required',
'items.*.name' => 'required|string', 'items.*.name' => 'required|string',
'items.*.quantity' => 'required', 'items.*.quantity' => 'required|size:' . $quantity_size,
'items.*.price' => 'required|amount', 'items.*.price' => 'required|amount',
'currency_code' => 'required|string|currency', 'currency_code' => 'required|string|currency',
'currency_rate' => 'required|gt:0', 'currency_rate' => 'required|gt:0',
@ -80,6 +86,7 @@ class Document extends FormRequest
return [ return [
'items.*.name.required' => trans('validation.required', ['attribute' => Str::lower(trans('general.name'))]), '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.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.*.price.required' => trans('validation.required', ['attribute' => Str::lower(trans('invoices.price'))]),
'items.*.currency.required' => trans('validation.custom.invalid_currency'), 'items.*.currency.required' => trans('validation.custom.invalid_currency'),
'items.*.currency.string' => trans('validation.custom.invalid_currency'), 'items.*.currency.string' => trans('validation.custom.invalid_currency'),

9
app/Http/Requests/Document/DocumentItem.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Document; namespace App\Http\Requests\Document;
use App\Abstracts\Http\FormRequest; use App\Abstracts\Http\FormRequest;
use Illuminate\Support\Str;
class DocumentItem extends FormRequest class DocumentItem extends FormRequest
{ {
@ -13,11 +14,17 @@ class DocumentItem extends FormRequest
*/ */
public function rules() 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 [ return [
'type' => 'required|string', 'type' => 'required|string',
'document_id' => 'required|integer', 'document_id' => 'required|integer',
'name' => 'required|string', 'name' => 'required|string',
'quantity' => 'required', 'quantity' => 'required|size:' . $quantity_size,
'price' => 'required|amount', 'price' => 'required|amount',
'total' => 'required', 'total' => 'required',
'tax' => 'required', 'tax' => 'required',