AfterShip – WooCommerce Tracking - Version 1.7.3

Version Description

Download this release

Release Info

Developer aftership
Plugin Icon 128x128 AfterShip – WooCommerce Tracking
Version 1.7.3
Comparing to
See all releases

Code changes from version 1.7.2 to 1.7.3

Files changed (3) hide show
  1. aftership.php +2 -2
  2. api/class-aftership-api-orders.php +15 -15
  3. readme.txt +2 -8
aftership.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: AfterShip - WooCommerce Tracking
4
  Plugin URI: http://aftership.com/
5
  Description: Add tracking number and carrier name to WooCommerce, display tracking info at order history page, auto import tracking numbers to AfterShip.
6
- Version: 1.7.2
7
  Author: AfterShip
8
  Author URI: http://aftership.com
9
 
@@ -561,7 +561,7 @@ if (is_woocommerce_active()) {
561
  */
562
  function email_display($order)
563
  {
564
- $this->display_tracking_info($order->id, true);
565
  }
566
 
567
  private function display_track_button($tracking_provider, $tracking_number, $required_fields_values)
3
  Plugin Name: AfterShip - WooCommerce Tracking
4
  Plugin URI: http://aftership.com/
5
  Description: Add tracking number and carrier name to WooCommerce, display tracking info at order history page, auto import tracking numbers to AfterShip.
6
+ Version: 1.7.3
7
  Author: AfterShip
8
  Author URI: http://aftership.com
9
 
561
  */
562
  function email_display($order)
563
  {
564
+ $this->display_tracking_info((method_exists($order, 'get_id'))? $order->get_id() : $order->id, true);
565
  }
566
 
567
  private function display_track_button($tracking_provider, $tracking_number, $required_fields_values)
api/class-aftership-api-orders.php CHANGED
@@ -120,7 +120,7 @@ class AfterShip_API_Orders extends AfterShip_API_Resource
120
  $order_post = get_post($id);
121
 
122
  $order_data = array(
123
- 'id' => $order->id,
124
  'order_number' => $order->get_order_number(),
125
  'created_at' => $this->server->format_datetime($order_post->post_date_gmt),
126
  'updated_at' => $this->server->format_datetime($order_post->post_modified_gmt),
@@ -193,7 +193,7 @@ class AfterShip_API_Orders extends AfterShip_API_Resource
193
  'quantity' => (int)$item['qty'],
194
  // 'tax_class' => (!empty($item['tax_class'])) ? $item['tax_class'] : null,
195
  'name' => $item['name'],
196
- // 'product_id' => (isset($product->variation_id)) ? $product->variation_id : $product->id,
197
  // 'sku' => is_object($product) ? $product->get_sku() : null,
198
  );
199
  }
@@ -252,28 +252,28 @@ class AfterShip_API_Orders extends AfterShip_API_Resource
252
  // $result = array();
253
  // foreach($this->aftership_fields as $field){
254
  // $id = $field['id'];
255
- // $result[substr($id,10)] = get_post_meta($order->id, '_' . $field['id'], true);
256
  // }
257
  // $order_data['aftership']['woocommerce']['trackings'][] = $result;
258
 
259
  $order_data['aftership']['woocommerce']['trackings'][] = array(
260
- 'tracking_provider' => get_post_meta($order->id, '_aftership_tracking_provider', true),
261
- 'tracking_number' => get_post_meta($order->id, '_aftership_tracking_number', true),
262
- 'tracking_ship_date' => get_post_meta($order->id, '_aftership_tracking_shipdate', true),
263
- 'tracking_postal_code' => get_post_meta($order->id, '_aftership_tracking_postal', true),
264
- 'tracking_account_number' => get_post_meta($order->id, '_aftership_tracking_account', true),
265
- 'tracking_key' => get_post_meta($order->id, '_aftership_tracking_key', true),
266
- 'tracking_destination_country' => get_post_meta($order->id, '_aftership_tracking_destination_country', true),
267
  );
268
  }
