Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI]Enhancement: support order number column (csv template) for Import Tracking #217

Merged
merged 7 commits into from
Feb 20, 2024
Merged

[CI]Enhancement: support order number column (csv template) for Import Tracking #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4725c5
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 2, 2024
80c4962
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 2, 2024
9d48099
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 2, 2024
296ed40
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 5, 2024
835a6f2
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 5, 2024
eb932bd
Enhancement: support order number column (csv template) for Import Tr…
Henry-fw Feb 5, 2024
bd40cd4
fix tracking edit error - additional_fields
Henry-fw Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aftership-woocommerce-tracking.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: AfterShip Tracking - All-In-One WooCommerce Order Tracking (Free plan available)
* Plugin URI: http://aftership.com/
* Description: Track orders in one place. shipment tracking, automated notifications, order lookup, branded tracking page, delivery day prediction
* Version: 1.17.7
* Version: 1.17.8
* Author: AfterShip
* Author URI: http://aftership.com
*
Expand All @@ -20,7 +20,7 @@

require_once( 'woo-includes/woo-functions.php' );

define( 'AFTERSHIP_VERSION', '1.17.7' );
define( 'AFTERSHIP_VERSION', '1.17.8' );
define( 'AFTERSHIP_PATH', dirname( __FILE__ ) );
define( 'AFTERSHIP_ASSETS_URL', plugins_url() . '/' . basename( AFTERSHIP_PATH ) );
define( 'AFTERSHIP_SCRIPT_TAGS', 'aftership_script_tags' );
Expand Down
4 changes: 3 additions & 1 deletion includes/class-aftership-actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ public function post_order_tracking( $order_id, $args ) {
$tracking_item['slug'] = wc_clean( $args['slug'] );
$tracking_item['tracking_number'] = wc_clean( $args['tracking_number'] );
$tracking_item['tracking_id'] = md5( "{$tracking_item['slug']}-{$tracking_item['tracking_number']}" );
// need apply default value
$tracking_item['additional_fields'] = array();
// line items for each tracking
if ( isset( $args['line_items'] ) && is_array( $args['line_items'] ) && count( $args['line_items'] ) ) {
$tracking_item['line_items'] = $args['line_items'];
Expand Down Expand Up @@ -1103,7 +1105,7 @@ public function get_automizely_aftership_tracking_column( $order_id ) {
<span class="dashicons dashicons-trash"></span>
</a>
</li>',
esc_html( isset( $provider_courier['name'] ) ? $provider_courier['name'] : '' ),
esc_html( isset( $provider_courier['name'] ) ? $provider_courier['name'] : $tracking_item['slug'] ),
esc_url( $aftership_tracking_link ),
esc_html( $tracking_item['tracking_number'] ),
esc_html( $tracking_item['tracking_number'] ),
Expand Down
Loading
Loading