Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix invoice status issue with API

Browse Source
This commit is contained in:
Hillel Coren 2017-06-14 12:42:33 +03:00
parent 1eb6cd33f2
commit 46c008477e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/CheckData.php
View File

@ -117,6 +117,10 @@ class CheckData extends Command
$this->logMessage(count($invoices) . ' draft sent invoices'); $this->logMessage(count($invoices) . ' draft sent invoices');
if (count($invoices) > 0) {
$this->isValid = false;
}
if ($this->option('fix') == 'true') { if ($this->option('fix') == 'true') {
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
if ($invoice->is_deleted) { if ($invoice->is_deleted) {

2
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -412,12 +412,14 @@ class InvoiceRepository extends BaseRepository
$invoice->invoice_date = Utils::toSqlDate($data['invoice_date']); $invoice->invoice_date = Utils::toSqlDate($data['invoice_date']);
} }
/*
if (isset($data['invoice_status_id'])) { if (isset($data['invoice_status_id'])) {
if ($data['invoice_status_id'] == 0) { if ($data['invoice_status_id'] == 0) {
$data['invoice_status_id'] = INVOICE_STATUS_DRAFT; $data['invoice_status_id'] = INVOICE_STATUS_DRAFT;
} }
$invoice->invoice_status_id = $data['invoice_status_id']; $invoice->invoice_status_id = $data['invoice_status_id'];
} }
*/
if ($invoice->is_recurring) { if ($invoice->is_recurring) {
if (! $isNew && isset($data['start_date']) && $invoice->start_date && $invoice->start_date != Utils::toSqlDate($data['start_date'])) { if (! $isNew && isset($data['start_date']) && $invoice->start_date && $invoice->start_date != Utils::toSqlDate($data['start_date'])) {