Skip to content

Commit

Permalink
Merge pull request #219 from hefawei/fix-0229-code-error
Browse files Browse the repository at this point in the history
[CI]woocommerce as plugin: fix code issue for Code version compatible
  • Loading branch information
hefawei authored Feb 29, 2024
2 parents 0bd73c8 + d90ea3f commit 673d3aa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions aftership-woocommerce-tracking.php
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.10
* Version: 1.17.11
* 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.10' );
define( 'AFTERSHIP_VERSION', '1.17.11' );
define( 'AFTERSHIP_PATH', dirname( __FILE__ ) );
define( 'AFTERSHIP_ASSETS_URL', plugins_url() . '/' . basename( AFTERSHIP_PATH ) );
define( 'AFTERSHIP_SCRIPT_TAGS', 'aftership_script_tags' );
Expand Down
2 changes: 1 addition & 1 deletion includes/class-aftership-import-csv.php
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ public function import_csv() {
*
* @throws Exception
*/
public function import_tracking( $order_id = null, $data, $import_options, $order_number = null ) {
public function import_tracking( $order_id, $data, $import_options, $order_number = null ) {
if ( ( $order_id || $order_number ) && count( $data ) ) {
$order_status = $import_options['order_status'];
$original_order_id = $order_id;
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: https://www.aftership.com/
Tags: woocommerce shipping,woocommerce tracking,shipment tracking,order tracking, woocommerce,track order,dhl,ups,usps,fedex,shipping,tracking,order
Requires at least: 2.9
Tested up to: 6.3
Stable tag: 1.17.10
Stable tag: 1.17.11
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -141,6 +141,9 @@ Tailor a dynamic branded tracking page. Upload promotional banner, logo, and fav

== Changelog ==

= 1.17.11 =
* Fix known issue

= 1.17.10 =
* Enhancement: support order number column (csv template) for Import Tracking

Expand Down

0 comments on commit 673d3aa

Please sign in to comment.