From 7da27b5955b4bfde845b0e9f4813f0ae9ecdddcb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 27 Jun 2021 07:32:44 +1000
Subject: [PATCH 1/3] Fixes for duplicated register header

---
 resources/views/portal/ninja2020/auth/register.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 6e598c7058f2..4e57cc1e30a4 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -8,7 +8,6 @@
                 <img class="h-32 w-auto" src="{{ $company->present()->logo() }}" alt="{{ ctrans('texts.logo') }}">
             </div>
             <h1 class="text-center text-3xl mt-8">{{ ctrans('texts.register') }}</h1>
-            <h1 class="text-center text-3xl mt-8">{{ ctrans('texts.register') }}</h1>
             <p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p>
 
             <form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }">

From 34bd3411826569df0b727ed8b96b822af1d912fb Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sun, 27 Jun 2021 12:12:39 +1000
Subject: [PATCH 2/3] Fixes for endless reminder pulling in the wrong scheduled
 interval

---
 app/Services/Invoice/UpdateReminder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 8037b9308e71..dd7142179931 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -129,7 +129,7 @@ class UpdateReminder extends AbstractService
 
         if ($this->invoice->last_sent_date &&
             (int)$this->settings->endless_reminder_frequency_id > 0) {
-            $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int)$this->settings->num_days_reminder3)->addSeconds($offset);
+            $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int)$this->settings->endless_reminder_frequency_id)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)));
                 $date_collection->push($reminder_date); 

From 2bf90ea52926a906228deb99211166f27d896f55 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 27 Jun 2021 14:52:15 +1000
Subject: [PATCH 3/3] Fixes for check data script

---
 app/Console/Commands/CheckData.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 797d74f69066..34fc57a61452 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -84,6 +84,8 @@ class CheckData extends Command
 
     public function handle()
     {
+        $time_start = microtime(true); 
+
         $database_connection = $this->option('database') ? $this->option('database') : 'Connected to Default DB';
         $fix_status = $this->option('fix') ? "Fixing Issues" : "Just checking issues ";
 
@@ -107,6 +109,8 @@ class CheckData extends Command
         }
 
         $this->logMessage('Done: '.strtoupper($this->isValid ? Account::RESULT_SUCCESS : Account::RESULT_FAILURE));
+        $this->logMessage('Total execution time in seconds: ' . (microtime(true) - $time_start));
+
         $errorEmail = config('ninja.error_email');
 
         if ($errorEmail) {
@@ -315,13 +319,24 @@ class CheckData extends Command
         Client::withTrashed()->where('is_deleted', 0)->cursor()->each(function ($client) use ($credit_total_applied) {
             $total_invoice_payments = 0;
 
-            foreach ($client->invoices()->where('is_deleted', false)->where('status_id', '>', 1)->get() as $invoice) {
+            //commented out 27/06/2021 - client paid to date always increments to the total amount the client has paid
+            // foreach ($client->invoices()->where('is_deleted', false)->where('status_id', '>', 1)->get() as $invoice) {
 
-                $total_amount = $invoice->payments()->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->get()->sum('pivot.amount');
-                $total_refund = $invoice->payments()->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->get()->sum('pivot.refunded');
+            //     $total_amount = $invoice->payments()->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->get()->sum('pivot.amount');
+            //     $total_refund = $invoice->payments()->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->get()->sum('pivot.refunded');
 
-                $total_invoice_payments += ($total_amount - $total_refund);
-            }
+            //     $total_invoice_payments += ($total_amount - $total_refund);
+            // }
+
+            //commented IN 27/06/2021 - sums ALL client payments
+            $p = Payment::where('client_id', $client->id)
+            ->where('is_deleted', 0)
+            ->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED]);
+
+            $total_amount = $p->sum('amount');
+            $total_refund = $p->sum('refunded');
+
+            $total_invoice_payments += ($total_amount - $total_refund);
 
             // 10/02/21
             foreach ($client->payments as $payment) {