AfterShip – WooCommerce Tracking - Version 1.14.3

Version Description

  • Fix known issue
Download this release

Release Info

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

Code changes from version 1.14.2 to 1.14.3

Files changed (3) hide show
  1. aftership-woocommerce-tracking.php +2 -2
  2. includes/class-aftership-actions.php +27 -7
  3. readme.txt +4 -1
aftership-woocommerce-tracking.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: AfterShip Tracking - All-In-One WooCommerce Order Tracking (Free plan available)
4
  * Plugin URI: http://aftership.com/
5
  * Description: Track orders in one place. shipment tracking, automated notifications, order lookup, branded tracking page, delivery day prediction
6
- * Version: 1.14.2
7
  * Author: AfterShip
8
  * Author URI: http://aftership.com
9
  *
@@ -20,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
20
 
21
  require_once( 'woo-includes/woo-functions.php' );
22
 
23
- define( 'AFTERSHIP_VERSION', '1.14.2' );
24
  define( 'AFTERSHIP_PATH', dirname( __FILE__ ) );
25
  define( 'AFTERSHIP_ASSETS_URL', plugins_url() . '/' . basename( AFTERSHIP_PATH ) );
26
 
3
  * Plugin Name: AfterShip Tracking - All-In-One WooCommerce Order Tracking (Free plan available)
4
  * Plugin URI: http://aftership.com/
5
  * Description: Track orders in one place. shipment tracking, automated notifications, order lookup, branded tracking page, delivery day prediction
6
+ * Version: 1.14.3
7
  * Author: AfterShip
8
  * Author URI: http://aftership.com
9
  *
20
 
21
  require_once( 'woo-includes/woo-functions.php' );
22
 
23
+ define( 'AFTERSHIP_VERSION', '1.14.3' );
24
  define( 'AFTERSHIP_PATH', dirname( __FILE__ ) );
25
  define( 'AFTERSHIP_ASSETS_URL', plugins_url() . '/' . basename( AFTERSHIP_PATH ) );
26
 
includes/class-aftership-actions.php CHANGED
@@ -565,18 +565,38 @@ class AfterShip_Actions {
565
  }
566
  update_post_meta( $order_id, '_aftership_migrated', 'ok' );
567
 
568
- $slug = get_post_meta( $order_id, '_aftership_tracking_provider_name', true );
569
- $tracking_number = get_post_meta( $order_id, '_aftership_tracking_number', true );
570
- $account_number = get_post_meta( $order_id, '_aftership_tracking_account', true );
571
- $key = get_post_meta( $order_id, '_aftership_tracking_key', true );
572
- $postal_code = get_post_meta( $order_id, '_aftership_tracking_postal', true );
573
- $ship_date = get_post_meta( $order_id, '_aftership_tracking_shipdate', true );
574
- $destination_country = get_post_meta( $order_id, '_aftership_tracking_destination_country', true );
575
 
576
  if ( ! $tracking_number ) {
577
  return;
578
  }
579
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
580
  $args = array(
581
  'slug' => $slug,
582
  'tracking_number' => $tracking_number,
565
  }
566
  update_post_meta( $order_id, '_aftership_migrated', 'ok' );
567
 
568
+ $aftership_tracking_provider_name = get_post_meta( $order_id, '_aftership_tracking_provider_name', true );
569
+ $tracking_number = get_post_meta( $order_id, '_aftership_tracking_number', true );
570
+ $account_number = get_post_meta( $order_id, '_aftership_tracking_account', true );
571
+ $key = get_post_meta( $order_id, '_aftership_tracking_key', true );
572
+ $postal_code = get_post_meta( $order_id, '_aftership_tracking_postal', true );
573
+ $ship_date = get_post_meta( $order_id, '_aftership_tracking_shipdate', true );
574
+ $destination_country = get_post_meta( $order_id, '_aftership_tracking_destination_country', true );
575
 
576
  if ( ! $tracking_number ) {
577
  return;
578
  }
579
 
580
+ // 需要判断 _aftership_tracking_provider_name 是否正确，否则 slug 为 空
581
+ $slug = null;
582
+ // 值是正确的slug，直接使用
583
+ if ( in_array( $aftership_tracking_provider_name, array_column( $GLOBALS['AfterShip']->selected_couriers, 'slug' ) ) ) {
584
+ $slug = $aftership_tracking_provider_name;
585
+ }
586
+ // 由于历史版本原因，值可能为courier name，则匹配 name 对应的 slug
587
+ if ( ! $slug ) {
588
+ $couriers_by_name = array();
589
+ foreach ( $GLOBALS['AfterShip']->selected_couriers as $i => $courier ) {
590
+ if ( $courier['name'] === $aftership_tracking_provider_name ) {
591
+ array_push( $couriers_by_name, $courier );
592
+ }
593
+ }
594
+ // 有可能 name 相同的有多条，只有1条时匹配
595
+ if ( count( $couriers_by_name ) === 1 ) {
596
+ $slug = $couriers_by_name[0]['slug'];
597
+ }
598
+ }
599
+
600
  $args = array(
601
  'slug' => $slug,
602
  'tracking_number' => $tracking_number,
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.aftership.com/
4
  Tags: woocommerce shipping,woocommerce tracking,shipment tracking,order tracking, woocommerce,track order,dhl,ups,usps,fedex,shipping,tracking,order
5
  Requires at least: 2.9
6
  Tested up to: 5.7
7
- Stable tag: 1.14.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -138,6 +138,9 @@ Tailor a dynamic branded tracking page. Upload promotional banner, logo, and fav
138
 
139
  == Changelog ==
140
 
 
 
 
141
  = 1.14.2 =
142
  * Fix known issue
143
 
4
  Tags: woocommerce shipping,woocommerce tracking,shipment tracking,order tracking, woocommerce,track order,dhl,ups,usps,fedex,shipping,tracking,order
5
  Requires at least: 2.9
6
  Tested up to: 5.7
7
+ Stable tag: 1.14.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
138
 
139
  == Changelog ==
140
 
141
+ = 1.14.3 =
142
+ * Fix known issue
143
+
144
  = 1.14.2 =
145
  * Fix known issue
146