Changeset 2621879

Timestamp:

10/29/2021 09:46:52 AM (4 years ago)

Author:

chaifinport

Message:

promo_discount nil bug fix & field name change fix

File:

• chaiport-payment/trunk/chaiportGateway.php (modified) (4 diffs)

chaiport-payment/trunk/chaiportGateway.php

@@ -178 +178 @@
 function ChaiportVerifySignature($responseObj, $secretKey, $type)
 {
+    $signature_hash = "";
     if ($type == "redirect") {
+        $queryParams = $responseObj->get_query_params();
+        $statusTypes = array(
+            "Success", "Failed"
+        );
+        if (in_array($queryParams['status'], $statusTypes)) {
+            $statusData = $queryParams['status'];
+        } else {
+            $statusData = "Success";
+            $pairs = explode('&', $_SERVER[REQUEST_URI]);
+            foreach ($pairs as $value) {
+                if (substr($value, 0, 6) == "status=") {
+                    $val = explode($value, '=')[1];
+                    if (in_array($val, $statusTypes)){
+                        $statusData = $val;
+                    }
+                }
+            }
+        }
+        $signature_hash = $queryParams['signature_hash'];
         $data = array(
-            'order_ref' => $responseObj['order_ref'],
-            'channel_order_ref' => $responseObj['channel_order_ref'],
-            'merchant_order_ref' => $responseObj['merchant_order_ref'],
-            'status' => $responseObj['status']
+            'order_ref' => $queryParams['order_ref'],
+            'channel_order_ref' => $queryParams['channel_order_ref'],
+            'merchant_order_ref' => $queryParams['merchant_order_ref'],
+            'status' => $statusData
         );
     } else if ($type == "webhook") {
+        $signature_hash = $responseObj['signature_hash'];
         $data = array(
             'currency' => $responseObj['currency'],
@@ -198 +219 @@
         );
     }
-
     ksort($data);
     $message = http_build_query($data);
     $hash_value = base64_encode(hash_hmac('sha256', $message, $secretKey, true));
 
-    if ($hash_value !== $responseObj['signature_hash']) {
+    if ($hash_value !== $signature_hash) {
         echo "Hash verification failed, not from valid source";
         return false;
@@ -280 +300 @@
     // updating order
     if (($order != false) && ($isSignatureValid == true)) {
-        $status = $data["status"];
+        $statusTypes = array(
+            "Success", "Failed"
+        );
+        if (in_array($data['status'], $statusTypes)) {
+            $status = $data['status'];
+        } else {
+            $status = "Success";
+            $pairs = explode('&', $_SERVER[REQUEST_URI]);
+            foreach ($pairs as $value) {
+                if (substr($value, 0, 6) == "status=") {
+                    $val = explode($value, '=')[1];
+                    if (in_array($val, $statusTypes)){
+                        $status = $val;
+                    }
+                }
+            }
+        }
         $orderRef = $data["order_ref"];
         $note = "--- Redirect Update ---\n";
@@ -671 +707 @@
                 "back_url" => get_bloginfo('url') . "/checkout/",
                 "shipping_charges" => 0.0,
+                "promo_discount" => 0
             );