Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 08:02:40 +01:00
Code Issues Releases Activity

Merge branch 'v5-develop' into v5-stable

Browse Source
This commit is contained in:
David Bomba 2021-06-15 11:09:59 +10:00
commit 5fe2f2d24b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.2.2 5.2.3

2
app/PaymentDrivers/Stripe/ImportCustomers.php
View File

@ -56,7 +56,7 @@ class ImportCustomers
} }
/* Now call the update payment methods handler*/ /* Now call the update payment methods handler*/
$this->stripe->updateAllPaymentMethods(); // $this->stripe->updateAllPaymentMethods();
} }

8
app/PaymentDrivers/StripePaymentDriver.php
View File

@ -508,10 +508,10 @@ class StripePaymentDriver extends BaseDriver
* the respective tokens in the system. * the respective tokens in the system.
* *
*/ */
// public function updateAllPaymentMethods() public function updateAllPaymentMethods()
// { {
// return (new UpdatePaymentMethods($this))->run(); return (new UpdatePaymentMethods($this))->run();
// } }
/** /**
* Imports stripe customers and their payment methods * Imports stripe customers and their payment methods

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

@ -126,7 +126,7 @@ class UpdateReminder extends AbstractService
$date_collection->push($reminder_date); $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(); $this->invoice->next_send_date = $date_collection->sort()->first();
else else
$this->invoice->next_send_date = null; $this->invoice->next_send_date = null;

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.2.2', 'app_version' => '5.2.3',
'app_tag' => '5.2.2-release', 'app_tag' => '5.2.3-release',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),