Fixes for reminders

This commit is contained in:
David Bomba 2022-04-20 11:38:01 +10:00
parent a7b8845edb
commit fde59d0cd8
3 changed files with 14 additions and 5 deletions

View File

@ -1 +1 @@
5.3.80
5.3.81

View File

@ -82,9 +82,18 @@ class ReminderJob implements ShouldQueue
$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);

View File

@ -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', ''),