Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Fixes for reminder templates

Browse Source
This commit is contained in:
David Bomba 2020-07-08 13:17:25 +10:00
parent 6718915a9c
commit 2e03b1e6d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Invoice/TriggeredActions.php
View File

@ -44,7 +44,7 @@ class TriggeredActions extends AbstractService
{ {
if($this->request->has('auto_bill')) { if($this->request->has('auto_bill')) {
$this->invoice->service()->autoBill()->save();
} }
if($this->request->has('paid') && (bool)$this->request->input('paid') !== false) { if($this->request->has('paid') && (bool)$this->request->input('paid') !== false) {

6
app/Utils/Traits/MakesReminders.php
View File

@ -193,17 +193,17 @@ trait MakesReminders
$client->getSetting('schedule_reminder1'), $client->getSetting('schedule_reminder1'),
$client->getSetting('num_days_reminder1') $client->getSetting('num_days_reminder1')
)) { )) {
return 'template1'; return 'reminder1';
} elseif ($client->getSetting('enable_reminder2') !== false && $this->inReminderWindow( } elseif ($client->getSetting('enable_reminder2') !== false && $this->inReminderWindow(
$client->getSetting('schedule_reminder2'), $client->getSetting('schedule_reminder2'),
$client->getSetting('num_days_reminder2') $client->getSetting('num_days_reminder2')
)) { )) {
return 'template2'; return 'reminder2';
} elseif ($client->getSetting('enable_reminder3') !== false && $this->inReminderWindow( } elseif ($client->getSetting('enable_reminder3') !== false && $this->inReminderWindow(
$client->getSetting('schedule_reminder3'), $client->getSetting('schedule_reminder3'),
$client->getSetting('num_days_reminder3') $client->getSetting('num_days_reminder3')
)) { )) {
return 'template3'; return 'reminder3';
} else { } else {
return 'invoice'; return 'invoice';
} }