From 887bc3d4a6781f76cb4087c99929c7ef7f18f7b1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Jun 2021 08:06:01 +1000
Subject: [PATCH 1/2] Fixes for reminders

---
 app/Jobs/Util/ReminderJob.php           | 6 +++++-
 app/Services/Invoice/InvoiceService.php | 3 ++-
 app/Services/Invoice/UpdateReminder.php | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php
index cb1068cc0d..71300863de 100644
--- a/app/Jobs/Util/ReminderJob.php
+++ b/app/Jobs/Util/ReminderJob.php
@@ -53,7 +53,11 @@ class ReminderJob implements ShouldQueue
 
     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()) {
                 $reminder_template = $invoice->calculateTemplate('invoice');
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 8ac66ed6c7..304d83233e 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -392,7 +392,8 @@ class InvoiceService
                 $this->invoice->reminder_last_sent = now()->format('Y-m-d');
                 break;
             default:
-                // code...
+                $this->invoice->reminder1_sent = now()->format('Y-m-d');
+                $this->invoice->reminder_last_sent = now()->format('Y-m-d');
                 break;
         }
 
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 5f2090a4cd..f08d873b9d 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -126,8 +126,11 @@ class UpdateReminder extends AbstractService
                 $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;
     }
 }
\ No newline at end of file

From d582e6796283e985fea12da8d18a038d602b0fce Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Jun 2021 08:19:23 +1000
Subject: [PATCH 2/2]  Fixes for Stripe import customers

---
 app/PaymentDrivers/Stripe/UpdatePaymentMethods.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
index 8d4e975796..3e83847a97 100644
--- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
+++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
@@ -58,7 +58,7 @@ class UpdatePaymentMethods
 
     // }
 
-    private function updateMethods(Customer $customer, Client $client)
+    public function updateMethods(Customer $customer, Client $client)
     {
                 $card_methods = PaymentMethod::all([
                     '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) {