mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 22:47:32 -05:00 
			
		
		
		
	Merge pull request #5673 from turbo124/v5-develop
Fixes for Stripe Connect
This commit is contained in:
		
						commit
						aa39e8f750
					
				@ -148,5 +148,6 @@ return [
 | 
			
		||||
    'disable_auto_update' => env('DISABLE_AUTO_UPDATE', false),
 | 
			
		||||
    'invoiceninja_hosted_pdf_generation' => env('NINJA_HOSTED_PDF', false),
 | 
			
		||||
    'ninja_stripe_key' => env('NINJA_STRIPE_KEY', null),
 | 
			
		||||
    'ninja_stripe_publishable_key' => env('NINJA_PUBLISHABLE_KEY=', null),
 | 
			
		||||
    'pdf_generator' => env('PDF_GENERATOR', false),
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,12 @@
 | 
			
		||||
@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'ACH', 'card_title' => 'ACH'])
 | 
			
		||||
 | 
			
		||||
@section('gateway_head')
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->company_gateway->getPublishableKey() }}">
 | 
			
		||||
    @if($gateway->company_gateway->getConfigField('account_id'))
 | 
			
		||||
    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
 | 
			
		||||
    @else
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->company_gateway->getPublishableKey() }}">
 | 
			
		||||
    @endif
 | 
			
		||||
@endsection
 | 
			
		||||
 | 
			
		||||
@section('gateway_content')
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,12 @@
 | 
			
		||||
@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'Alipay', 'card_title' => 'Alipay'])
 | 
			
		||||
 | 
			
		||||
@section('gateway_head')
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
 | 
			
		||||
    @if($gateway->company_gateway->getConfigField('account_id'))
 | 
			
		||||
    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
 | 
			
		||||
    @else
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
 | 
			
		||||
    @endif
 | 
			
		||||
    <meta name="return-url" content="{{ $return_url }}">
 | 
			
		||||
    <meta name="currency" content="{{ $currency }}">
 | 
			
		||||
    <meta name="amount" content="{{ $stripe_amount }}">
 | 
			
		||||
 | 
			
		||||
@ -4,6 +4,7 @@
 | 
			
		||||
 | 
			
		||||
    @if($gateway->getConfigField('account_id'))
 | 
			
		||||
    <meta name="stripe-account-id" content="{{ $gateway->getConfigField('account_id') }}">
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
 | 
			
		||||
    @else
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
 | 
			
		||||
    @endif
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,12 @@
 | 
			
		||||
@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'Credit card', 'card_title' => 'Credit card'])
 | 
			
		||||
 | 
			
		||||
@section('gateway_head')
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
 | 
			
		||||
    @if($gateway->company_gateway->getConfigField('account_id'))
 | 
			
		||||
    <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
 | 
			
		||||
    @else
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
 | 
			
		||||
    @endif
 | 
			
		||||
    <meta name="stripe-secret" content="{{ $intent->client_secret }}">
 | 
			
		||||
    <meta name="only-authorization" content="">
 | 
			
		||||
    <meta name="client-postal-code" content="{{ $client->postal_code ?? '' }}">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user