Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 16:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for quote reminder dates

Browse Source
This commit is contained in:
David Bomba 2024-06-24 10:22:16 +10:00
parent ffaf5259e6
commit 6ceef3695d
3 changed files with 109 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Quote.php
View File

@ -434,7 +434,7 @@ class Quote extends BaseModel
/** /**
* @return bool * @return bool
*/ */
public function isRemindable(): bool public function canRemind(): bool
{ {
if (in_array($this->status_id, [self::STATUS_DRAFT, self::STATUS_APPROVED, self::STATUS_CONVERTED]) || $this->is_deleted) if (in_array($this->status_id, [self::STATUS_DRAFT, self::STATUS_APPROVED, self::STATUS_CONVERTED]) || $this->is_deleted)
return false; return false;

146
app/Services/Quote/UpdateReminder.php
View File

@ -29,7 +29,7 @@ class UpdateReminder extends AbstractService
$this->settings = $this->quote->client->getMergedSettings(); $this->settings = $this->quote->client->getMergedSettings();
} }
if (! $this->quote->isRemindable()) { if (!$this->quote->canRemind()) {
$this->quote->next_send_date = null; $this->quote->next_send_date = null;
$this->quote->saveQuietly(); $this->quote->saveQuietly();
@ -45,8 +45,8 @@ class UpdateReminder extends AbstractService
$date_collection = collect(); $date_collection = collect();
if (is_null($this->quote->reminder1_sent) && if (is_null($this->quote->reminder1_sent) &&
$this->settings->schedule_reminder1 == 'after_quote_date') { $this->settings->quote_schedule_reminder1 == 'after_quote_date') {
$reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->num_days_reminder1); $reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->quote_num_days_reminder1);
if ($reminder_date->gt(now())) { if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); $date_collection->push($reminder_date);
@ -55,9 +55,9 @@ class UpdateReminder extends AbstractService
if (is_null($this->quote->reminder1_sent) && if (is_null($this->quote->reminder1_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder1 == 'before_valid_until_date') { $this->settings->quote_schedule_reminder1 == 'before_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->num_days_reminder1); $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->quote_num_days_reminder1);
// nlog("1. {$reminder_date->format('Y-m-d')}"); // nlog("1. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { if ($reminder_date->gt(now())) {
@ -67,10 +67,10 @@ class UpdateReminder extends AbstractService
if (is_null($this->quote->reminder1_sent) && if (is_null($this->quote->reminder1_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder1 == 'after_valid_until_date') { $this->settings->quote_schedule_reminder1 == 'after_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->num_days_reminder1); $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->quote_num_days_reminder1);
// nlog("2. {$reminder_date->format('Y-m-d')}"); // nlog("2. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { if ($reminder_date->gt(now())) {
@ -78,89 +78,89 @@ class UpdateReminder extends AbstractService
} }
} }
if (is_null($this->quote->reminder2_sent) && // if (is_null($this->quote->reminder2_sent) &&
$this->settings->schedule_reminder2 == 'after_valid_until_date') { // $this->settings->schedule_reminder2 == 'after_valid_until_date') {
$reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->num_days_reminder2); // $reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->num_days_reminder2);
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if (is_null($this->quote->reminder2_sent) && // if (is_null($this->quote->reminder2_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && // ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder2 == 'before_valid_until_date') { // $this->settings->schedule_reminder2 == 'before_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; // $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->num_days_reminder2); // $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->num_days_reminder2);
// nlog("3. {$reminder_date->format('Y-m-d')}"); // // nlog("3. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if (is_null($this->quote->reminder2_sent) && // if (is_null($this->quote->reminder2_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && // ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder2 == 'after_valid_until_date') { // $this->settings->schedule_reminder2 == 'after_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; // $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->num_days_reminder2); // $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->num_days_reminder2);
// nlog("4. {$reminder_date->format('Y-m-d')}"); // // nlog("4. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if (is_null($this->quote->reminder3_sent) && // if (is_null($this->quote->reminder3_sent) &&
$this->settings->schedule_reminder3 == 'after_valid_until_date') { // $this->settings->schedule_reminder3 == 'after_valid_until_date') {
$reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->num_days_reminder3); // $reminder_date = Carbon::parse($this->quote->date)->startOfDay()->addDays($this->settings->num_days_reminder3);
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if (is_null($this->quote->reminder3_sent) && // if (is_null($this->quote->reminder3_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && // ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder3 == 'before_valid_until_date') { // $this->settings->schedule_reminder3 == 'before_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; // $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->num_days_reminder3); // $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->subDays($this->settings->num_days_reminder3);
// nlog("5. {$reminder_date->format('Y-m-d')}"); // // nlog("5. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if (is_null($this->quote->reminder3_sent) && // if (is_null($this->quote->reminder3_sent) &&
($this->quote->partial_due_date || $this->quote->due_date) && // ($this->quote->partial_due_date || $this->quote->due_date) &&
$this->settings->schedule_reminder3 == 'after_valid_until_date') { // $this->settings->schedule_reminder3 == 'after_valid_until_date') {
$partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date; // $partial_or_due_date = ($this->quote->partial > 0 && isset($this->quote->partial_due_date)) ? $this->quote->partial_due_date : $this->quote->due_date;
$reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->num_days_reminder3); // $reminder_date = Carbon::parse($partial_or_due_date)->startOfDay()->addDays($this->settings->num_days_reminder3);
// nlog("6. {$reminder_date->format('Y-m-d')}"); // // nlog("6. {$reminder_date->format('Y-m-d')}");
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
if ($this->quote->last_sent_date && // if ($this->quote->last_sent_date &&
$this->settings->enable_reminder_endless && // $this->settings->enable_reminder_endless &&
($this->quote->reminder1_sent || $this->settings->schedule_reminder1 == "" || !$this->settings->enable_reminder1) && // ($this->quote->reminder1_sent || $this->settings->schedule_reminder1 == "" || !$this->settings->enable_reminder1) &&
($this->quote->reminder2_sent || $this->settings->schedule_reminder2 == "" || !$this->settings->enable_reminder2) && // ($this->quote->reminder2_sent || $this->settings->schedule_reminder2 == "" || !$this->settings->enable_reminder2) &&
($this->quote->reminder3_sent || $this->settings->schedule_reminder3 == "" || !$this->settings->enable_reminder3)) { // ($this->quote->reminder3_sent || $this->settings->schedule_reminder3 == "" || !$this->settings->enable_reminder3)) {
$reminder_date = $this->addTimeInterval($this->quote->last_sent_date, (int) $this->settings->endless_reminder_frequency_id); // $reminder_date = $this->addTimeInterval($this->quote->last_sent_date, (int) $this->settings->endless_reminder_frequency_id);
if ($reminder_date) { // if ($reminder_date) {
if ($reminder_date->gt(now())) { // if ($reminder_date->gt(now())) {
$date_collection->push($reminder_date); // $date_collection->push($reminder_date);
} // }
} // }
} // }
if ($date_collection->count() >= 1 && $date_collection->sort()->first()->gte(now())) { if ($date_collection->count() >= 1 && $date_collection->sort()->first()->gte(now())) {
$this->quote->next_send_date = $date_collection->sort()->first()->addSeconds($offset); $this->quote->next_send_date = $date_collection->sort()->first()->addSeconds($offset);

40
tests/Feature/QuoteReminderTest.php
View File

@ -160,12 +160,9 @@ class QuoteReminderTest extends TestCase
} }
public function testReminderInThePast() public function testNullReminder()
{ {
$translations = new \stdClass;
$translations->late_fee_added = "Fee added :date";
$settings = $this->company->settings; $settings = $this->company->settings;
$settings->enable_quote_reminder1 = false; $settings->enable_quote_reminder1 = false;
$settings->quote_schedule_reminder1 = ''; $settings->quote_schedule_reminder1 = '';
@ -183,6 +180,39 @@ class QuoteReminderTest extends TestCase
$this->quote = $this->quote->fresh(); $this->quote = $this->quote->fresh();
$this->assertNull($this->quote->next_send_date); $this->assertNull($this->quote->next_send_date);
} }
public function testBeforeValidReminder()
{
$settings = $this->company->settings;
$settings->enable_quote_reminder1 = true;
$settings->quote_schedule_reminder1 = 'before_valid_until_date';
$settings->quote_num_days_reminder1 = 1;
$this->buildData(($settings));
$this->quote->date = now()->addMonth()->format('Y-m-d');
$this->quote->partial_due_date = null;
$this->quote->due_date = now()->addMonths(2)->format('Y-m-d');
$this->quote->last_sent_date = null;
$this->quote->next_send_date = null;
$this->quote->save();
$this->assertTrue($this->quote->canRemind());
$this->quote->service()->setReminder($settings)->save();
$this->quote = $this->quote->fresh();
$this->assertNotNull($this->quote->next_send_date);
nlog($this->quote->next_send_date);
$this->assertEquals(now()->addMonths(2)->subDay()->format('Y-m-d'), \Carbon\Carbon::parse($this->quote->next_send_date)->addSeconds($this->quote->client->timezone_offset())->format('Y-m-d'));
}
} }