mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 22:07:33 -05:00 
			
		
		
		
	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop
This commit is contained in:
		
						commit
						2b07dd1066
					
				@ -39,6 +39,7 @@ class SEPA
 | 
			
		||||
        $data['client'] = $this->stripe->client;
 | 
			
		||||
        $data['country'] = $this->stripe->client->country->iso_3166_2;
 | 
			
		||||
        $data['currency'] = $this->stripe->client->currency();
 | 
			
		||||
        $data['payment_hash'] = 'x';
 | 
			
		||||
 | 
			
		||||
        return render('gateways.stripe.sepa.authorize', $data);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -4219,7 +4219,7 @@ $LANG = array(
 | 
			
		||||
    'max_companies_desc' => 'You have reached your maximum number of companies. Delete existing companies to migrate new ones.',
 | 
			
		||||
    'migration_already_completed' => 'Company already migrated',
 | 
			
		||||
    'migration_already_completed_desc' => 'Looks like you already migrated <b> :company_name </b>to the V5 version of the Invoice Ninja. In case you want to start over, you can force migrate to wipe existing data.',
 | 
			
		||||
    'payment_method_cannot_be_authorized_first' => 'This payment method can be can saved for future use, once you complete your first transaction. Don\'t forget to check "Store credit card details" during payment process.',
 | 
			
		||||
    'payment_method_cannot_be_authorized_first' => 'This payment method can be can saved for future use, once you complete your first transaction. Don\'t forget to check "Store details" during payment process.',
 | 
			
		||||
    'new_account' => 'New account',
 | 
			
		||||
    'activity_100' => ':user created recurring invoice :recurring_invoice',
 | 
			
		||||
    'activity_101' => ':user updated recurring invoice :recurring_invoice',
 | 
			
		||||
 | 
			
		||||
@ -7,78 +7,14 @@
 | 
			
		||||
    @else
 | 
			
		||||
    <meta name="stripe-publishable-key" content="{{ $gateway->company_gateway->getPublishableKey() }}">
 | 
			
		||||
    @endif
 | 
			
		||||
 | 
			
		||||
@endsection
 | 
			
		||||
 | 
			
		||||
@section('gateway_content')
 | 
			
		||||
    @if(session()->has('sepa_error'))
 | 
			
		||||
        <div class="alert alert-failure mb-4">
 | 
			
		||||
            <p>{{ session('sepa_error') }}</p>
 | 
			
		||||
        </div>
 | 
			
		||||
    @endif
 | 
			
		||||
 | 
			
		||||
    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::SEPA]) }}" method="post" id="server_response">
 | 
			
		||||
        @csrf
 | 
			
		||||
@component('portal.ninja2020.components.general.card-element-single', ['title' => 'SEPA', 'show_title' => false])
 | 
			
		||||
    {{ __('texts.payment_method_cannot_be_authorized_first') }}
 | 
			
		||||
@endcomponent
 | 
			
		||||
 | 
			
		||||
        <input type="hidden" name="company_gateway_id" value="{{ $gateway->company_gateway->id }}">
 | 
			
		||||
        <input type="hidden" name="gateway_type_id" value="{{ $payment_method_id }}">
 | 
			
		||||
        <input type="hidden" name="gateway_response" id="gateway_response">
 | 
			
		||||
        <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
 | 
			
		||||
 | 
			
		||||
        <input type="hidden" name="is_default" id="is_default">
 | 
			
		||||
    </form>
 | 
			
		||||
 | 
			
		||||
    <div class="alert alert-failure mb-4" hidden id="errors"></div>
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_holder_type')])
 | 
			
		||||
        <span class="flex items-center mr-4">
 | 
			
		||||
            <input class="form-radio mr-2" type="radio" value="individual" name="account-holder-type" checked>
 | 
			
		||||
            <span>{{ __('texts.individual_account') }}</span>
 | 
			
		||||
        </span>
 | 
			
		||||
        <span class="flex items-center">
 | 
			
		||||
            <input class="form-radio mr-2" type="radio" value="company" name="account-holder-type">
 | 
			
		||||
            <span>{{ __('texts.company_account') }}</span>
 | 
			
		||||
        </span>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_holder_name')])
 | 
			
		||||
        <input class="input w-full" id="account-holder-name" type="text" placeholder="{{ ctrans('texts.name') }}" required>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
 | 
			
		||||
        <select name="countries" id="country" class="form-select input w-full bg-white" required>
 | 
			
		||||
            @foreach($countries as $country)
 | 
			
		||||
                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
 | 
			
		||||
            @endforeach
 | 
			
		||||
        </select>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.currency')])
 | 
			
		||||
        <select name="currencies" id="currency" class="form-select input w-full">
 | 
			
		||||
            @foreach($currencies as $currency)
 | 
			
		||||
                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
 | 
			
		||||
            @endforeach
 | 
			
		||||
        </select>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.routing_number')])
 | 
			
		||||
        <input class="input w-full" id="routing-number" type="text" required>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_number')])
 | 
			
		||||
        <input class="input w-full" id="account-number" type="text" required>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.components.general.card-element-single')
 | 
			
		||||
        <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
 | 
			
		||||
        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->guard('contact')->user()->client->company->settings->email]) }}</label>
 | 
			
		||||
    @endcomponent
 | 
			
		||||
 | 
			
		||||
    @component('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
 | 
			
		||||
        {{ ctrans('texts.add_payment_method') }}
 | 
			
		||||
    @endcomponent
 | 
			
		||||
@endsection
 | 
			
		||||
 | 
			
		||||
@section('gateway_footer')
 | 
			
		||||
    <script src="https://js.stripe.com/v3/"></script>
 | 
			
		||||
    <script src="{{ asset('js/clients/payments/stripe-sepa.js') }}"></script>
 | 
			
		||||
@endsection
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user