Merge pull request #226 from kaolengmian7/fix/30350

[CNT30350]multiple tracking number in one shipment

aftership-woocommerce-tracking.php

@@ -478,7 +478,7 @@ private function includes() {
 				// require new files, don't adjust file order
 				require_once( $this->plugin_dir . '/includes/define.php' );
 				require_once( $this->plugin_dir . '/includes/class-aftership-import-csv.php' );
-				$this->import_csv = new AfterShip_Import_Csv($this->actions, $this->couriers);
+				$this->import_csv = new AfterShip_Import_Csv($this->couriers);
                 require( $this->plugin_dir . '/includes/class-aftership-fulfillment.php' );
                 $this->fulfillment_actions = AfterShip_Fulfillment::get_instance();
 			}

includes/class-aftership-actions.php

@@ -724,6 +724,13 @@ public function convert_old_meta_in_order( $order_id ) {
 			return;
 		}
 
+        $tracking_items = $this->get_tracking_items($order_id);
+		foreach ($tracking_items as $item) {
+			if ($item['tracking_number'] === $tracking_number && $item['slug'] === $aftership_tracking_provider_name) {
+				return;
+			}
+		}
+
 		// 需要判断 _aftership_tracking_provider_name 是否正确，否则 slug 为 空
 		$slug = null;
 		// 值是正确的slug，直接使用
@@ -1106,12 +1113,17 @@ public function render_wc_orders_list_columns( $column_name, $order ) {
     public function get_automizely_aftership_tracking_column( $order_id ) {
         ob_start();
 
-        $fulfilments = AfterShip_Fulfillment::get_instance()->get_fulfillments_by_wc( $order_id );
         $tracking_items = [];
-        foreach ($fulfilments as $fulfilment) {
-            if (isset($fulfilment['trackings'])) {
-                $tracking_items = array_merge($tracking_items, $fulfilment['trackings']);
+        $version = AfterShip_Fulfillment::get_instance()->frontend_version_controller();
+        if ( $version === 'v2' ) {
+            $fulfilments = AfterShip_Fulfillment::get_instance()->get_fulfillments_by_wc( $order_id );
+            foreach ($fulfilments as $fulfilment) {
+                if (isset($fulfilment['trackings'])) {
+                    $tracking_items = array_merge($tracking_items, $fulfilment['trackings']);
+                }
             }
+        } else {
+            $tracking_items = $this->get_tracking_items( $order_id );
         }
 
         if ( count( $tracking_items ) > 0 ) {

includes/class-aftership-import-csv.php

@@ -7,6 +7,10 @@
 	exit;
 }
 
+//require 'import/data.php';
+//require 'import/log.php';
+//require 'import/functions.php';
+
 class AfterShip_Import_Csv {
 	protected $settings;
 	protected $options;
@@ -24,8 +28,7 @@ class AfterShip_Import_Csv {
 	protected $selected_carrier_slugs;
 	protected $actions;
 
-	public function __construct( $actions, $couriers ) {
-		$this->actions                = $actions;
+	public function __construct( $couriers ) {
 		$this->options                = get_option( 'aftership_option_name' ) ? get_option( 'aftership_option_name' ) : array();
 		$selected_carrier_slugs       = explode( ',', ( isset( $this->options['couriers'] ) ? $this->options['couriers'] : '' ) );
 		$this->selected_carrier_slugs = array_filter( $selected_carrier_slugs );
@@ -497,7 +500,7 @@ public function import_tracking( $order_id, $data, $import_options, $order_numbe
 							'tracking_number' => $item['tracking_number'],
 							'line_items'      => $import_line_items,
 						);
-						$updated_order_tracking = $this->actions->post_order_tracking( $order_id, $post_tracking_params );
+						$updated_order_tracking = AfterShip_Actions::get_instance()->post_order_tracking( $order_id, $post_tracking_params );
 						if ( count( $updated_order_tracking ) ) {
 							$change ++;
 						} else {

readme.txt

@@ -142,7 +142,8 @@ Tailor a dynamic branded tracking page. Upload promotional banner, logo, and fav
 == Changelog ==
 
 = 1.17.15 =
-* Support Multi Tracking Numbers in one Shipments (BETA)
+* Support multiple tracking numbers in one Shipment (Beta)
+* Enable the option to select 'Other' as a courier when fulfilling orders.
 
 = 1.17.14 =
 * Fix known issue