From c1e080acd504dce1f838fba1dc1a8a75e5b12590 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 20 Oct 2020 12:30:55 +1100
Subject: [PATCH] Recurring invoice balance fix

---
 app/Helpers/Invoice/InvoiceSum.php              | 12 ++++++++++++
 app/Helpers/Invoice/InvoiceSumInclusive.php     | 12 ++++++++++++
 app/Repositories/RecurringInvoiceRepository.php |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index c21308cdc..3ee3c8d9f 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -187,6 +187,18 @@ class InvoiceSum
         return $this->invoice;
     }
 
+    public function getRecurringInvoice()
+    {
+        
+        $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+        $this->invoice->total_taxes = $this->getTotalTaxes();
+        $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+
+        $this->invoice->save();
+
+        return $this->invoice;
+    }
+
     /**
      * Build $this->invoice variables after
      * calculations have been performed.
diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php
index 3887f9680..307ad0704 100644
--- a/app/Helpers/Invoice/InvoiceSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceSumInclusive.php
@@ -174,6 +174,18 @@ class InvoiceSumInclusive
         return $this;
     }
 
+    public function getRecurringInvoice()
+    {
+        
+        $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+        $this->invoice->total_taxes = $this->getTotalTaxes();
+        $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+
+        $this->invoice->save();
+
+        return $this->invoice;
+    }
+
     public function getInvoice()
     {
         //Build invoice values here and return Invoice
diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php
index b88aca5e8..117c8dc5a 100644
--- a/app/Repositories/RecurringInvoiceRepository.php
+++ b/app/Repositories/RecurringInvoiceRepository.php
@@ -38,7 +38,7 @@ class RecurringInvoiceRepository extends BaseRepository
                 ->createInvitations()
                 ->save();
         
-        $invoice = $invoice_calc->build()->getInvoice();
+        $invoice = $invoice_calc->build()->getRecurringInvoice();
 
         return $invoice;
     }