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

More fixes

Browse Source
This commit is contained in:
Lars Kusch 2022-12-22 11:34:17 +01:00
parent 5a54a368ba
commit 2b7893aad9
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/PaymentDrivers/Stripe/BACS.php
View File

@ -70,13 +70,19 @@ class BACS
} }
public function paymentView(array $data) public function paymentView(array $data)
{ {
$data['gateway'] = $this->stripe;
$data['amount'] = $data['total']['amount_with_fee'];
// $description = $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')) . " for client {$this->stripe->client->present()->name()}"; return render('gateways.stripe.bacs.pay', $data);
$invoice_numbers = collect($data['invoices'])->pluck('invoice_number')->implode(','); }
$description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice_numbers, 'amount' => Number::formatMoney($data['total']['amount_with_fee'], $this->stripe->client), 'client' => $this->stripe->client->present()->name()]); public function paymentResponse(PaymentResponseRequest $request)
{
$this->stripe->init();
nlog($request);
$invoice_numbers = collect($this->stripe->payment_hash->invoices())->pluck('invoice_number')->implode(',');
$description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice_numbers, 'amount' => Number::formatMoney($request->amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
$payment_intent_data = [ $payment_intent_data = [
'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()), 'amount' => $this->stripe->convertToStripeAmount($request->amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
'currency' => $this->stripe->client->getCurrencyCode(), 'currency' => $this->stripe->client->getCurrencyCode(),
'customer' => $this->stripe->findOrCreateCustomer(), 'customer' => $this->stripe->findOrCreateCustomer(),
'description' => $description, 'description' => $description,
@ -85,21 +91,12 @@ class BACS
'payment_hash' => $this->stripe->payment_hash->hash, 'payment_hash' => $this->stripe->payment_hash->hash,
'gateway_type_id' => GatewayType::BACS, 'gateway_type_id' => GatewayType::BACS,
], ],
'payment_method' => $request->token,
'confirm' => true, 'confirm' => true,
]; ];
$data['intent'] = $payment_intent_data; $this->stripe->createPaymentIntent($payment_intent_data);
$data['gateway'] = $this->stripe;
return render('gateways.stripe.bacs.pay', $data);
}
public function paymentResponse(PaymentResponseRequest $request)
{
$this->stripe->init();
nlog($request);
$state = [ $state = [
'server_response' => json_decode($request->gateway_response), 'payment_hash' => $this->stripe->payment_hash->hash,
'payment_hash' => $request->payment_hash,
]; ];
$state = array_merge($state, $request->all()); $state = array_merge($state, $request->all());

2
resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
View File

@ -14,8 +14,8 @@
<form action="{{ route('client.payments.response') }}" method="post" id="server-response"> <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
@csrf @csrf
<input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}"> <input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}">
<input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
<input type="hidden" name="token"> <input type="hidden" name="token">
<input type="hidden" name="amount" value={{ $amount }}>
</form> </form>
<div class="alert alert-failure mb-4" hidden id="errors"></div> <div class="alert alert-failure mb-4" hidden id="errors"></div>