mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #9945 from beganovich/1422-rotessa-final2
Rotessa: New payment flow
This commit is contained in:
commit
0fa4aa6a1f
@ -14,6 +14,7 @@ namespace App\PaymentDrivers\Rotessa;
|
|||||||
|
|
||||||
use App\Models\Payment;
|
use App\Models\Payment;
|
||||||
use App\Models\SystemLog;
|
use App\Models\SystemLog;
|
||||||
|
use App\PaymentDrivers\Common\LivewireMethodInterface;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
use App\Models\GatewayType;
|
use App\Models\GatewayType;
|
||||||
use App\Models\PaymentType;
|
use App\Models\PaymentType;
|
||||||
@ -28,7 +29,7 @@ use App\PaymentDrivers\Common\MethodInterface;
|
|||||||
use Omnipay\Common\Exception\InvalidResponseException;
|
use Omnipay\Common\Exception\InvalidResponseException;
|
||||||
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
|
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
|
||||||
|
|
||||||
class PaymentMethod implements MethodInterface
|
class PaymentMethod implements MethodInterface, LivewireMethodInterface
|
||||||
{
|
{
|
||||||
|
|
||||||
private array $transaction = [
|
private array $transaction = [
|
||||||
@ -123,14 +124,8 @@ class PaymentMethod implements MethodInterface
|
|||||||
*/
|
*/
|
||||||
public function paymentView(array $data): View
|
public function paymentView(array $data): View
|
||||||
{
|
{
|
||||||
$data['gateway'] = $this->rotessa;
|
$data = $this->paymentData($data);
|
||||||
$data['amount'] = $data['total']['amount_with_fee'];
|
|
||||||
$data['due_date'] = date('Y-m-d', min(max(strtotime($data['invoices']->max('due_date')), strtotime('now')), strtotime('+1 day')));
|
|
||||||
$data['process_date'] = $data['due_date'];
|
|
||||||
$data['currency'] = $this->rotessa->client->getCurrencyCode();
|
|
||||||
$data['frequency'] = 'Once';
|
|
||||||
$data['installments'] = 1;
|
|
||||||
$data['invoice_nums'] = $data['invoices']->pluck('invoice_number')->join(', ');
|
|
||||||
return render('gateways.rotessa.bank_transfer.pay', $data );
|
return render('gateways.rotessa.bank_transfer.pay', $data );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -220,4 +215,29 @@ class PaymentMethod implements MethodInterface
|
|||||||
|
|
||||||
throw new PaymentFailed($exception->getMessage(), $exception->getCode());
|
throw new PaymentFailed($exception->getMessage(), $exception->getCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
public function livewirePaymentView(array $data): string
|
||||||
|
{
|
||||||
|
return 'gateways.rotessa.bank_transfer.pay_livewire';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
public function paymentData(array $data): array
|
||||||
|
{
|
||||||
|
$data['gateway'] = $this->rotessa;
|
||||||
|
$data['amount'] = $data['total']['amount_with_fee'];
|
||||||
|
$data['due_date'] = date('Y-m-d', min(max(strtotime($data['invoices']->max('due_date')), strtotime('now')), strtotime('+1 day')));
|
||||||
|
$data['process_date'] = $data['due_date'];
|
||||||
|
$data['currency'] = $this->rotessa->client->getCurrencyCode();
|
||||||
|
$data['frequency'] = 'Once';
|
||||||
|
$data['installments'] = 1;
|
||||||
|
$data['invoice_nums'] = $data['invoices']->pluck('invoice_number')->join(', ');
|
||||||
|
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -278,4 +278,13 @@ class RotessaPaymentDriver extends BaseDriver
|
|||||||
return $this->company_gateway->getConfigField('testMode') ? 'https://sandbox-api.rotessa.com/v1/' : 'https://api.rotessa.com/v1/';
|
return $this->company_gateway->getConfigField('testMode') ? 'https://sandbox-api.rotessa.com/v1/' : 'https://api.rotessa.com/v1/';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function processPaymentViewData(array $data)
|
||||||
|
{
|
||||||
|
return $this->payment_method->paymentData($data);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function livewirePaymentView(array $data)
|
||||||
|
{
|
||||||
|
return $this->payment_method->livewirePaymentView($data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,65 @@
|
|||||||
|
<div class="rounded-lg border bg-card text-card-foreground shadow-sm overflow-hidden py-5 bg-white sm:gap-4" id="rotessa-bank-transfer">
|
||||||
|
@if (count($tokens) > 0)
|
||||||
|
<div class="alert alert-failure mb-4" hidden id="errors"></div>
|
||||||
|
|
||||||
|
@include('portal.ninja2020.gateways.includes.payment_details')
|
||||||
|
|
||||||
|
<form action="{{ route('client.payments.response') }}" method="post" id="server-response">
|
||||||
|
@csrf
|
||||||
|
<input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}">
|
||||||
|
<input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}">
|
||||||
|
<input type="hidden" name="source" value="">
|
||||||
|
<input type="hidden" name="amount" value="{{ $amount }}">
|
||||||
|
<input type="hidden" name="currency" value="{{ $currency }}">
|
||||||
|
<input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
|
||||||
|
<input type="hidden" name="frequency" value="Once">
|
||||||
|
<input type="hidden" name="installments" value="1">
|
||||||
|
|
||||||
|
@component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
|
||||||
|
@if (count($tokens) > 0)
|
||||||
|
@foreach ($tokens as $token)
|
||||||
|
<label class="mr-4">
|
||||||
|
<input type="radio" data-token="{{ $token->token }}" name="payment-type"
|
||||||
|
class="form-radio cursor-pointer toggle-payment-with-token" />
|
||||||
|
<span class="ml-1 cursor-pointer">
|
||||||
|
{{ App\Models\GatewayType::getAlias($token->gateway_type_id) }} ({{ $token->meta->brand ?? 'Bank Transfer' }})
|
||||||
|
{{ ctrans('texts.account_number') }}#: {{ $token->meta?->last4 ?? '' }}
|
||||||
|
</span>
|
||||||
|
</label><br/>
|
||||||
|
@endforeach
|
||||||
|
@endisset
|
||||||
|
<dt class="text-sm leading-5 font-medium text-gray-500 mr-4">
|
||||||
|
{{ ctrans('texts.process_date') }}
|
||||||
|
</dt>
|
||||||
|
<dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
|
||||||
|
<input autocomplete="new-password" readonly type="date" min="{{ $due_date }}" name="process_date" id="process_date" required class="input w-full" placeholder="" value="{{ old('process_date', $process_date ) }}">
|
||||||
|
</dd>
|
||||||
|
@endcomponent
|
||||||
|
</form>
|
||||||
|
@else
|
||||||
|
@component('portal.ninja2020.components.general.card-element-single', ['title' => ctrans('texts.direct_debit'), 'show_title' => false])
|
||||||
|
<span>{{ ctrans('texts.bank_account_not_linked') }}</span>
|
||||||
|
|
||||||
|
<a class="button button-link text-primary"
|
||||||
|
href="{{ route('client.payment_methods.index') }}">{{ ctrans('texts.add_payment_method') }}</a>
|
||||||
|
@endcomponent
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (count($tokens) > 0)
|
||||||
|
@include('portal.ninja2020.gateways.includes.pay_now')
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@script
|
||||||
|
<script>
|
||||||
|
Array
|
||||||
|
.from(document.getElementsByClassName('toggle-payment-with-token'))
|
||||||
|
.forEach((element) => element.addEventListener('click', (element) => {
|
||||||
|
document.querySelector('input[name=source]').value = element.target.dataset.token;
|
||||||
|
}));
|
||||||
|
|
||||||
|
document.getElementById('pay-now').addEventListener('click', function() {
|
||||||
|
document.getElementById('server-response').submit();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
@endscript
|
Loading…
x
Reference in New Issue
Block a user