From 31c8eb1a19d79f57ca3e31c4eac275e59b05d8af Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 15 Jun 2021 11:09:12 +1000 Subject: [PATCH 1/2] Fixes for stripe import customers --- app/PaymentDrivers/Stripe/ImportCustomers.php | 2 +- app/PaymentDrivers/StripePaymentDriver.php | 8 ++++---- app/Services/Invoice/UpdateReminder.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/PaymentDrivers/Stripe/ImportCustomers.php b/app/PaymentDrivers/Stripe/ImportCustomers.php index 3d6ffc32b5..f1bd804aaa 100644 --- a/app/PaymentDrivers/Stripe/ImportCustomers.php +++ b/app/PaymentDrivers/Stripe/ImportCustomers.php @@ -56,7 +56,7 @@ class ImportCustomers } /* Now call the update payment methods handler*/ - $this->stripe->updateAllPaymentMethods(); + // $this->stripe->updateAllPaymentMethods(); } diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index 818e8aa63f..d91b224134 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -508,10 +508,10 @@ class StripePaymentDriver extends BaseDriver * the respective tokens in the system. * */ - // public function updateAllPaymentMethods() - // { - // return (new UpdatePaymentMethods($this))->run(); - // } + public function updateAllPaymentMethods() + { + return (new UpdatePaymentMethods($this))->run(); + } /** * Imports stripe customers and their payment methods diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php index f08d873b9d..46937ec442 100644 --- a/app/Services/Invoice/UpdateReminder.php +++ b/app/Services/Invoice/UpdateReminder.php @@ -126,7 +126,7 @@ class UpdateReminder extends AbstractService $date_collection->push($reminder_date); } - if($date_collection->count() >=1) + if($date_collection->count() >=1 && $date_collection->sort()->first()->gte(now())) $this->invoice->next_send_date = $date_collection->sort()->first(); else $this->invoice->next_send_date = null; From 7a1fc28de7aa5c2d1b1fc255981cefd79bc666c9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 15 Jun 2021 11:09:27 +1000 Subject: [PATCH 2/2] v5.2.3 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index fb467b1573..fff6bf312b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.2.2 \ No newline at end of file +5.2.3 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index dae4a2fdcc..8e1d266f89 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.2.2', - 'app_tag' => '5.2.2-release', + 'app_version' => '5.2.3', + 'app_tag' => '5.2.3-release', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),