Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 00:44:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for DB::rollBack

Browse Source
This commit is contained in:
David Bomba 2021-05-26 17:04:29 +10:00
parent ee9b3a484f
commit b82cdb6b77
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/ValidationRules/Invoice/InvoiceBalanceSanity.php
View File

@ -57,13 +57,13 @@ class InvoiceBalanceSanity implements Rule
private function checkIfInvoiceBalanceIsSane() : bool private function checkIfInvoiceBalanceIsSane() : bool
{ {
$this->invoice->line_items = $this->input['line_items']; DB::connection(config('database.default'))->beginTransaction();
DB::beginTransaction(); $this->invoice = Invoice::on(config('database.default'))->find($this->invoice->id);
$this->invoice->line_items = $this->input['line_items'];
$temp_invoice = $this->invoice->calc()->getTempEntity();
$temp_invoice = $this->invoice->calc()->getTempEntity(); DB::connection(config('database.default'))->rollBack();
DB::rollBack();
if($temp_invoice->balance < 0){ if($temp_invoice->balance < 0){
$this->message = 'Invoice balance cannot go negative'; $this->message = 'Invoice balance cannot go negative';
@ -71,7 +71,7 @@ class InvoiceBalanceSanity implements Rule
} }
return true; return true;
} }
} }

4
app/Repositories/BaseRepository.php
View File

@ -305,6 +305,10 @@ class BaseRepository
/* Perform model specific tasks */ /* Perform model specific tasks */
if ($model instanceof Invoice) { if ($model instanceof Invoice) {
nlog("Finished amount = " . $state['finished_amount']);
nlog("Starting amount = " . $state['starting_amount']);
nlog("Diff = " . ($state['finished_amount'] - $state['starting_amount']));
if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) { if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {