From 52dc9fb5fd361abfdd92b52c0c3a68d9d7a8fa82 Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Fri, 14 Aug 2026 00:33:17 +0530
Subject: [PATCH] Read top-level gateway_patient and card fields

---
 app/Controllers/Abha.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/Abha.php b/app/Controllers/Abha.php
index 2769738..7aa05f3 100644
--- a/app/Controllers/Abha.php
+++ b/app/Controllers/Abha.php
@@ -85,7 +85,15 @@ class Abha extends BaseController
                 'request_id' => (string) ($result['request_id'] ?? ''),
             ]);
         }
-        $payload  = $result['data'] ?? $result;
+        // Keep top-level keys (gateway_patient, official_card) that also appear under data.
+        $payload = $result;
+        if (is_array($result['data'] ?? null)) {
+            foreach ($result['data'] as $key => $value) {
+                if (! array_key_exists($key, $payload)) {
+                    $payload[$key] = $value;
+                }
+            }
+        }
         $newTxnId = $payload['txnId'] ?? $payload['txn_id'] ?? $txnId;
 
         $profile = $this->pickGatewayAbhaProfile($payload);
@@ -257,7 +265,15 @@ class Abha extends BaseController
             ]);
         }
 
-        $payload = $result['data'] ?? $result;
+        // Keep top-level keys (gateway_patient, official_card) that also appear under data.
+        $payload = $result;
+        if (is_array($result['data'] ?? null)) {
+            foreach ($result['data'] as $key => $value) {
+                if (! array_key_exists($key, $payload)) {
+                    $payload[$key] = $value;
+                }
+            }
+        }
 
         $profile = $this->pickGatewayAbhaProfile($payload);