From fde59d0cd8fabfcee3c090ff6132f21e74122b72 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 20 Apr 2022 11:38:01 +1000
Subject: [PATCH] Fixes for reminders

---
 VERSION.txt                   |  2 +-
 app/Jobs/Util/ReminderJob.php | 13 +++++++++++--
 config/ninja.php              |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 9f7319154f05..a7e0a988addf 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.80
\ No newline at end of file
+5.3.81
\ No newline at end of file
diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php
index edb96ff59f0e..4b4bdb159b7e 100644
--- a/app/Jobs/Util/ReminderJob.php
+++ b/app/Jobs/Util/ReminderJob.php
@@ -81,10 +81,19 @@ class ReminderJob implements ShouldQueue
                 $invoice = $this->calcLateFee($invoice, $reminder_template);
 
                 $invoice->service()->touchPdf();
-                
+
+                //20-04-2022 fixes for endless reminders - generic template naming was wrong
+                $enabled_reminder = "enable_".$reminder_template;
+   
+                if($reminder_template == 'endless_reminder')
+                 $enabled_reminder = 'enable_reminder_endless';
+
                 //check if this reminder needs to be emailed
                 //15-01-2022 - insert addition if block if send_reminders is definitely set
-                if(in_array($reminder_template, ['reminder1','reminder2','reminder3','reminder_endless']) && $invoice->client->getSetting("enable_".$reminder_template) && $invoice->client->getSetting("send_reminders") && $invoice->company->account->isPaidHostedClient())
+                if(in_array($reminder_template, ['reminder1','reminder2','reminder3','reminder_endless','endless_reminder']) && 
+                    $invoice->client->getSetting($enabled_reminder) && 
+                    $invoice->client->getSetting("send_reminders") && 
+                    (Ninja::isSelfHost() || $invoice->company->account->isPaidHostedClient()))
                 {
                     $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
                         EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
diff --git a/config/ninja.php b/config/ninja.php
index e9e48c3786d8..5cd221c4039e 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.80',
-    'app_tag' => '5.3.80',
+    'app_version' => '5.3.81',
+    'app_tag' => '5.3.81',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),