Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for validation of line_items

Browse Source
This commit is contained in:
David Bomba 2021-01-14 08:16:07 +11:00
parent 4ad3e7fc8a
commit 95e5b89641
10 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -54,6 +54,7 @@ class StoreCreditRequest extends Request
$rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
$rules['number'] = new UniqueCreditNumberRule($this->all());
$rules['line_items'] = 'array';
return $rules;
}

2
app/Http/Requests/Credit/UpdateCreditRequest.php
View File

@ -56,6 +56,8 @@ class UpdateCreditRequest extends Request
$rules['number'] = 'unique:credits,number,'.$this->id.',id,company_id,'.$this->credit->company_id;
}
$rules['line_items'] = 'array';
return $rules;
}

2
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -55,6 +55,8 @@ class StoreInvoiceRequest extends Request
$rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
$rules['line_items'] = 'array';
return $rules;
}

2
app/Http/Requests/Invoice/UpdateInvoiceRequest.php
View File

@ -54,6 +54,8 @@ class UpdateInvoiceRequest extends Request
$rules['number'] = 'unique:invoices,number,'.$this->id.',id,company_id,'.$this->invoice->company_id;
}
$rules['line_items'] = 'array';
return $rules;
}

2
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -80,7 +80,7 @@ class StorePaymentRequest extends Request
$input['amount'] = $invoices_total - $credits_total;
}
$input['is_manual'] = true;
// $input['is_manual'] = true;
if (! isset($input['date'])) {
$input['date'] = now()->format('Y-m-d');

1
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -94,6 +94,7 @@ class StoreQuoteRequest extends Request
}
$rules['number'] = new UniqueQuoteNumberRule($this->all());
$rules['line_items'] = 'array';
return $rules;
}

2
app/Http/Requests/Quote/UpdateQuoteRequest.php
View File

@ -50,6 +50,8 @@ class UpdateQuoteRequest extends Request
$rules['number'] = 'unique:quotes,number,'.$this->id.',id,company_id,'.$this->quote->company_id;
}
$rules['line_items'] = 'array';
return $rules;
}

2
app/Models/Payment.php
View File

@ -59,7 +59,7 @@ class Payment extends BaseModel
'date',
'transaction_reference',
'number',
'is_manual',
// 'is_manual',
'private_notes',
'custom_value1',
'custom_value2',

1
app/Repositories/PaymentRepository.php
View File

@ -95,6 +95,7 @@ class PaymentRepository extends BaseRepository
/*Fill the payment*/
$payment->fill($data);
$payment->is_manual = true;
$payment->status_id = Payment::STATUS_COMPLETED;
$payment->save();

2
app/Utils/Traits/CleanLineItems.php
View File

@ -21,7 +21,7 @@ trait CleanLineItems
{
public function cleanItems($items) :array
{
if (! isset($items)) {
if (! isset($items) || !is_array($items)) {
return [];
}