269
  if ($tn == NULL) {
270
- // Handle old Shipping Tracking plugin
271
- $tn = get_post_meta($order->id, '_tracking_number', true);
272
  if ($tn == NULL) {
273
- // Handle new Shipping Tracking plugin version higher than 1.6.4
274
  $order_data['aftership']['woocommerce']['trackings'][] = array(
275
- 'tracking_number' => get_post_meta($order->id, '_wc_shipment_tracking_items', true)[0]['tracking_number'],
276
- 'tracking_provider' => get_post_meta($order->id, '_wc_shipment_tracking_items', true)[0]['custom_tracking_provider'],
277
  );
278
  } else {
279
  $order_data['aftership']['woocommerce']['trackings'][] = array(
120
  $order_post = get_post($id);
121
 
122
  $order_data = array(
123
+ 'id' => (method_exists($order, 'get_id'))? $order->get_id() : $order->id,
124
  'order_number' => $order->get_order_number(),
125
  'created_at' => $this->server->format_datetime($order_post->post_date_gmt),
126
  'updated_at' => $this->server->format_datetime($order_post->post_modified_gmt),
193
  'quantity' => (int)$item['qty'],
194
  // 'tax_class' => (!empty($item['tax_class'])) ? $item['tax_class'] : null,
195
  'name' => $item['name'],
196
+ // 'product_id' => (isset($product->variation_id)) ? $product->variation_id : (method_exists($product, 'get_id'))? $product->get_id() : $product->id,
197
  // 'sku' => is_object($product) ? $product->get_sku() : null,
198
  );
199
  }
252
  // $result = array();
253
  // foreach($this->aftership_fields as $field){
254
  // $id = $field['id'];
255
+ // $result[substr($id,10)] = get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_' . $field['id'], true);
256
  // }
257
  // $order_data['aftership']['woocommerce']['trackings'][] = $result;
258
 
259
  $order_data['aftership']['woocommerce']['trackings'][] = array(
260
+ 'tracking_provider' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_provider', true),
261
+ 'tracking_number' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_number', true),
262
+ 'tracking_ship_date' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_shipdate', true),
263
+ 'tracking_postal_code' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_postal', true),
264
+ 'tracking_account_number' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_account', true),
265
+ 'tracking_key' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_key', true),
266
+ 'tracking_destination_country' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_aftership_tracking_destination_country', true),
267
  );
268
  }
269
  if ($tn == NULL) {
270
+ // Handle old Shipping Tracking plugin
271
+ $tn = get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_tracking_number', true);
272
  if ($tn == NULL) {
273
+ // Handle new Shipping Tracking plugin version higher than 1.6.4
274
  $order_data['aftership']['woocommerce']['trackings'][] = array(
275
+ 'tracking_number' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_wc_shipment_tracking_items', true)[0]['tracking_number'],
276
+ 'tracking_provider' => get_post_meta((method_exists($order, 'get_id'))? $order->get_id() : $order->id, '_wc_shipment_tracking_items', true)[0]['custom_tracking_provider'],
277
  );
278
  } else {
279
  $order_data['aftership']['woocommerce']['trackings'][] = array(
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: aftership
3
  Donate link: https://www.aftership.com/
4
  Tags: shipping, tracking, ups, usps, fedex, dhl, tnt, dpd, post, shipment, woocommerce, tracking number, aftership, package tracking, fulfilment, tracking link, carrier, courier, woo commerce, woocommerce shipment tracking, shipping details plugin, widget, shipstation, track, package
5
  Requires at least: 2.9
6
- Tested up to: 4.8
7
- Stable tag: 1.7.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -97,12 +97,6 @@ You'll find the FAQ on [AfterShip.com](https://aftership.uservoice.com/knowledge
97
 
98
  == Changelog ==
99
 
100
- = 1.7.1 =
101
- * Change logos and screenshots
102
-
103
- = 1.7.0 =
104
- * Added support for new woocommerce shipment plugins
105
-
106
  = 1.6.8 =
107
  * Fix compatibility issue with Sendcloud plugin
108
 
3
  Donate link: https://www.aftership.com/
4
  Tags: shipping, tracking, ups, usps, fedex, dhl, tnt, dpd, post, shipment, woocommerce, tracking number, aftership, package tracking, fulfilment, tracking link, carrier, courier, woo commerce, woocommerce shipment tracking, shipping details plugin, widget, shipstation, track, package
5
  Requires at least: 2.9
6
+ Tested up to: 4.2.2
7
+ Stable tag: 1.7.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
97
 
98
  == Changelog ==
99
 
 
 
 
 
 
 
100
  = 1.6.8 =
101
  * Fix compatibility issue with Sendcloud plugin
102