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

Ensure freshness of models

Browse Source
This commit is contained in:
David Bomba 2022-05-27 09:51:54 +10:00
parent 43031fd9ce
commit e071c3aae7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/InvoiceController.php
View File

@ -220,8 +220,6 @@ class InvoiceController extends BaseController
public function store(StoreInvoiceRequest $request) public function store(StoreInvoiceRequest $request)
{ {
// $client = Client::find($request->input('client_id'));
$invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id)); $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
$invoice = $invoice->service() $invoice = $invoice->service()

2
app/Http/ValidationRules/Payment/ValidInvoicesRules.php
View File

@ -62,7 +62,7 @@ class ValidInvoicesRules implements Rule
return false; return false;
} }
$inv = Invoice::whereId($invoice['invoice_id'])->first(); $inv = Invoice::withTrashed()->whereId($invoice['invoice_id'])->first();
if (! $inv) { if (! $inv) {

3
app/Services/Invoice/HandleCancellation.php
View File

@ -51,6 +51,7 @@ class HandleCancellation extends AbstractService
//adjust client balance //adjust client balance
$this->invoice->client->service()->updateBalance($adjustment)->save(); $this->invoice->client->service()->updateBalance($adjustment)->save();
$this->invoice->fresh();
$this->invoice->service()->workFlow()->save(); $this->invoice->service()->workFlow()->save();
@ -78,6 +79,7 @@ class HandleCancellation extends AbstractService
$adjustment = $cancellation->adjustment * -1; $adjustment = $cancellation->adjustment * -1;
$this->invoice->ledger()->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} reversal"); $this->invoice->ledger()->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} reversal");
$this->invoice->fresh();
/* Reverse the invoice status and balance */ /* Reverse the invoice status and balance */
$this->invoice->balance += $adjustment; $this->invoice->balance += $adjustment;
@ -90,6 +92,7 @@ class HandleCancellation extends AbstractService
unset($backup->cancellation); unset($backup->cancellation);
$this->invoice->backup = $backup; $this->invoice->backup = $backup;
$this->invoice->saveQuietly(); $this->invoice->saveQuietly();
$this->invoice->fresh();
return $this->invoice; return $this->invoice;
} }