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

---
 app/PaymentDrivers/Stripe/BACS.php            |  5 +--
 resources/js/clients/payments/stripe-bacs.js  | 31 ++-----------------
 .../gateways/stripe/bacs/pay.blade.php        |  2 --
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/BACS.php b/app/PaymentDrivers/Stripe/BACS.php
index 6df45f473d77..e7e265e52764 100644
--- a/app/PaymentDrivers/Stripe/BACS.php
+++ b/app/PaymentDrivers/Stripe/BACS.php
@@ -85,9 +85,9 @@ class BACS
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::BACS,
             ],
+            'confirm' => true,
         ];
-
-        $data['intent'] = $this->stripe->createPaymentIntent($payment_intent_data);
+        $data['intent'] = $payment_intent_data;
         $data['gateway'] = $this->stripe;
 
         return render('gateways.stripe.bacs.pay', $data);
@@ -96,6 +96,7 @@ class BACS
     {
         $this->stripe->init();
         nlog($request);
+
         $state = [
             'server_response' => json_decode($request->gateway_response),
             'payment_hash' => $request->payment_hash,
diff --git a/resources/js/clients/payments/stripe-bacs.js b/resources/js/clients/payments/stripe-bacs.js
index b538a49995bb..3fe9120a3356 100644
--- a/resources/js/clients/payments/stripe-bacs.js
+++ b/resources/js/clients/payments/stripe-bacs.js
@@ -59,39 +59,14 @@ class ProcessBACS {
                 this.payNowButton.disabled = true;
                 this.payNowButton.querySelector('svg').classList.remove('hidden');
                 this.payNowButton.querySelector('span').classList.add('hidden');
-                this.stripe
-                    .confirmBacsDebitPayment(
-                        document.querySelector('meta[name=pi-client-secret')
-                            .content, {
-                            payment_method: document.querySelector('input[name=token]').value
-                        }
-                    )
-                    .then((result) => {
-                        if (result.error) {
-                            return this.handleFailure(result.error.message);
-                        }
-
-                        return this.handleSuccess(result);
-                    });
+                this.handleResult();
             });
         }
     };
-
-    handleFailure(message) {
-        let errors = document.getElementById('errors');
-
-        errors.textContent = '';
-        errors.textContent = message;
-        errors.hidden = false;
-
-        document.getElementById('pay-now').disabled = false;
-        document.querySelector('#pay-now > svg').classList.add('hidden');
-        document.querySelector('#pay-now > span').classList.remove('hidden');
-    }
-    handleSuccess(result) {
+    handleResult() {
         document.querySelector(
             'input[name="gateway_response"]'
-        ).value = JSON.stringify(result.paymentIntent);
+        ).value = ocument.querySelector('input[name=token]').value;
 
         document.getElementById('server-response').submit();
     }
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 5b66c6684da2..a18d42b210c9 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
@@ -14,9 +14,7 @@
 @section('gateway_content')
     <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
         @csrf
-        <input type="hidden" name="gateway_response">
         <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="payment_hash" value="{{ $payment_hash }}">
         <input type="hidden" name="token">
     </form>