From e22562613d84dbeb9834afde2c22646d51616441 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 14 May 2025 15:15:43 +1000
Subject: [PATCH] Cleanup for Authorize.net

---
 app/PaymentDrivers/Authorize/AuthorizeACH.php |  7 +------
 app/PaymentDrivers/AuthorizePaymentDriver.php | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/PaymentDrivers/Authorize/AuthorizeACH.php b/app/PaymentDrivers/Authorize/AuthorizeACH.php
index c9d1ee00c3..f98e787d12 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeACH.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeACH.php
@@ -36,14 +36,9 @@ class AuthorizeACH implements LivewireMethodInterface
 {
     use MakesHash;
 
-    /** @var AuthorizePaymentDriver */
-    public $authorize;
-
-    public function __construct(AuthorizePaymentDriver $authorize)
+    public function __construct(public AuthorizePaymentDriver $authorize)
     {
-        $this->authorize = $authorize;
     }
-
       
     /**
      * livewirePaymentView
diff --git a/app/PaymentDrivers/AuthorizePaymentDriver.php b/app/PaymentDrivers/AuthorizePaymentDriver.php
index 775c047ad5..303bfc1a27 100644
--- a/app/PaymentDrivers/AuthorizePaymentDriver.php
+++ b/app/PaymentDrivers/AuthorizePaymentDriver.php
@@ -220,7 +220,15 @@ class AuthorizePaymentDriver extends BaseDriver
     {
         return $this->init()->getPublicClientKey() ? 'ok' : 'error';
     }
-
+    
+    /**
+     * processWebhookRequest
+     * 
+     * We only handle voided payments for now.
+     * 
+     * @param  PaymentWebhookRequest $request
+     * @return void
+     */
     public function processWebhookRequest(PaymentWebhookRequest $request)
     {
 
@@ -295,7 +303,7 @@ class AuthorizePaymentDriver extends BaseDriver
 //     'id' => '80040995616',
 //   ),
 // )  
-    private function voidPayment($data)
+    private function voidPayment(array $data)
     {
 
         $payment = Payment::withTrashed()
@@ -303,11 +311,8 @@ class AuthorizePaymentDriver extends BaseDriver
                         ->where('transaction_reference', $data['payload']['id'])
                         ->first();
 
-        if($payment){
+        if($payment && $payment->status_id == Payment::STATUS_COMPLETED){
             
-            if($payment->status_id != Payment::STATUS_COMPLETED)
-                return;
-
             $payment->service()->deletePayment();
             $payment->status_id = Payment::STATUS_FAILED;
             $payment->save();
@@ -321,7 +326,6 @@ class AuthorizePaymentDriver extends BaseDriver
             } else {
                 $error = 'Payment for '.$payment->client->present()->name()." for {$payment->amount} failed";
             }
-
             
             PaymentFailedMailer::dispatch(
                 $payment_hash,