Changeset 2888142

Timestamp:

03/28/2023 08:15:34 AM (3 years ago)

Author:

chaifinport

Message:

Updating checkout image, making title/description editable, payment obj update description & discount rounding to 2 decimal places

Location:

chaiport-payment/trunk

Files:

• chaiportGateway.php (modified) (10 diffs)
• images/pay.png (modified) (previous)
• readme.txt (modified) (1 diff)

chaiport-payment/trunk/chaiportGateway.php

@@ -4 +4 @@
  * Plugin URI:        https://www.docs.portone.cloud/plugins_and_sdks/woocommerce-plugin.html
  * Description:       Single Payment
- * Version:           2.0.4
+ * Version:           2.0.5
  * Requires at least: 5.6
  * Author:            PortOne
@@ -101 +101 @@
         $publicKey = $options["publishable_key"];
         $privateKey = $options["private_key"];
-        $chaiPortId = $publicKey . "-MERCHANT-" . $orderId;
+        $chaiPortId = $publicKey . "-" . $orderId;
         $orderStatusType = $options["payment_process_action"];
         $getOrderStatusUrl = $chaiApiUrl . $chaiPortId;
@@ -560 +560 @@
                     'description' => 'This is the title which the user sees during checkout.',
                     'default' => 'Credit Card/Debit Card/E-Wallets',
-                    'desc_tip' => false,
-                    'custom_attributes' => array('readonly' => 'readonly')
+                    'desc_tip' => false
                 ),
                 'description' => array(
@@ -567 +566 @@
                     'type' => 'textarea',
                     'description' => 'This is the description which the user sees during checkout.',
-                    'default' => 'Pay with your Credit Card/Debit Card/E-Wallets via PortOne Payment Service',
-                    'custom_attributes' => array('readonly' => 'readonly')
+                    'default' => 'Pay with your Credit Card/Debit Card/E-Wallets via PortOne Payment Service'
                 ),
                 'testmode' => array(
@@ -692 +690 @@
             $environment = $this->testmode ? "sandbox" : "live";
 
-            $merchantOrder = $publicKey . "-MERCHANT-" . $order->get_id();
+            $merchantOrder = $publicKey . "-" . $order->get_id();
 
             $order->add_order_note("PortOne OrderId: $merchantOrder");
@@ -753 +751 @@
                 "logo" => $image[0],
                 "back_url" => get_bloginfo('url') . "/checkout/",
-                "shipping_charges" => (float)$order->get_shipping_total(),
-                "promo_discount" => $discount_total
+                "shipping_charges" => round((float)$order->get_shipping_total(), 2),
+                "promo_discount" => round((float)$discount_total, 2)
             );
 
             $this->console_log("Environment is: " . $environment, '');
-            if ($amount != ((float)$order->get_shipping_total() + $item_total - $discount_total)) {
+            if ($amount != ((float)$order->get_shipping_total() + $item_total - round((float)$discount_total, 2))) {
                 $this->console_log("Not sending item details", '');
                 $isItemsAvailable = false;
@@ -772 +770 @@
                 $this->console_log("Items total is: " . $item_total, '');
                 $this->console_log("Shipping amount is: " . (float)$order->get_shipping_total(), '');
-                $this->console_log("Discount is: " . $discount_total, '');
+                $this->console_log("Discount is: " . round((float)$discount_total, 2), '');
             }
 
@@ -811 +809 @@
                     "amount" => (float)$amount,
                     "currency" => "$currencyCode",
-                    "description" => "Your order-id is: $merchantOrder",
+                    "description" => "Order Id: " . $order->get_id(),
                     "order_details" => $itemsArray,
                     "billing_details" => $billingShippingArray[0],
@@ -834 +832 @@
                     "amount" => (float)$amount,
                     "currency" => "$currencyCode",
-                    "description" => "Your order-id is: $merchantOrder",
+                    "description" => "Order Id: " . $order->get_id(),
                     "billing_details" => $billingShippingArray[0],
                     "shipping_details" => $billingShippingArray[1],
@@ -902 +900 @@
             global $woocommerce;
             $order = wc_get_order($order_id);
-            $woocommerce->session->set(self::SESSION_KEY, get_bloginfo('name') . "-MERCHANT-" . $order_id);
+            $woocommerce->session->set(self::SESSION_KEY, get_bloginfo('name') . "-" . $order_id);
             $woocommerce->cart->empty_cart();
 

chaiport-payment/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9.2
 Tested up to: 6.1.1
-Stable tag: 2.0.4
+Stable tag: 2.0.5
 Requires PHP: 5.6
 License: GPLv2 or later