Changeset 3331331

Timestamp:

07/21/2025 09:57:26 AM (7 months ago)

Author:

razorpay

Message:

Update: 4.7.6

Location:

woo-razorpay/trunk

Files:

• includes/razorpay-webhook.php (modified) (9 diffs)
• readme.txt (modified) (2 diffs)
• woo-razorpay.php (modified) (7 diffs)

woo-razorpay/trunk/includes/razorpay-webhook.php

@@ -97 +97 @@
         if (empty($data['event']) === false) {
 
-            $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_number'];
+            $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_id'];
             $razorpayOrderId = $data['payload']['payment']['entity']['order_id'];
 
@@ -154 +154 @@
                         $webhookFilteredData = [
                             'invoice_id'                => $data['payload']['payment']['entity']['invoice_id'],
-                            'woocommerce_order_number'  => $data['payload']['payment']['entity']['notes']['woocommerce_order_number'],
+                            'woocommerce_order_id'  => $data['payload']['payment']['entity']['notes']['woocommerce_order_id'],
                             'razorpay_payment_id'       => $data['payload']['payment']['entity']['id'],
                             'event'                     => $data['event']
@@ -206 +206 @@
             $integration = "woocommerce";
 
-            $webhookEvents = $wpdb->get_results("SELECT rzp_webhook_data FROM $tableName where order_id=" . $data['woocommerce_order_number'] . " AND rzp_order_id='" . $rzpOrderId . "';");
+            $webhookEvents = $wpdb->get_results("SELECT rzp_webhook_data FROM $tableName where order_id=" . $data['woocommerce_order_id'] . " AND rzp_order_id='" . $rzpOrderId . "';");
 
             $rzpWebhookData = (array) json_decode($webhookEvents['rzp_webhook_data']);
@@ -220 +220 @@
                 array(
                     'integration'   => $integration,
-                    'order_id'      => $data['woocommerce_order_number'],
+                    'order_id'      => $data['woocommerce_order_id'],
                     'rzp_order_id'  => $rzpOrderId
                 )
             );
-            rzpLogInfo("webhook event saved for order:" . $data['woocommerce_order_number']);
+            rzpLogInfo("webhook event saved for order:" . $data['woocommerce_order_id']);
         }
         catch (Exception $e)
@@ -299 +299 @@
         // Order entity should be sent as part of the webhook payload
         //
-        $orderId = $data['woocommerce_order_number'];
+        $orderId = $data['woocommerce_order_id'];
 
         rzpLogInfo("Woocommerce orderId: $orderId, webhook process intitiated for payment authorized event by cron");
@@ -407 +407 @@
         // Order entity should be sent as part of the webhook payload
         //
-        $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_number'];
+        $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_id'];
 
         rzpLogInfo("Woocommerce orderId: $orderId webhook process intitiated for COD method payment pending event");
@@ -472 +472 @@
         // Order entity should be sent as part of the webhook payload
         //
