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 #7042 from turbo124/v5-develop

Browse Source 
v5.3.36
This commit is contained in:
David Bomba 2021-12-17 07:11:52 +11:00 committed by GitHub
commit c6c4e08c03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.35 5.3.36

7
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -224,7 +224,7 @@ class InvitationController extends Controller
$gateways = $invitation->contact->client->service()->getPaymentMethods($amount); $gateways = $invitation->contact->client->service()->getPaymentMethods($amount);
if(is_array($gateways)) if(is_array($gateways) && count($gateways) >=1)
{ {
$data = [ $data = [
@ -241,6 +241,11 @@ class InvitationController extends Controller
return (new InstantPayment($request))->run(); 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"); abort(404, "Invoice not found");
} }
} }

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.3.35', 'app_version' => '5.3.36',
'app_tag' => '5.3.35', 'app_tag' => '5.3.36',
'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', ''),