Merge branch 'master' of https://github.com/razorpay/razorpay-woocommerce into 1cc-multiple-checkout

Author: poojarazor

includes/api/api.php

@@ -80,7 +80,7 @@ function rzp1ccInitRestApi()
 
     // save abandoned cart data
     register_rest_route(
-        RZP_1CC_ROUTES_BASE . '/',
+        RZP_1CC_ROUTES_BASE,
         'abandoned-cart',
         array(
             'methods'             => 'POST',

includes/api/order.php

@@ -95,6 +95,8 @@ function createWcOrder(WP_REST_Request $request)
         if (is_wp_error($orderId)) {
             $checkout_error = $orderId->get_error_message();
         }
+        //Keep order in draft status untill customer info available
+        updateOrderStatus($orderId, 'draft');
     } else {
         $existingOrder = wc_get_order($orderIdFromHash);
         $existingOrder->calculate_totals();
@@ -107,6 +109,8 @@ function createWcOrder(WP_REST_Request $request)
             if (is_wp_error($orderId)) {
                 $checkout_error = $orderId->get_error_message();
             }
+            //Keep order in draft status untill customer info available
+            updateOrderStatus($orderId, 'draft');
         } else {
             $orderId = $woocommerce->session->get(RZP_1CC_CART_HASH . $cartHash);
         }
@@ -117,7 +121,7 @@ function createWcOrder(WP_REST_Request $request)
     if ($order) {
 
         // To remove coupon added on order.
-        $coupons = $order->get_used_coupons();
+        $coupons = $order->get_coupon_codes();
         if (!empty($coupons)) {
             foreach ($coupons as $coupon) {
                 $order->remove_coupon($coupon);
@@ -239,3 +243,12 @@ function createWcOrder(WP_REST_Request $request)
         return new WP_REST_Response($response, 400);
     }
 }
+
+//Update order status according to the steps.
+function updateOrderStatus($orderId, $orderStatus)
+{
+    wp_update_post(array(
+        'ID'          => $orderId,
+        'post_status' => $orderStatus,
+    ));
+}

includes/api/save-abandonment-data.php

@@ -35,6 +35,11 @@ function saveCartAbandonmentData(WP_REST_Request $request)
     if (isset($razorpayData['receipt'])) {
         $wcOrderId = $razorpayData['receipt'];
 
+        if (isset($razorpayData['customer_details']['shipping_address'])) {
+            //Update the order status to wc-pending as we have the customer address info at this point.
+            updateOrderStatus($wcOrderId, 'wc-pending');
+
+        }
         $order = wc_get_order($wcOrderId);
     }
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: razorpay
 Tags: razorpay, payments, india, woocommerce, ecommerce
 Requires at least: 3.9.2
 Tested up to: 5.9
-Stable tag: 3.3.0
+Stable tag: 3.4.0
 Requires PHP: 5.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -41,6 +41,9 @@ This is compatible with WooCommerce>=2.4, including the new 3.0 release. It has
 
 == Changelog ==
 
+= 3.4.0 =
+* Bug fix for magic checkout blank orders.
+
 = 3.3.0 =
 * Magic checkout COD intelligence config moved from wooc dashboard to razorpay dashboard.
 
@@ -276,6 +279,12 @@ Yes, please see https://github.com/razorpay/razorpay-woocommerce/wiki/Webhooks f
 Please get multi-currency enabled for your account. Once you have it enabled, you can install any plugin
 version higher than 2.0.0, which comes with native multi-currency support.
 
+= How can I exclude Draft orders from woocommerce analytics reports? =
+
+Please follow the below steps:
+1. Click on the ‘Analytics’ settings in the WooCommerce dashboard menu.
+2. Go to the ‘Excluded statuses’ section and select the checkbox for ‘Draft’ orders under the ‘Unregistered statuses’ section.
+
 == Support ==
 
 Visit [razorpay.com](https://razorpay.com/support/#request/merchant/technical-assistance) for support requests.

woo-razorpay.php

@@ -3,8 +3,8 @@
  * Plugin Name: Razorpay for WooCommerce
  * Plugin URI: https://razorpay.com
  * Description: Razorpay Payment Gateway Integration for WooCommerce
- * Version: 3.3.0
- * Stable tag: 3.3.0
+ * Version: 3.4.0
+ * Stable tag: 3.4.0
  * Author: Team Razorpay
  * WC tested up to: 6.2.2
  * Author URI: https://razorpay.com
@@ -1117,6 +1117,9 @@ function check_razorpay_response()
             if (count($postIds) > 0)
             {
                 $orderId = $postIds[0];
+
+                updateOrderStatus($orderId, 'wc-pending');
+
                 $order = wc_get_order($orderId);
                 rzpLogInfo("get_transient in check_razorpay_response: orderId $orderId");
             }
@@ -1203,7 +1206,7 @@ function check_razorpay_response()
                     $razorpayOrderId = get_transient($sessionKey);
                     $razorpayData = $api->order->fetch($razorpayOrderId);
 
-                    $this->updateOrderAddress($razorpayData['items'][0], $order);
+                    $this->updateOrderAddress($razorpayData, $order);
                 }
 
                 $this->handleErrorCase($order);