From 2b7893aad9d7212cf3860075de6c502f8cf599f4 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Thu, 22 Dec 2022 11:34:17 +0100
Subject: [PATCH] More fixes

---
 app/PaymentDrivers/Stripe/BACS.php            | 31 +++++++++----------
 .../gateways/stripe/bacs/pay.blade.php        |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/BACS.php b/app/PaymentDrivers/Stripe/BACS.php
index e7e265e52764..3eeb3e2bba6b 100644
--- a/app/PaymentDrivers/Stripe/BACS.php
+++ b/app/PaymentDrivers/Stripe/BACS.php
@@ -70,13 +70,19 @@ class BACS
     }
     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()}";
-        $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()]);
-
+        return render('gateways.stripe.bacs.pay', $data);
+    }
+    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 = [
-            '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(),
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $description,
@@ -85,21 +91,12 @@ class BACS
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::BACS,
             ],
+            'payment_method' => $request->token,
             'confirm' => true,
         ];
-        $data['intent'] = $payment_intent_data;
-        $data['gateway'] = $this->stripe;
-
-        return render('gateways.stripe.bacs.pay', $data);
-    }
-    public function paymentResponse(PaymentResponseRequest $request)
-    {
-        $this->stripe->init();
-        nlog($request);
-
+        $this->stripe->createPaymentIntent($payment_intent_data);
         $state = [
-            'server_response' => json_decode($request->gateway_response),
-            'payment_hash' => $request->payment_hash,
+            'payment_hash' => $this->stripe->payment_hash->hash,
         ];
 
         $state = array_merge($state, $request->all());
diff --git a/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
index af6f50866f2b..d0f9b7388da4 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
@@ -14,8 +14,8 @@
     <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_hash" value="{{ $payment_hash }}">
         <input type="hidden" name="token">
+        <input type="hidden" name="amount" value={{ $amount }}>
     </form>
 
     <div class="alert alert-failure mb-4" hidden id="errors"></div>