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

Merge pull request #6021 from turbo124/v5-develop

Browse Source 
Fixes for reminders
This commit is contained in:
David Bomba 2021-06-15 08:20:11 +10:00 committed by GitHub
commit 35237849ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,11 @@ class ReminderJob implements ShouldQueue
private function processReminders() private function processReminders()
{ {
Invoice::whereDate('next_send_date', '<=', now())->with('invitations')->cursor()->each(function ($invoice) { Invoice::whereDate('next_send_date', '<=', now())
->where('is_deleted', 0)
->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
->where('balance', '>', 0)
->with('invitations')->cursor()->each(function ($invoice) {
if ($invoice->isPayable()) { if ($invoice->isPayable()) {
$reminder_template = $invoice->calculateTemplate('invoice'); $reminder_template = $invoice->calculateTemplate('invoice');

4
app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
View File

@ -58,7 +58,7 @@ class UpdatePaymentMethods
// } // }
private function updateMethods(Customer $customer, Client $client) public function updateMethods(Customer $customer, Client $client)
{ {
$card_methods = PaymentMethod::all([ $card_methods = PaymentMethod::all([
'customer' => $customer->id, 'customer' => $customer->id,
@ -145,7 +145,7 @@ class UpdatePaymentMethods
} }
private function buildPaymentMethodMeta(PaymentMethod $method, GatewayType $type_id) private function buildPaymentMethodMeta(PaymentMethod $method, $type_id)
{ {
switch ($type_id) { switch ($type_id) {

3
app/Services/Invoice/InvoiceService.php
View File

@ -392,7 +392,8 @@ class InvoiceService
$this->invoice->reminder_last_sent = now()->format('Y-m-d'); $this->invoice->reminder_last_sent = now()->format('Y-m-d');
break; break;
default: default:
// code... $this->invoice->reminder1_sent = now()->format('Y-m-d');
$this->invoice->reminder_last_sent = now()->format('Y-m-d');
break; break;
} }

5
app/Services/Invoice/UpdateReminder.php
View File

@ -126,7 +126,10 @@ class UpdateReminder extends AbstractService
$date_collection->push($reminder_date); $date_collection->push($reminder_date);
} }
$this->invoice->next_send_date = $date_collection->sort()->first(); if($date_collection->count() >=1)
$this->invoice->next_send_date = $date_collection->sort()->first();
else
$this->invoice->next_send_date = null;
return $this->invoice; return $this->invoice;
} }