From b4f375d8770c9dea99f5538d4ee464c98ccd50b6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 28 Dec 2021 20:57:48 +1100 Subject: [PATCH] Minor fixes for invoice service --- app/Factory/RecurringInvoiceFactory.php | 2 +- app/Services/Invoice/InvoiceService.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Factory/RecurringInvoiceFactory.php b/app/Factory/RecurringInvoiceFactory.php index 4f246f8e89..7658938a8d 100644 --- a/app/Factory/RecurringInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceFactory.php @@ -22,7 +22,7 @@ class RecurringInvoiceFactory $invoice->discount = 0; $invoice->is_amount_discount = true; $invoice->po_number = ''; - $invoice->number = ''; + // $invoice->number = ''; $invoice->footer = ''; $invoice->terms = ''; $invoice->public_notes = ''; diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index a6d40175d2..6e0e59b505 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -300,10 +300,10 @@ class InvoiceService return $this; if($this->invoice->balance == 0){ - $this->setStatus(Invoice::STATUS_PAID); + $this->invoice->status_id = Invoice::STATUS_PAID; } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) { - $this->setStatus(Invoice::STATUS_PARTIAL); + $this->invoice->status_id = Invoice::STATUS_PARTIAL; } return $this; @@ -320,8 +320,6 @@ class InvoiceService return $item; })->toArray(); - //$this->invoice = $this->invoice->calc()->getInvoice(); - $this->deletePdf(); return $this;