-        $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_number'];
+        $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_id'];
 
         if (!empty($orderId)) {
@@ -577 +577 @@
         if ((isset($data['event']) === true) and
             (in_array($data['event'], $this->eventsArray) === true) and
-            (isset($data['payload']['payment']['entity']['notes']['woocommerce_order_number']) === true or isset($data['payload']['subscription']['entity']['notes']['woocommerce_order_id']) === true)) {
+            (isset($data['payload']['payment']['entity']['notes']['woocommerce_order_id']) === true or isset($data['payload']['subscription']['entity']['notes']['woocommerce_order_id']) === true)) {
             return true;
         }
@@ -630 +630 @@
         // Order entity should be sent as part of the webhook payload
         //
-        $orderId = $payment['notes']['woocommerce_order_number'];
+        $orderId = $payment['notes']['woocommerce_order_id'];
 
         if (!empty($orderId)) {

woo-razorpay/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9.2
 Tested up to: 6.8
-Stable tag: 4.7.5
+Stable tag: 4.7.6
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -69 +69 @@
 
 == Changelog ==
+
+= 4.7.6 =
+* Fixed order number issue.
 
 = 4.7.5 =

woo-razorpay/trunk/woo-razorpay.php

@@ -4 +4 @@
  * Plugin URI: https://razorpay.com
  * Description: Razorpay Payment Gateway Integration for WooCommerce.Razorpay Welcome Back Offer: New to Razorpay? Sign up to enjoy FREE payments* of INR 2 lakh till March 31st! Transact before January 10th to grab the offer.
- * Version: 4.7.5
- * Stable tag: 4.7.5
+ * Version: 4.7.6
+ * Stable tag: 4.7.6
  * Author: Team Razorpay
  * WC tested up to: 9.1.2
@@ -1431 +1431 @@
                 'app_offer'       => ($order->get_discount_total() > 0) ? 1 : 0,
                 'notes'           => array(
-                    self::WC_ORDER_NUMBER  => (string) $orderId,
-                ),
+                    self::WC_ORDER_ID      => (string) $orderId,
+                    self::WC_ORDER_NUMBER  => (string) $order->get_order_number()
+                )
             );
 
@@ -1579 +1580 @@
             $data["_"] = $this->getVersionMetaInfo($data);
 
-            $wooOrderId = $data['notes']['woocommerce_order_number'];
+            $wooOrderId = $data['notes']['woocommerce_order_id'];
 
             $redirectUrl = $this->getRedirectUrl($wooOrderId);
@@ -2131 +2132 @@
                 global $woocommerce;
 
-                $orderId = $order->get_order_number();
+                $orderId = $order->get_id();
 
                 rzpLogInfo("updateOrder orderId: $orderId , razorpayPaymentId: $razorpayPaymentId , success: $success");
@@ -2139 +2140 @@
                     try
                     {
-                        $wcOrderId = $order->get_id();
-
                         if ($this->isHposEnabled) {
                             $is1ccOrder = $order->get_meta('is_magic_checkout_order');
                         }else{
-                            $is1ccOrder = get_post_meta($wcOrderId, 'is_magic_checkout_order', true);
+                            $is1ccOrder = get_post_meta($orderId, 'is_magic_checkout_order', true);
                         }
 
-                        rzpLogInfo("Order details check initiated step 1 for the orderId: $wcOrderId");
+                        rzpLogInfo("Order details check initiated step 1 for the orderId: $orderId");
 
                         if (is1ccEnabled() && !empty($is1ccOrder) && $is1ccOrder == 'yes')
                         {
-                            rzpLogInfo("Order details update initiated step 1 for the orderId: $wcOrderId");
+                            rzpLogInfo("Order details update initiated step 1 for the orderId: $orderId");
 
                             //To verify whether the 1cc update order function already under execution or not
-                            if(get_transient('wc_order_under_process_'.$wcOrderId) === false)
+                            if(get_transient('wc_order_under_process_'.$orderId) === false)
                             {
-                                rzpLogInfo("Order details update initiated step 2 for the orderId: $wcOrderId");
-
-                                $this->update1ccOrderWC($order, $wcOrderId, $razorpayPaymentId);
+                                rzpLogInfo("Order details update initiated step 2 for the orderId: $orderId");
+
+                                $this->update1ccOrderWC($order, $orderId, $razorpayPaymentId);
                             }
 
@@ -2194 +2193 @@
                         $razorpayRoute = new RZP_Route_Action();
 
-                        $wcOrderId = $order->get_id();
-
-                        $razorpayRoute->transferFromPayment($wcOrderId, $razorpayPaymentId); // creates transfers from payment
+                        $razorpayRoute->transferFromPayment($orderId, $razorpayPaymentId); // creates transfers from payment
                     }
 
@@ -2896 +2893 @@
         protected function handleErrorCase($order)
         {
-            $orderId = $order->get_order_number();
+            $orderId = $order->get_id();
             rzpLogInfo('handleErrorCase');
             $this->msg['class'] = 'error';