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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-11-19 00:02:01 +02:00
parent 4a0906a92c
commit dede870fed
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Models/Invoice.php
View File

@ -194,13 +194,17 @@ class Invoice extends EntityModel implements BalanceAffecting
public function updatePaidStatus($save = true) public function updatePaidStatus($save = true)
{ {
if ($this->isPaid() && $this->balance > 0) { $statusId = false;
$this->invoice_status_id = ($this->balance == $this->amount ? INVOICE_STATUS_SENT : INVOICE_STATUS_PARTIAL); if ($this->amount > 0 && $this->balance == 0) {
if ($save) { $statusId = INVOICE_STATUS_PAID;
$this->save(); } elseif ($this->balance > 0 && $this->balance < $this->amount) {
$statusId = INVOICE_STATUS_PARTIAL;
} elseif ($this->isPartial() && $this->balance > 0) {
$statusId = ($this->balance == $this->amount ? INVOICE_STATUS_SENT : INVOICE_STATUS_PARTIAL);
} }
} elseif ($this->invoice_status_id && $this->amount > 0 && $this->balance == 0 && $this->invoice_status_id != INVOICE_STATUS_PAID) {
$this->invoice_status_id = INVOICE_STATUS_PAID; if ($statusId && $statusId != $this->invoice_status_id) {
$this->invoice_status_id = $statusId;
if ($save) { if ($save) {
$this->save(); $this->save();
} }
@ -263,6 +267,11 @@ class Invoice extends EntityModel implements BalanceAffecting
return $this->invoice_status_id >= INVOICE_STATUS_VIEWED; return $this->invoice_status_id >= INVOICE_STATUS_VIEWED;
} }
public function isPartial()
{
return $this->invoice_status_id >= INVOICE_STATUS_PARTIAL;
}
public function isPaid() public function isPaid()
{ {
return $this->invoice_status_id >= INVOICE_STATUS_PAID; return $this->invoice_status_id >= INVOICE_STATUS_PAID;