Merge pull request #208 from mewebstudio/207-estpos-undefined-array-k…

…ey-authcode 207 estpos undefined array key authcode
mewebstudio · May 17, 2024 · 54a6286 · 54a6286
2 parents e173399 + 5d94ebb
commit 54a6286
Show file tree

Hide file tree

Showing 5 changed files with 304 additions and 58 deletions.
diff --git a/src/DataMapper/ResponseDataMapper/EstPosResponseDataMapper.php b/src/DataMapper/ResponseDataMapper/EstPosResponseDataMapper.php
@@ -88,7 +88,7 @@ public function mapPaymentResponse(array $rawPaymentResponseData, string $txType
             'group_id'         => $rawPaymentResponseData['GroupId'],
             'transaction_id'   => $rawPaymentResponseData['TransId'],
             'transaction_time' => self::TX_APPROVED === $status ? new \DateTimeImmutable($extra['TRXDATE']) : null,
-            'auth_code'        => $rawPaymentResponseData['AuthCode'],
+            'auth_code'        => $rawPaymentResponseData['AuthCode'] ?? null,
             'ref_ret_num'      => $rawPaymentResponseData['HostRefNum'],
             'proc_return_code' => $procReturnCode,
             'status'           => $status,
@@ -262,20 +262,30 @@ public function mapRefundResponse(array $rawResponseData): array
             $status = self::TX_APPROVED;
         }
 
-        return [
+        $result = [
             'order_id'         => $rawResponseData['OrderId'],
-            'group_id'         => $rawResponseData['GroupId'],
-            'auth_code'        => $rawResponseData['AuthCode'],
+            'group_id'         => null,
+            'auth_code'        => null,
             'ref_ret_num'      => $rawResponseData['HostRefNum'],
             'proc_return_code' => $procReturnCode,
             'transaction_id'   => $rawResponseData['TransId'],
-            'num_code'         => $rawResponseData['Extra']['NUMCODE'],
-            'error_code'       => $rawResponseData['Extra']['ERRORCODE'],
+            'num_code'         => null,
+            'error_code'       => null,
             'error_message'    => $rawResponseData['ErrMsg'],
             'status'           => $status,
             'status_detail'    => $this->getStatusDetail($procReturnCode),
             'all'              => $rawResponseData,
         ];
+
+        if (self::TX_APPROVED === $status) {
+            $result['group_id']  = $rawResponseData['GroupId'];
+            $result['auth_code'] = $rawResponseData['AuthCode'];
+            $result['num_code']  = $rawResponseData['Extra']['NUMCODE'];
+        } else {
+            $result['error_code'] = $rawResponseData['Extra']['ERRORCODE'] ?? $rawResponseData['ERRORCODE'] ?? null;
+        }
+
+        return $result;
     }
 
     /**
@@ -305,20 +315,30 @@ public function mapCancelResponse(array $rawResponseData): array
             ];
         }
 
-        return [
+        $result = [
             'order_id'         => $rawResponseData['OrderId'],
-            'group_id'         => $rawResponseData['GroupId'],
-            'auth_code'        => $rawResponseData['AuthCode'],
+            'group_id'         => null,
+            'auth_code'        => null,
             'ref_ret_num'      => $rawResponseData['HostRefNum'],
             'proc_return_code' => $procReturnCode,
             'transaction_id'   => $rawResponseData['TransId'],
-            'error_code'       => $rawResponseData['Extra']['ERRORCODE'],
-            'num_code'         => $rawResponseData['Extra']['NUMCODE'],
+            'error_code'       => null,
+            'num_code'         => null,
             'error_message'    => $rawResponseData['ErrMsg'],
             'status'           => $status,
             'status_detail'    => $this->getStatusDetail($procReturnCode),
             'all'              => $rawResponseData,
         ];
+
+        if (self::TX_APPROVED === $status) {
+            $result['group_id']  = $rawResponseData['GroupId'];
+            $result['auth_code'] = $rawResponseData['AuthCode'];
+            $result['num_code']  = $rawResponseData['Extra']['NUMCODE'];
+        } else {
+            $result['error_code'] = $rawResponseData['Extra']['ERRORCODE'] ?? $rawResponseData['ERRORCODE'] ?? null;
+        }
+
+        return $result;
     }
 
     /**

diff --git a/src/Gateways/VakifKatilimPos.php b/src/Gateways/VakifKatilimPos.php
@@ -250,10 +250,6 @@ private function getRequestURIByTransactionType(string $txType, string $paymentM
             PosInterface::TX_TYPE_HISTORY       => 'SelectOrder',
         ];
 
-        if (!isset($arr[$txType])) {
-            throw new UnsupportedTransactionTypeException();
-        }
-
         if (\is_string($arr[$txType])) {
             return $arr[$txType];
         }

diff --git a/tests/Functional/EstV3PosTest.php b/tests/Functional/EstV3PosTest.php
@@ -80,9 +80,9 @@ function (RequestDataPreparedEvent $requestDataPreparedEvent) use (&$eventIsThro
             $this->card
         );
 
-        $this->assertTrue($this->pos->isSuccess());
-
         $response = $this->pos->getResponse();
+        $this->assertTrue($this->pos->isSuccess(), $response['error_message'] ?? null);
+
         $this->assertIsArray($response);
         $this->assertNotEmpty($response);
         $this->assertTrue($eventIsThrown);