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 restore invoice numbering

Browse Source
This commit is contained in:
David Bomba 2021-05-21 07:58:46 +10:00
parent c0e258eabb
commit 0b7891e24f
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/LicenseController.php
View File

@ -107,6 +107,12 @@ class LicenseController extends BaseController
'errors' => new stdClass,
];
$account->plan_term = Account::PLAN_TERM_YEARLY;
$account->plan_paid = null;
$account->plan_expires = null;
$account->plan = Account::PLAN_FREE;
$account->save();
return response()->json($error, 400);
} else {
$account = auth()->user()->company()->account;

4
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -116,10 +116,12 @@ class NinjaMailerJob implements ShouldQueue
} catch (\Exception $e) {
nlog("error failed with {$e->getMessage()}");
// nlog($e);
if($this->nmo->entity)
$this->entityEmailFailed($e->getMessage());
if(Ninja::isHosted())
app('sentry')->captureException($e);
}
}

3
app/Jobs/Util/Import.php
View File

@ -1618,6 +1618,9 @@ class Import implements ShouldQueue
->batch();
info(print_r($exception->getMessage(), 1));
if(Ninja::isHosted())
app('sentry')->captureException($exception);
}

18
app/Services/Invoice/HandleRestore.php
View File

@ -13,9 +13,13 @@ namespace App\Services\Invoice;
use App\Models\Invoice;
use App\Services\AbstractService;
use App\Utils\Ninja;
use App\Utils\Traits\GeneratesCounter;
class HandleRestore extends AbstractService
{
use GeneratesCounter;
private $invoice;
private $payment_total = 0;
@ -100,10 +104,22 @@ class HandleRestore extends AbstractService
}
try {
$exists = Invoice::where(['company_id' => $this->invoice->company_id, 'number' => $new_invoice_number])->exists();
if($exists)
$this->invoice->number = $this->getNextInvoiceNumber($this->invoice->client, $this->invoice, $this->invoice->recurring_id);
else
$this->invoice->number = $new_invoice_number;
$this->invoice->save();
} catch (\Exception $e) {
info("I could not wind back the invoice number");
nlog("I could not wind back the invoice number");
if(Ninja::isHosted()){
\Sentry\captureMessage("I could not wind back the invoice number");
app('sentry')->captureException($e);
}
}
}
}