Changeset 3104227
- Timestamp:
- 06/18/2024 07:50:56 PM (20 months ago)
- Location:
- routeapp/trunk
- Files:
-
- 18 edited
-
includes/tracking-providers/class-routeapp-aftership-shipment-tracking.php (modified) (2 diffs)
-
includes/tracking-providers/class-routeapp-astracker-shipment-tracking.php (modified) (5 diffs)
-
includes/tracking-providers/class-routeapp-blazing-shipment-tracking.php (modified) (1 diff)
-
includes/tracking-providers/class-routeapp-common-tracking-providers.php (modified) (2 diffs)
-
includes/tracking-providers/class-routeapp-jetpack.php (modified) (6 diffs)
-
includes/tracking-providers/class-routeapp-mimo-shipment-tracking.php (modified) (4 diffs)
-
includes/tracking-providers/class-routeapp-shippingeasy.php (modified) (3 diffs)
-
includes/tracking-providers/class-routeapp-shippingeasycustom.php (modified) (3 diffs)
-
includes/tracking-providers/class-routeapp-shipstation.php (modified) (2 diffs)
-
includes/tracking-providers/class-routeapp-shipworks.php (modified) (3 diffs)
-
includes/tracking-providers/class-routeapp-usps-woocommerce-shipping.php (modified) (4 diffs)
-
includes/tracking-providers/class-routeapp-woo-orders-tracking.php (modified) (4 diffs)
-
includes/tracking-providers/class-routeapp-woocommerce-shipment-tracking-pro.php (modified) (7 diffs)
-
includes/tracking-providers/class-routeapp-woocommerce-shipment-tracking.php (modified) (5 diffs)
-
includes/tracking-providers/class-routeapp-wooshippinginfo-tracking.php (modified) (5 diffs)
-
includes/tracking-providers/class-routeapp-yith-woocommerce-tracking-order.php (modified) (3 diffs)
-
readme.txt (modified) (2 diffs)
-
routeapp.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
routeapp/trunk/includes/tracking-providers/class-routeapp-aftership-shipment-tracking.php
r3010221 r3104227 25 25 public function get_shipping_info($order_id) 26 26 { 27 $tracking_number = get_post_meta( $order_id, '_aftership_tracking_number', true);27 $tracking_number = $this->get_meta_data( $order_id, '_aftership_tracking_number' ); 28 28 if (!$tracking_number) return false; 29 $courier_id = get_post_meta( $order_id, '_aftership_tracking_provider', true);29 $courier_id = $this->get_meta_data( $order_id, '_aftership_tracking_provider' ); 30 30 $product_ids = $this->get_order_products($order_id); 31 31 return array( … … 39 39 public function update($order_id, $routeapp) { 40 40 41 $tracking_number = get_post_meta( $order_id, '_aftership_tracking_number', true);41 $tracking_number = $this->get_meta_data( $order_id, '_aftership_tracking_number' ); 42 42 if (!$tracking_number) return; 43 43 44 $tracking_provider = get_post_meta( $order_id, '_aftership_tracking_provider', true);44 $tracking_provider = $this->get_meta_data( $order_id, '_aftership_tracking_provider' ); 45 45 $product_ids = $this->get_order_products($order_id); 46 $route_tracking_number = get_post_meta( $order_id, 'routeapp_shipment_tracking_number', true);46 $route_tracking_number = $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_number' ); 47 47 48 48 if (!empty($route_tracking_number) && $tracking_number !== $route_tracking_number) { -
routeapp/trunk/includes/tracking-providers/class-routeapp-astracker-shipment-tracking.php
r2598882 r3104227 21 21 { 22 22 $couriers_array = array(); 23 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);23 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items' ); 24 24 if (!$tracking_items) return false; 25 25 foreach ( $tracking_items as $tracking_item ) { … … 32 32 { 33 33 $shipping_info = []; 34 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);34 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items' ); 35 35 if (!$tracking_items) return false; 36 36 $product_ids = $this->get_order_products($order_id); … … 50 50 public function update($order_id, $routeapp) { 51 51 52 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);52 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items' ); 53 53 if (!$tracking_items) return; 54 54 $product_ids = $this->get_order_products($order_id); 55 55 56 56 $existing_tracking_numbers = explode(self::SEPARATOR_PIPE, 57 get_post_meta( $order_id, 'routeapp_shipment_tracking_number', true));57 $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_number' )); 58 58 59 59 if ( count($tracking_items) > 0 ) { … … 98 98 } 99 99 } 100 if ($existing_tracking_numbers[0]!='' ) {100 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 101 101 foreach ($existing_tracking_numbers as $existing_tracking_number) { 102 102 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 106 106 } 107 107 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 108 $this->add_custom_post_meta($order_id, $tracking_numbers); 108 if (!empty($tracking_number)) { 109 $this->add_custom_post_meta($order_id, $tracking_numbers); 110 } 109 111 } else { 110 112 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-blazing-shipment-tracking.php
r2598882 r3104227 38 38 39 39 public function update($order_id, $routeapp) { 40 $tracking_number = get_post_meta( $order_id, '_bst_tracking_number', true);40 $tracking_number = $this->get_meta_data( $order_id, '_bst_tracking_number' ); 41 41 if (!$tracking_number) return; 42 42 43 $tracking_provider = get_post_meta( $order_id, '_bst_tracking_provider', true);43 $tracking_provider = $this->get_meta_data( $order_id, '_bst_tracking_provider' ); 44 44 45 45 $product_ids = $this->get_order_products($order_id); 46 46 47 $route_tracking_number = get_post_meta( $order_id, 'routeapp_shipment_tracking_number', true);47 $route_tracking_number = $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_number' ); 48 48 49 49 if (!empty($route_tracking_number) && $tracking_number !== $route_tracking_number) { -
routeapp/trunk/includes/tracking-providers/class-routeapp-common-tracking-providers.php
r2543845 r3104227 1 1 <?php 2 2 3 use Automattic\WooCommerce\Utilities\OrderUtil; 3 4 class Routeapp_WooCommerce_Common_Tracking_Provider { 4 5 … … 32 33 public function add_custom_post_meta($order_id, $tracking_number, $courier_id = false) 33 34 { 34 update_post_meta( $order_id, 'routeapp_shipment_api_called', 'success');35 update_post_meta( $order_id, 'routeapp_shipment_tracking_number', $tracking_number );35 self::update_post_meta_value($order_id, 'routeapp_shipment_api_called', 'success'); 36 self::update_post_meta_value( $order_id, 'routeapp_shipment_tracking_number', $tracking_number ); 36 37 if ($courier_id) { 37 update_post_meta( $order_id, 'routeapp_shipment_tracking_provider', $courier_id);38 self::update_post_meta_value($order_id, 'routeapp_shipment_tracking_provider', $courier_id); 38 39 } 39 40 return true; 41 } 42 43 /** 44 * Update post meta value 45 * 46 * @param $order_id 47 * @param $post_meta 48 * @param $value 49 */ 50 public static function update_post_meta_value( $order_id, $post_meta, $value) { 51 52 if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil') 53 && OrderUtil::custom_orders_table_usage_is_enabled() ) { 54 $order = wc_get_order($order_id); 55 $order->update_meta_data($post_meta, $value ); 56 $order->save(); 57 } else { 58 // Traditional CPT-based orders are in use. 59 update_post_meta( $order_id, $post_meta, $value ); 60 } 61 } 62 63 /** 64 * get meta data if custom order table is enabled 65 * @param $order_id 66 * @param $post_meta 67 * @return array|mixed|string 68 */ 69 public static function get_meta_data( $order_id, $post_meta ) { 70 if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil') 71 && OrderUtil::custom_orders_table_usage_is_enabled() ) { 72 $order = wc_get_order($order_id); 73 return $order->get_meta($post_meta); 74 } else { 75 // Traditional CPT-based orders are in use. 76 return get_post_meta($order_id, $post_meta, true); 77 } 40 78 } 41 79 -
routeapp/trunk/includes/tracking-providers/class-routeapp-jetpack.php
r2598882 r3104227 20 20 { 21 21 $couriers_array = array(); 22 $tracking_items = get_post_meta( $order_id, 'wc_connect_labels', true);22 $tracking_items = $this->get_meta_data( $order_id, 'wc_connect_labels' ); 23 23 foreach ( $tracking_items as $tracking_item ) { 24 24 $couriers_array[$tracking_item['tracking']] = strtolower($tracking_item['carrier_id']); … … 30 30 { 31 31 $shipping_info = []; 32 $tracking_data = get_post_meta( $order_id, 'wc_connect_labels', true);32 $tracking_data = $this->get_meta_data( $order_id, 'wc_connect_labels' ); 33 33 if (!$tracking_data) return false; 34 34 $product_ids = $this->get_order_products($order_id); … … 47 47 48 48 public function update($order_id, $routeapp) { 49 $tracking_data = get_post_meta( $order_id, 'wc_connect_labels', true);49 $tracking_data = $this->get_meta_data( $order_id, 'wc_connect_labels' ); 50 50 if (!$tracking_data) return; 51 51 … … 67 67 68 68 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 69 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));69 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 70 70 71 71 if (count($tracking_numbers)>0) { … … 108 108 } 109 109 } 110 if ($existing_tracking_numbers[0]!='' ) {110 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 111 111 foreach ($existing_tracking_numbers as $existing_tracking_number) { 112 112 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 117 117 118 118 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 119 $this->add_custom_post_meta($order_id, $tracking_numbers); 119 if ($tracking_numbers!='') { 120 $this->add_custom_post_meta($order_id, $tracking_numbers); 121 } 120 122 }else { 121 123 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-mimo-shipment-tracking.php
r2598882 r3104227 27 27 { 28 28 $courier_id = ''; 29 $tracking_provider_id = get_post_meta( $order_id , 'mimo_tracking_provider_id', true);29 $tracking_provider_id = $this->get_meta_data( $order_id , 'mimo_tracking_provider_id'); 30 30 foreach ($this->provider_list as $provider) { 31 31 if ($tracking_provider_id==$provider['id']) { … … 38 38 public function get_shipping_info($order_id) 39 39 { 40 $tracking_number = get_post_meta( $order_id, 'mimo_tracking_number', true);40 $tracking_number = $this->get_meta_data( $order_id, 'mimo_tracking_number' ); 41 41 if (!$tracking_number) return false; 42 42 $courier_id = $this->get_shipping_provider_name($order_id); … … 51 51 52 52 public function update($order_id, $routeapp) { 53 $tracking_number = get_post_meta( $order_id, 'mimo_tracking_number', true);53 $tracking_number = $this->get_meta_data( $order_id, 'mimo_tracking_number'); 54 54 if (!$tracking_number) return; 55 55 56 $tracking_provider_id = get_post_meta( $order_id , 'mimo_tracking_provider_id', true);56 $tracking_provider_id = $this->get_meta_data( $order_id , 'mimo_tracking_provider_id'); 57 57 $tracking_provider_name = ''; 58 58 foreach ($this->provider_list as $provider) { … … 62 62 } 63 63 $product_ids = $this->get_order_products($order_id); 64 $route_tracking_number = get_post_meta($order_id, 'routeapp_shipment_tracking_number', true);64 $route_tracking_number = $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number'); 65 65 66 66 if (!empty($route_tracking_number) && $tracking_number !== $route_tracking_number) { -
routeapp/trunk/includes/tracking-providers/class-routeapp-shippingeasy.php
r2598882 r3104227 92 92 ]); 93 93 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 94 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));94 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 95 95 if (!$order_notes && !$existing_tracking_numbers) return; 96 96 … … 137 137 } 138 138 } 139 if ($existing_tracking_numbers[0]!='' ) {139 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 140 140 foreach ($existing_tracking_numbers as $existing_tracking_number) { 141 141 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 145 145 } 146 146 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 147 $this->add_custom_post_meta($order_id, $tracking_numbers); 147 if (!empty($tracking_number)) { 148 $this->add_custom_post_meta($order_id, $tracking_numbers); 149 } 148 150 return true; 149 151 }else { -
routeapp/trunk/includes/tracking-providers/class-routeapp-shippingeasycustom.php
r2598882 r3104227 69 69 ]); 70 70 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 71 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));71 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 72 72 if (!$order_notes && !$existing_tracking_numbers) return; 73 73 … … 115 115 } 116 116 } 117 if ($existing_tracking_numbers[0]!='' ) {117 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 118 118 foreach ($existing_tracking_numbers as $existing_tracking_number) { 119 119 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 123 123 } 124 124 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 125 $this->add_custom_post_meta($order_id, $tracking_numbers); 125 if ($tracking_numbers!='') { 126 $this->add_custom_post_meta($order_id, $tracking_numbers); 127 } 126 128 }else { 127 129 /* If user removed the order note from Woo */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-shipstation.php
r2743116 r3104227 67 67 ]); 68 68 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 69 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));69 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 70 70 if (!$order_notes && !$existing_tracking_numbers) return; 71 71 … … 115 115 } 116 116 } 117 if ($existing_tracking_numbers[0]!='' ) {117 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 118 118 foreach ($existing_tracking_numbers as $existing_tracking_number) { 119 119 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { -
routeapp/trunk/includes/tracking-providers/class-routeapp-shipworks.php
r2598882 r3104227 68 68 ]); 69 69 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 70 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));70 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 71 71 if (!$order_notes && !$existing_tracking_numbers) return false; 72 72 … … 116 116 } 117 117 } 118 if ($existing_tracking_numbers[0]!='' ) {118 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 119 119 foreach ($existing_tracking_numbers as $existing_tracking_number) { 120 120 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 124 124 } 125 125 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 126 $this->add_custom_post_meta($order_id, $tracking_numbers); 126 if($tracking_numbers!='') { 127 $this->add_custom_post_meta($order_id, $tracking_numbers); 128 } 127 129 return true; 128 130 }else { -
routeapp/trunk/includes/tracking-providers/class-routeapp-usps-woocommerce-shipping.php
r2598882 r3104227 40 40 41 41 public function update($order_id, $routeapp) { 42 $tracking_data = get_post_meta( $order_id, 'usps_evs_label_details_array', true);42 $tracking_data = $this->get_meta_data( $order_id, 'usps_evs_label_details_array'); 43 43 if (!$tracking_data) return; 44 44 $product_ids = $this->get_order_products($order_id); … … 50 50 51 51 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 52 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));52 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 53 53 54 54 if (count($tracking_numbers)>0) { … … 91 91 } 92 92 } 93 if ($existing_tracking_numbers[0]!='' ) {93 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 94 94 foreach ($existing_tracking_numbers as $existing_tracking_number) { 95 95 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 100 100 101 101 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 102 103 $this->add_custom_post_meta($order_id, $tracking_numbers); 102 if ($tracking_numbers!='') { 103 $this->add_custom_post_meta($order_id, $tracking_numbers); 104 } 104 105 105 106 foreach ($_POST['meta'] as $key => $value) { -
routeapp/trunk/includes/tracking-providers/class-routeapp-woo-orders-tracking.php
r2986944 r3104227 34 34 } 35 35 return $couriers_array; 36 return get_post_meta( $order_id, 'routeapp_shipment_tracking_provider', true);36 return $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_provider'); 37 37 } 38 38 … … 101 101 //get tracking numbers that we have on our plugin 102 102 $existing_tracking_numbers = explode(self::SEPARATOR_PIPE, 103 get_post_meta( $order->get_id(), 'routeapp_shipment_tracking_number', true));103 $this->get_meta_data( $order->get_id(), 'routeapp_shipment_tracking_number')); 104 104 105 105 if (count($tracking_numbers)>0) { … … 135 135 } 136 136 } 137 if ($existing_tracking_numbers[0]!='' ) {137 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 138 138 foreach ($existing_tracking_numbers as $existing_tracking_number) { 139 139 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 144 144 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 145 145 146 $this->add_custom_post_meta($order->get_id(), $tracking_numbers); 146 if ($tracking_numbers!='') { 147 $this->add_custom_post_meta($order->get_id(), $tracking_numbers); 148 } 147 149 }else { 148 150 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-woocommerce-shipment-tracking-pro.php
r2598882 r3104227 20 20 public function get_shipping_provider_name($order_id) 21 21 { 22 return get_post_meta( $order_id, 'ph_shipment_tracking_shipping_service', true);22 return $this->get_meta_data( $order_id, 'ph_shipment_tracking_shipping_service'); 23 23 } 24 24 … … 26 26 { 27 27 $shipping_info = []; 28 $raw_tracking_number = get_post_meta( $order_id, 'ph_shipment_tracking_ids', true);28 $raw_tracking_number = $this->get_meta_data( $order_id, 'ph_shipment_tracking_ids' ); 29 29 if (!$raw_tracking_number) return false; 30 30 $tracking_numbers = explode(self::SEPARATOR_COMMA, $raw_tracking_number); 31 $courier_id = get_post_meta( $order_id, 'ph_shipment_tracking_shipping_service', true);31 $courier_id = $this->get_meta_data( $order_id, 'ph_shipment_tracking_shipping_service' ); 32 32 $product_ids = $this->get_order_products($order_id); 33 33 foreach ($tracking_numbers as $tracking_number){ … … 43 43 44 44 public function update($order_id, $routeapp) { 45 $raw_tracking_number = get_post_meta( $order_id, 'ph_shipment_tracking_ids', true);45 $raw_tracking_number = $this->get_meta_data( $order_id, 'ph_shipment_tracking_ids' ); 46 46 if (!$raw_tracking_number) return; 47 47 … … 50 50 $courier_id = isset($_GET['shipping_service']) ? 51 51 $_GET['shipping_service'] : 52 get_post_meta( $order_id, 'ph_shipment_tracking_shipping_service', true);52 $this->get_meta_data( $order_id, 'ph_shipment_tracking_shipping_service' ); 53 53 $tracking_numbers = explode(self::SEPARATOR_COMMA, $raw_tracking_number); 54 54 … … 60 60 61 61 $existing_tracking_numbers = (array) explode(self::SEPARATOR_PIPE, 62 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));62 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 63 63 64 64 if (count($tracking_numbers)>0) { … … 95 95 } 96 96 97 if ($existing_tracking_numbers[0]!='' ) {97 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 98 98 foreach ($existing_tracking_numbers as $existing_tracking_number) { 99 99 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 105 105 //save tracking values with pipe separator instead comma for compatibility with rest of plugins 106 106 $raw_tracking_number = str_replace(self::SEPARATOR_COMMA, self::SEPARATOR_PIPE, $raw_tracking_number); 107 $this->add_custom_post_meta($order_id, $raw_tracking_number, $courier_id); 107 if($raw_tracking_number!=''){ 108 $this->add_custom_post_meta($order_id, $raw_tracking_number, $courier_id); 109 } 108 110 }else { 109 111 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-woocommerce-shipment-tracking.php
r2598882 r3104227 21 21 { 22 22 $couriers_array = array(); 23 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);23 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items'); 24 24 if (!$tracking_items) return false; 25 25 foreach ( $tracking_items as $tracking_item ) { … … 33 33 { 34 34 $shipping_info = []; 35 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);35 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items'); 36 36 if (!$tracking_items) return false; 37 37 $product_ids = $this->get_order_products($order_id); … … 50 50 51 51 public function update($order_id, $routeapp) { 52 $tracking_items = get_post_meta( $order_id, '_wc_shipment_tracking_items', true);52 $tracking_items = $this->get_meta_data( $order_id, '_wc_shipment_tracking_items'); 53 53 if (!$tracking_items) return; 54 54 $product_ids = $this->get_order_products($order_id); 55 55 56 56 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 57 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));57 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number')); 58 58 59 59 if ( count($tracking_items) > 0 ) { … … 98 98 } 99 99 } 100 if ($existing_tracking_numbers[0]!='' ) {100 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 101 101 foreach ($existing_tracking_numbers as $existing_tracking_number) { 102 102 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 107 107 108 108 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 109 110 $this->add_custom_post_meta($order_id, $tracking_numbers); 109 if(!empty($tracking_numbers)) { 110 $this->add_custom_post_meta($order_id, $tracking_numbers); 111 } 111 112 } else { 112 113 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-wooshippinginfo-tracking.php
r2598882 r3104227 26 26 $shipping_info = []; 27 27 $tracking_numbers = []; 28 $tracking_numbers[0] = get_post_meta( $order_id, '_order_trackno', true);28 $tracking_numbers[0] = $this->get_meta_data( $order_id, '_order_trackno' ); 29 29 if (!$tracking_numbers[0]) return false; 30 30 for ($i = 1; $i < 5; $i++) { 31 $tracking_numbers[$i] = get_post_meta( $order_id, "_order_trackno{$i}", true);31 $tracking_numbers[$i] = $this->get_meta_data( $order_id, "_order_trackno{$i}" ); 32 32 } 33 33 $product_ids = $this->get_order_products($order_id); … … 46 46 public function update($order_id, $routeapp) { 47 47 $tracking_numbers = array(); 48 $tracking_numbers[0] = get_post_meta( $order_id, '_order_trackno', true);48 $tracking_numbers[0] = $this->get_meta_data( $order_id, '_order_trackno' ); 49 49 if (!$tracking_numbers[0]) return; 50 50 $courier_id = $this->get_shipping_provider_name($order_id); 51 51 for ($i = 1; $i < 5; $i++) { 52 $tracking_numbers[$i] = get_post_meta( $order_id, "_order_trackno{$i}", true);52 $tracking_numbers[$i] = $this->get_meta_data( $order_id, "_order_trackno{$i}" ); 53 53 } 54 54 $product_ids = $this->get_order_products($order_id); … … 61 61 62 62 $existing_tracking_numbers = (array) explode( self::SEPARATOR_PIPE, 63 get_post_meta($order_id, 'routeapp_shipment_tracking_number', true));63 $this->get_meta_data($order_id, 'routeapp_shipment_tracking_number' )); 64 64 65 65 if (count($tracking_numbers)>0) { … … 98 98 } 99 99 } 100 if ($existing_tracking_numbers[0]!='' ) {100 if ($existing_tracking_numbers[0]!='' && !empty($tracking_numbers_array)) { 101 101 foreach ($existing_tracking_numbers as $existing_tracking_number) { 102 102 if (!in_array($existing_tracking_number, $tracking_numbers_array)) { … … 106 106 } 107 107 $tracking_numbers = implode(self::SEPARATOR_PIPE, $tracking_numbers_array); 108 $this->add_custom_post_meta($order_id, $tracking_numbers, $courier_id); 108 if ($tracking_numbers!='') { 109 $this->add_custom_post_meta($order_id, $tracking_numbers, $courier_id); 110 } 109 111 }else { 110 112 /* If user removed the Tracking Code and updated to a new one */ -
routeapp/trunk/includes/tracking-providers/class-routeapp-yith-woocommerce-tracking-order.php
r2598882 r3104227 19 19 public function get_shipping_provider_name($order_id) 20 20 { 21 return get_post_meta( $order_id, 'routeapp_shipment_tracking_provider', true);21 return $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_provider' ); 22 22 } 23 23 24 24 public function get_shipping_info($order_id) 25 25 { 26 $tracking_number = get_post_meta( $order_id, 'ywot_tracking_code', true);27 $local_picked_up = get_post_meta( $order_id, 'ywot_picked_up', true);26 $tracking_number = $this->get_meta_data( $order_id, 'ywot_tracking_code' ); 27 $local_picked_up = $this->get_meta_data( $order_id, 'ywot_picked_up' ); 28 28 if (!$tracking_number || !empty($local_picked_up)) return false; 29 29 $product_ids = $this->get_order_products($order_id); 30 $tracking_provider = get_post_meta( $order_id, 'ywot_carrier_name', true);30 $tracking_provider = $this->get_meta_data( $order_id, 'ywot_carrier_name' ); 31 31 $courier_id = str_replace(' ', '-', strtolower($tracking_provider)); 32 32 return array( … … 39 39 40 40 public function update($order_id, $routeapp) { 41 $tracking_number = get_post_meta( $order_id, 'ywot_tracking_code', true);42 $local_picked_up = get_post_meta( $order_id, 'ywot_picked_up', true);41 $tracking_number = $this->get_meta_data( $order_id, 'ywot_tracking_code' ); 42 $local_picked_up = $this->get_meta_data( $order_id, 'ywot_picked_up' ); 43 43 44 44 if (!$tracking_number || !empty($local_picked_up)) return; 45 45 46 $tracking_provider = get_post_meta( $order_id, 'ywot_carrier_name', true);46 $tracking_provider = $this->get_meta_data( $order_id, 'ywot_carrier_name' ); 47 47 $tracking_provider = isset( $_POST['ywot_carrier_name'] ) ? stripslashes ( $_POST['ywot_carrier_name'] ) : $tracking_provider; 48 48 $tracking_provider_name = str_replace(' ', '-', strtolower($tracking_provider)); … … 50 50 $product_ids = $this->get_order_products($order_id); 51 51 52 $route_tracking_number = get_post_meta( $order_id, 'routeapp_shipment_tracking_number', true);52 $route_tracking_number = $this->get_meta_data( $order_id, 'routeapp_shipment_tracking_number' ); 53 53 54 54 if (!empty($route_tracking_number) && $tracking_number !== $route_tracking_number) { -
routeapp/trunk/readme.txt
r3103721 r3104227 6 6 Requires at least: 4.0 7 7 Tested up to: 6.4.1 8 Stable tag: 2.2.1 78 Stable tag: 2.2.18 9 9 Requires PHP: 5.6 10 10 License: GPLv2 or later … … 106 106 107 107 == Changelog == 108 = 2.2.18 = 109 * Update shipping tracking status for shipping providers 108 110 109 111 = 2.2.17 = -
routeapp/trunk/routeapp.php
r3103721 r3104227 10 10 * Plugin URI: https://route.com/for-merchants/ 11 11 * Description: Route allows shoppers to insure their orders with one-click during checkout, adding a layer of 3rd party trust while improving the customer shopping experience. 12 * Version: 2.2.1 712 * Version: 2.2.18 13 13 * Author: Route 14 14 * Author URI: https://route.com/ … … 26 26 * Currently plugin version. 27 27 */ 28 define( 'ROUTEAPP_VERSION', '2.2.1 7' );28 define( 'ROUTEAPP_VERSION', '2.2.18' ); 29 29 30 30 /**
Note: See TracChangeset
for help on using the changeset viewer.