mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-03 17:44:37 -04:00
fixes for validation of line_items
This commit is contained in:
parent
4ad3e7fc8a
commit
95e5b89641
@ -54,6 +54,7 @@ class StoreCreditRequest extends Request
|
|||||||
$rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
|
$rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
|
||||||
|
|
||||||
$rules['number'] = new UniqueCreditNumberRule($this->all());
|
$rules['number'] = new UniqueCreditNumberRule($this->all());
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,8 @@ class UpdateCreditRequest extends Request
|
|||||||
$rules['number'] = 'unique:credits,number,'.$this->id.',id,company_id,'.$this->credit->company_id;
|
$rules['number'] = 'unique:credits,number,'.$this->id.',id,company_id,'.$this->credit->company_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,6 +55,8 @@ class StoreInvoiceRequest extends Request
|
|||||||
|
|
||||||
$rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
|
$rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
|
||||||
|
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,6 +54,8 @@ class UpdateInvoiceRequest extends Request
|
|||||||
$rules['number'] = 'unique:invoices,number,'.$this->id.',id,company_id,'.$this->invoice->company_id;
|
$rules['number'] = 'unique:invoices,number,'.$this->id.',id,company_id,'.$this->invoice->company_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ class StorePaymentRequest extends Request
|
|||||||
$input['amount'] = $invoices_total - $credits_total;
|
$input['amount'] = $invoices_total - $credits_total;
|
||||||
}
|
}
|
||||||
|
|
||||||
$input['is_manual'] = true;
|
// $input['is_manual'] = true;
|
||||||
|
|
||||||
if (! isset($input['date'])) {
|
if (! isset($input['date'])) {
|
||||||
$input['date'] = now()->format('Y-m-d');
|
$input['date'] = now()->format('Y-m-d');
|
||||||
|
@ -94,6 +94,7 @@ class StoreQuoteRequest extends Request
|
|||||||
}
|
}
|
||||||
|
|
||||||
$rules['number'] = new UniqueQuoteNumberRule($this->all());
|
$rules['number'] = new UniqueQuoteNumberRule($this->all());
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
@ -50,6 +50,8 @@ class UpdateQuoteRequest extends Request
|
|||||||
$rules['number'] = 'unique:quotes,number,'.$this->id.',id,company_id,'.$this->quote->company_id;
|
$rules['number'] = 'unique:quotes,number,'.$this->id.',id,company_id,'.$this->quote->company_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$rules['line_items'] = 'array';
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ class Payment extends BaseModel
|
|||||||
'date',
|
'date',
|
||||||
'transaction_reference',
|
'transaction_reference',
|
||||||
'number',
|
'number',
|
||||||
'is_manual',
|
// 'is_manual',
|
||||||
'private_notes',
|
'private_notes',
|
||||||
'custom_value1',
|
'custom_value1',
|
||||||
'custom_value2',
|
'custom_value2',
|
||||||
|
@ -95,6 +95,7 @@ class PaymentRepository extends BaseRepository
|
|||||||
|
|
||||||
/*Fill the payment*/
|
/*Fill the payment*/
|
||||||
$payment->fill($data);
|
$payment->fill($data);
|
||||||
|
$payment->is_manual = true;
|
||||||
$payment->status_id = Payment::STATUS_COMPLETED;
|
$payment->status_id = Payment::STATUS_COMPLETED;
|
||||||
$payment->save();
|
$payment->save();
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ trait CleanLineItems
|
|||||||
{
|
{
|
||||||
public function cleanItems($items) :array
|
public function cleanItems($items) :array
|
||||||
{
|
{
|
||||||
if (! isset($items)) {
|
if (! isset($items) || !is_array($items)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user