Changeset 2800366

Timestamp:

10/18/2022 05:46:11 AM (3 years ago)

Author:

chaifinport

Message:

fixing redirection issue and addiing discount login

Location:

chaiport-payment/trunk

Files:

• chaiportGateway.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)

chaiport-payment/trunk/chaiportGateway.php

@@ -4 +4 @@
  * Plugin URI:        https://www.docs.chaiport.io/plugins_and_sdks/woocommerce-plugin.html
  * Description:       Single Payment
- * Version:           1.0.4
+ * Version:           1.0.5
  * Requires at least: 5.6
  * Author:            Chai Finance
@@ -97 +97 @@
         $orderId = $order->get_id();
 
-        $chaiPortId = get_bloginfo('name') . "-MERCHANT-" . $orderId;
         $options = get_option('woocommerce_chaiport_settings');
         $chaiApiUrl = "https://api.chaiport.io/api/getTransactionStatus/";
         $publicKey = $options["publishable_key"];
         $privateKey = $options["private_key"];
+        $chaiPortId = $publicKey . "-MERCHANT-" . $orderId;
         $orderStatusType = $options["payment_process_action"];
         $getOrderStatusUrl = $chaiApiUrl . $chaiPortId;
+
+        // Create token header as a JSON string
+        $jwt_header = json_encode(['typ' => 'JWT', 'alg' => 'HS256']);
+        $encodeData = array(
+            "iss" => "CHAIPAY",
+            "sub" => $publicKey,
+            "iat" => time(),
+            "exp" => time() + 100
+        );
+        $payload = json_encode($encodeData);
+
+        $base64UrlHeader = str_replace(['+', '/', '='], ['-', '_', ''], base64_encode($jwt_header));
+        $base64UrlPayload = str_replace(['+', '/', '='], ['-', '_', ''], base64_encode($payload));
+        $signature = hash_hmac('sha256', $base64UrlHeader . "." . $base64UrlPayload, $privateKey, true);
+        $base64UrlSignature = str_replace(['+', '/', '='], ['-', '_', ''], base64_encode($signature));
+        // Create JWT
+        $token = $base64UrlHeader . "." . $base64UrlPayload . "." . $base64UrlSignature;
+
         $header = array(
             'headers' => array(
-                'signature' => ChaiportGenerateFetchStatusSignature($chaiPortId, $privateKey),
-                'publicKey' => $publicKey
+                'X-Chaipay-Client-Key' => $publicKey,
+                'Authorization' => "Bearer " . $token
             )
         );
@@ -669 +687 @@
             $environment = $this->testmode ? "sandbox" : "live";
 
-            $merchantOrder = get_bloginfo('name') . "-MERCHANT-" . $order->get_id();
+            $merchantOrder = $publicKey . "-MERCHANT-" . $order->get_id();
 
             $order->add_order_note("Chaiport OrderId: $merchantOrder");
@@ -692 +710 @@
             $itemsArray = array();
             // Get and Loop Over Order Items
+            $discount_total = 0;
             foreach ($order->get_items() as $item_id => $item) {
                 $order_item_id = $item->get_id();
@@ -705 +724 @@
                     "image" => $image_url,
                 );
+                if ( $product->is_on_sale() ) {
+                    $discount = ((float)$product->get_regular_price() - (float)$product->get_sale_price()) * (int)$item->get_quantity();
+                    $discount_total += $discount;
+                }
                 array_push($itemsArray, $temp);
             }
@@ -712 +735 @@
 
             $merchantObj = array(
-                "name" => "Blog",
+                "name" => get_bloginfo('name'),
                 "logo" => $image[0],
                 "back_url" => get_bloginfo('url') . "/checkout/",
                 "shipping_charges" => (float)$order->get_shipping_total(),
-                "promo_discount" => 0
+                "promo_discount" => $discount_total
             );
+
+            $countryCode = $order->get_billing_country();
+            if (strlen($countryCode) == 0) {
+                $countryCode = $order->get_shipping_country();
+            }
+            if (strlen($countryCode) == 0) {
+                if ($currencyCode == "VND") {
+                    $countryCode = "VN";
+                } else if ($currencyCode == "THB") {
+                    $countryCode = "TH";
+                } else if ($currencyCode == "IDR") {
+                    $countryCode = "ID";
+                } else if ($currencyCode == "MYR") {
+                    $countryCode = "MY";
+                } else if ($currencyCode == "SGD") {
+                    $countryCode = "SG";
+                } else if ($currencyCode == "PHP") {
+                    $countryCode = "PH";
+                } else if ($currencyCode == "TWD") {
+                    $countryCode = "TW";
+                } else if ($currencyCode == "KRW") {
+                    $countryCode = "KR";
+                } else if ($currencyCode == "USD") {
+                    $countryCode = "US";
+                }
+            }
 
             $billingShippingArray = $this->getBillingShippingInfo($order);
@@ -728 +777 @@
                 "amount" => (float)$amount,
                 "currency" => "$currencyCode",
-                "description" => "-",
+                "description" => "Your order-id is: $merchantOrder",
                 "order_details" => $itemsArray,
                 "billing_details" => $billingShippingArray[0],
@@ -734 +783 @@
                 "success_url" => "$red",
                 "failure_url" => "$red",
-                "country_code" => $order->get_billing_country(),
-                "expiry_hours" => 1,
+                "country_code" => $countryCode,
+                "expiry_hours" => 96,
                 "is_checkout_embed" => true,
                 "show_shipping_details" => $this->getOptionBool('show_shipping_details'),

chaiport-payment/trunk/readme.txt

@@ -3 +3 @@
 Tags: chaipay, chaiport, payments, woocommerce, ecommerce
 Requires at least: 3.9.2
-Tested up to: 5.8.1
-Stable tag: 1.0.4
+Tested up to: 6.0.2
+Stable tag: 1.0.5
 Requires PHP: 5.6
 License: GPLv2 or later