From 6860ea979557af32274563893bba533b34a62fe3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 16 Dec 2021 13:04:46 +1100 Subject: [PATCH 1/2] ReRoute pay now links to show invoice if no gateways are present --- app/Http/Controllers/ClientPortal/InvitationController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index b7d12f891a..bc0a2b5cc6 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -224,7 +224,7 @@ class InvitationController extends Controller $gateways = $invitation->contact->client->service()->getPaymentMethods($amount); - if(is_array($gateways)) + if(is_array($gateways) && count($gateways) >=1) { $data = [ @@ -241,6 +241,11 @@ class InvitationController extends Controller return (new InstantPayment($request))->run(); } + $entity = 'invoice'; + + if($invoice && is_array($gateways) && count($gateways) == 0) + return redirect()->route('client.invoice.show', ['invoice' => $this->encodePrimaryKey($invitation->invoice_id)]); + abort(404, "Invoice not found"); } } From f2366df99004d0056f5ccf610b06d526375bd660 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 17 Dec 2021 07:11:36 +1100 Subject: [PATCH 2/2] v5.3.36 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 8e160ccf5b..9af2414c2c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.35 \ No newline at end of file +5.3.36 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 5015fcc8a1..139158bafb 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.3.35', - 'app_tag' => '5.3.35', + 'app_version' => '5.3.36', + 'app_tag' => '5.3.36', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),