Changeset 2725753

Timestamp:

05/18/2022 02:56:46 AM (4 years ago)

Author:

trackingmore

Message:

v.1.0.8 -- Test WordPress version 5.7 & 5.8 & 5.9, WooCommerce version 6.5.1

Location:

trackingmore-woocommerce-tracking/trunk

Files:

• api/class-trackingmore-api-orders.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• trackingmore.php (modified) (1 diff)

trackingmore-woocommerce-tracking/trunk/api/class-trackingmore-api-orders.php

@@ -73 +73 @@
 
         $order_data = array(
-            'id' => $order->id,
+            'id' => $order->get_id(),
             'order_number' => $order->get_order_number(),
             'created_at' => $this->server->format_datetime($order_post->post_date_gmt),
             'updated_at' => $this->server->format_datetime($order_post->post_modified_gmt),
-            'billing_address' => array(
-                'first_name' => $order->billing_first_name,
-                'last_name' => $order->billing_last_name,
-                'company' => $order->billing_company,
-                'address_1' => $order->billing_address_1,
-                'address_2' => $order->billing_address_2,
-                'city' => $order->billing_city,
-                'state' => $order->billing_state,
-                'postcode' => $order->billing_postcode,
-                'country' => $order->billing_country,
-                'email' => $order->billing_email,
-                'phone' => $order->billing_phone,
-            ),
-            'shipping_address' => array(
-                'first_name' => $order->shipping_first_name,
-                'last_name' => $order->shipping_last_name,
-                'company' => $order->shipping_company,
-                'address_1' => $order->shipping_address_1,
-                'address_2' => $order->shipping_address_2,
-                'city' => $order->shipping_city,
-                'state' => $order->shipping_state,
-                'postcode' => $order->shipping_postcode,
-                'country' => $order->shipping_country,
-            ),
-            'note' => $order->customer_note,
+            'billing_address' => $order->get_address('billing'),
+            'shipping_address' => $order->get_address('shipping'),
+            'note' => $order->get_customer_note(),
             'line_items' => array(),
         );
@@ -122 +100 @@
 
             $order_data['trackingmore']['woocommerce']['trackings'][] = array(
-                'tracking_provider' => get_post_meta($order->id, '_trackingmore_tracking_provider', true),
-                'tracking_number' => get_post_meta($order->id, '_trackingmore_tracking_number', true),
-                'tracking_ship_date' => get_post_meta($order->id, '_trackingmore_tracking_shipdate', true),
-                'tracking_postal_code' => get_post_meta($order->id, '_trackingmore_tracking_postal', true),
-                'tracking_account_number' => get_post_meta($order->id, '_trackingmore_tracking_account', true),
-                'tracking_key' => get_post_meta($order->id, '_trackingmore_tracking_key', true),
-                'tracking_destination_country' => get_post_meta($order->id, '_trackingmore_tracking_destination_country', true),
+                'tracking_provider' => get_post_meta($order->get_id(), '_trackingmore_tracking_provider', true),
+                'tracking_number' => get_post_meta($order->get_id(), '_trackingmore_tracking_number', true),
+                'tracking_ship_date' => get_post_meta($order->get_id(), '_trackingmore_tracking_shipdate', true),
+                'tracking_postal_code' => get_post_meta($order->get_id(), '_trackingmore_tracking_postal', true),
+                'tracking_account_number' => get_post_meta($order->get_id(), '_trackingmore_tracking_account', true),
+                'tracking_key' => get_post_meta($order->get_id(), '_trackingmore_tracking_key', true),
+                'tracking_destination_country' => get_post_meta($order->get_id(), '_trackingmore_tracking_destination_country', true),
             );
         }
         if (empty($tn)) {
-            $tn = get_post_meta($order->id, '_tracking_number', true);
+            $tn = get_post_meta($order->get_id(), '_tracking_number', true);
             if ($tn == NULL) {
-                if (is_array(get_post_meta($order->id, '_wc_shipment_tracking_items', true))) {
-                    $trackingmore_get_post_meta_number = get_post_meta($order->id, '_wc_shipment_tracking_items', true)[0]['tracking_number'];
+                if (is_array(get_post_meta($order->get_id(), '_wc_shipment_tracking_items', true))) {
+                    $trackingmore_get_post_meta_number = get_post_meta($order->get_id(), '_wc_shipment_tracking_items', true)[0]['tracking_number'];
                 }else{
                     $trackingmore_get_post_meta_number = '';
                 }
-                if (is_array(get_post_meta($order->id, '_wc_shipment_tracking_items', true))) {
-                    $trackingmore_get_post_meta_provider = get_post_meta($order->id, '_wc_shipment_tracking_items', true)[0]['custom_tracking_provider'];
+                if (is_array(get_post_meta($order->get_id(), '_wc_shipment_tracking_items', true))) {
+                    $trackingmore_get_post_meta_provider = get_post_meta($order->get_id(), '_wc_shipment_tracking_items', true)[0]['custom_tracking_provider'];
                 }else{
                     $trackingmore_get_post_meta_provider = '';

trackingmore-woocommerce-tracking/trunk/readme.txt

@@ -4 +4 @@
 Tags: shipping, tracking, ups, usps, fedex, dhl, tnt, dpd, post, shipment, Parcel, WooCommerce, tracking number, TrackingMore, parcel tracking, fulfilment, tracking link, carrier, courier, woo commerce, woocommerce parcel tracking, shipping details plugin, widget, track, package
 Requires at least: 2.9
-Tested up to: 5.5.1
+Tested up to: 5.9.3
 Stable tag: 1.1.8
 License: GPLv2 or later

trackingmore-woocommerce-tracking/trunk/trackingmore.php

@@ -4 +4 @@
  * Plugin URI: https://www.trackingmore.com/
  * Description: Add tracking number and carrier name to WooCommerce, display tracking info at order history page, auto import tracking numbers to trackingmore.
- * Version: 1.0.7
+ * Version: 1.0.8
  * Author: TrackingMore
  * Author URI: https://www.trackingmore.com