Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for reminders

Browse Source
This commit is contained in:
David Bomba 2024-06-07 20:31:48 +10:00
parent 63e2280228
commit fb24255813
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Jobs/Util/ReminderJob.php
View File

@ -168,11 +168,11 @@ class ReminderJob implements ShouldQueue
$amount = $fees[0]; $amount = $fees[0];
$percent = $fees[1]; $percent = $fees[1];
$temp_invoice_balance = $over_due_invoice->balance; $invoice = false;
if ($amount <= 0 && $percent <= 0) { //2024-06-07 this early return prevented any reminders from sending for users who enabled lock_invoices.
return; if ($amount > 0 || $percent > 0) {
} // return;
$fee = $amount; $fee = $amount;
@ -207,6 +207,11 @@ class ReminderJob implements ShouldQueue
->applyNumber() ->applyNumber()
->markSent() ->markSent()
->save(); ->save();
}
if(!$invoice){
$invoice = $over_due_invoice;
}
$enabled_reminder = 'enable_'.$reminder_template; $enabled_reminder = 'enable_'.$reminder_template;
if ($reminder_template == 'endless_reminder') { if ($reminder_template == 'endless_reminder') {

3
tests/Feature/ReminderTest.php
View File

@ -184,7 +184,7 @@ class ReminderTest extends TestCase
$settings->schedule_reminder1 = 'after_invoice_date'; $settings->schedule_reminder1 = 'after_invoice_date';
$settings->schedule_reminder2 = 'after_invoice_date'; $settings->schedule_reminder2 = 'after_invoice_date';
$settings->schedule_reminder3 = 'after_invoice_date'; $settings->schedule_reminder3 = 'after_invoice_date';
$settings->lock_invoices = true;
$settings->num_days_reminder1 = 5; $settings->num_days_reminder1 = 5;
$settings->num_days_reminder2 = 10; $settings->num_days_reminder2 = 10;
$settings->num_days_reminder3 = 15; $settings->num_days_reminder3 = 15;
@ -231,7 +231,6 @@ class ReminderTest extends TestCase
} }
while($x === false); while($x === false);
$this->assertNotNull($invoice->reminder_last_sent); $this->assertNotNull($invoice->reminder_last_sent);
//check next send date is on day "10" //check next send date is on day "10"