From 2cf9db7b2bffc09cc2242cef0e04f59c79bb553a Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Sat, 17 Dec 2022 06:58:45 +0100
Subject: [PATCH] Fixes

---
 app/PaymentDrivers/Stripe/BACS.php                        | 8 +++++---
 public/js/clients/payments/stripe-bacs.js                 | 2 +-
 resources/js/clients/payments/stripe-bacs.js              | 2 +-
 .../portal/ninja2020/gateways/stripe/bacs/pay.blade.php   | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/BACS.php b/app/PaymentDrivers/Stripe/BACS.php
index d0db624d82cb..d859b3354eda 100644
--- a/app/PaymentDrivers/Stripe/BACS.php
+++ b/app/PaymentDrivers/Stripe/BACS.php
@@ -58,11 +58,13 @@ class BACS
     public function authorizeResponse($request)
     {
         $this->stripe->init();
-        if ($request->session_id){
+        if ($request->session_id) {
             $session = $this->stripe->stripe->checkout->sessions->retrieve($request->session_id, ['expand' => ['setup_intent']]);
-        }
-        $this->storePaymentMethod($session, $this->stripe->findOrCreateCustomer());
 
+            $customer = $this->stripe->findOrCreateCustomer();
+            $this->stripe->attach($session->setup_intent->payment_method, $customer);
+            $this->storePaymentMethod($session, $customer);
+        }
         return redirect()->route('client.payment_methods.index');
     }
 
diff --git a/public/js/clients/payments/stripe-bacs.js b/public/js/clients/payments/stripe-bacs.js
index 5dade9c73027..0c43cd308ffc 100644
--- a/public/js/clients/payments/stripe-bacs.js
+++ b/public/js/clients/payments/stripe-bacs.js
@@ -51,7 +51,7 @@ class ProcessBACS {
                 this.payNowButton.querySelector('span').classList.add('hidden');
 
                 this.stripe.confirmBecsDebitPayment(
-                    document.querySelector('meta[name=pi-client-secret')
+                    document.querySelector('meta[name=stripe-secret')
                         .content,
                     {}
                 ).then((result) => {
diff --git a/resources/js/clients/payments/stripe-bacs.js b/resources/js/clients/payments/stripe-bacs.js
index 5dade9c73027..0c43cd308ffc 100644
--- a/resources/js/clients/payments/stripe-bacs.js
+++ b/resources/js/clients/payments/stripe-bacs.js
@@ -51,7 +51,7 @@ class ProcessBACS {
                 this.payNowButton.querySelector('span').classList.add('hidden');
 
                 this.stripe.confirmBecsDebitPayment(
-                    document.querySelector('meta[name=pi-client-secret')
+                    document.querySelector('meta[name=stripe-secret')
                         .content,
                     {}
                 ).then((result) => {
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 f6d726906155..84d96b14523c 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/bacs/pay.blade.php
@@ -8,6 +8,7 @@
         <meta name="stripe-publishable-key" content="{{ $gateway->company_gateway->getPublishableKey() }}">
     @endif
     <meta name="only-authorization" content="">
+    <meta name="stripe-secret" content="{{ $intent->client_secret }}">
 @endsection
 
 @section('gateway_content')