From c224255621d857c8ca8eacbc5db3944139a76002 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 7 Aug 2021 14:58:04 +1000
Subject: [PATCH] Fixes for removing payment methods

---
 .../Controllers/ClientPortal/PaymentMethodController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
index f7878e767f8e..8014656272b0 100644
--- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -120,16 +120,23 @@ class PaymentMethodController extends Controller
     {
         // $gateway = $this->getClientGateway();
 
+        try {
+
         $payment_method->gateway
             ->driver(auth()->user()->client)
             ->setPaymentMethod(request()->query('method'))
             ->detach($payment_method);
 
-        try {
             event(new MethodDeleted($payment_method, auth('contact')->user()->company, Ninja::eventVars(auth('contact')->user()->id)));
+            
             $payment_method->delete();
+
         } catch (Exception $e) {
 
+            event(new MethodDeleted($payment_method, auth('contact')->user()->company, Ninja::eventVars(auth('contact')->user()->id)));
+            
+            $payment_method->delete();
+            
             nlog($e->getMessage());
 
             return back();