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

Small fix for edge case where invoice may appear to be paid

Browse Source
This commit is contained in:
David Bomba 2021-08-29 21:17:27 +10:00
parent 0a25df317e
commit ac763b3a0a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Services/Invoice/InvoiceService.php
View File

@ -192,6 +192,8 @@ class InvoiceService
public function handleCancellation() public function handleCancellation()
{ {
$this->removeUnpaidGatewayFees();
$this->invoice = (new HandleCancellation($this->invoice))->run(); $this->invoice = (new HandleCancellation($this->invoice))->run();
return $this; return $this;
@ -199,6 +201,8 @@ class InvoiceService
public function markDeleted() public function markDeleted()
{ {
$this->removeUnpaidGatewayFees();
$this->invoice = (new MarkInvoiceDeleted($this->invoice))->run(); $this->invoice = (new MarkInvoiceDeleted($this->invoice))->run();
return $this; return $this;
@ -213,6 +217,8 @@ class InvoiceService
public function reverseCancellation() public function reverseCancellation()
{ {
$this->removeUnpaidGatewayFees();
$this->invoice = (new HandleCancellation($this->invoice))->reverse(); $this->invoice = (new HandleCancellation($this->invoice))->reverse();
return $this; return $this;
@ -278,11 +284,14 @@ class InvoiceService
public function updateStatus() public function updateStatus()
{ {
if ((int)$this->invoice->balance == 0) { if($this->invoice->status_id == Invoice::STATUS_DRAFT)
return $this;
// if ((int)$this->invoice->balance == 0) {
$this->setStatus(Invoice::STATUS_PAID)->workFlow(); // $this->setStatus(Invoice::STATUS_PAID)->workFlow();
// InvoiceWorkflowSettings::dispatchNow($this->invoice);
} // }
if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) { if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
$this->setStatus(Invoice::STATUS_PARTIAL); $this->setStatus(Invoice::STATUS_PARTIAL);