tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor isInvoice to isStandard

Browse source
This commit is contained in:
Hillel Coren 2017-05-22 11:22:34 +03:00
parent 8227726f50
commit b5ed7d9896
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/InvoiceApiController.php
View file

@ -185,7 +185,7 @@ class InvoiceApiController extends BaseAPIController
$invoice = $this->invoiceService->save($data);
$payment = false;
if ($invoice->isInvoice()) {
if ($invoice->isStandard()) {
if ($isAutoBill) {
$payment = $this->paymentService->autoBillInvoice($invoice);
} elseif ($isPaid) {

4
app/Models/Invoice.php
View file

@ -430,7 +430,7 @@ class Invoice extends EntityModel implements BalanceAffecting
/**
* @return bool
*/
public function isInvoice()
public function isStandard()
{
return $this->isType(INVOICE_TYPE_STANDARD) && ! $this->is_recurring;
}
@ -611,7 +611,7 @@ class Invoice extends EntityModel implements BalanceAffecting
public function canBePaid()
{
return floatval($this->balance) != 0 && ! $this->is_deleted && $this->isInvoice();
return floatval($this->balance) != 0 && ! $this->is_deleted && $this->isStandard();
}
public static function calcStatusLabel($status, $class, $entityType, $quoteInvoiceId)