Version Description
2020-04-21 = * Tweak - Obfuscate logging data.
See changelog for all versions.
Download this release
Release Info
| Developer | royho |
| Plugin | |
| Version | 4.1.35 |
| Comparing to | |
| See all releases | |
Code changes from version 4.1.34 to 4.1.35
changelog.txt
CHANGED
|
@@ -1,5 +1,8 @@
|
|
| 1 |
*** ShipStation for WooCommerce ***
|
| 2 |
|
|
|
|
|
|
|
|
|
|
| 3 |
= 4.1.34 2020-03-09 =
|
| 4 |
* Tweak - WP tested up to 5.4.
|
| 5 |
* Tweak - WC tested up to 4.0.
|
| 1 |
*** ShipStation for WooCommerce ***
|
| 2 |
|
| 3 |
+
= 4.1.35 - 2020-04-21 =
|
| 4 |
+
* Tweak - Obfuscate logging data.
|
| 5 |
+
|
| 6 |
= 4.1.34 2020-03-09 =
|
| 7 |
* Tweak - WP tested up to 5.4.
|
| 8 |
* Tweak - WC tested up to 4.0.
|
includes/api-requests/class-wc-shipstation-api-shipnotify.php
CHANGED
|
@@ -180,11 +180,20 @@ class WC_Shipstation_API_Shipnotify extends WC_Shipstation_API_Request {
|
|
| 180 |
$can_parse_xml = false;
|
| 181 |
$this->log( __( 'Missing ShipNotify XML input.', 'woocommerce-shipstation' ) );
|
| 182 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 183 |
// For unknown reason raw post data can be empty. Log all requests
|
| 184 |
// information might help figuring out the culprit.
|
| 185 |
//
|
| 186 |
// @see https://github.com/woocommerce/woocommerce-shipstation/issues/80.
|
| 187 |
-
$this->log( '$_REQUEST: ' . print_r( $
|
| 188 |
}
|
| 189 |
|
| 190 |
if ( ! function_exists( 'simplexml_import_dom' ) ) {
|
| 180 |
$can_parse_xml = false;
|
| 181 |
$this->log( __( 'Missing ShipNotify XML input.', 'woocommerce-shipstation' ) );
|
| 182 |
|
| 183 |
+
$mask = array(
|
| 184 |
+
'auth_key' => '***',
|
| 185 |
+
'woocommerce-login-nonce' => '***',
|
| 186 |
+
'_wpnonce' => '***',
|
| 187 |
+
'woocommerce-reset-password-nonce' => '***',
|
| 188 |
+
);
|
| 189 |
+
|
| 190 |
+
$obfuscated_request = $mask + $_REQUEST;
|
| 191 |
+
|
| 192 |
// For unknown reason raw post data can be empty. Log all requests
|
| 193 |
// information might help figuring out the culprit.
|
| 194 |
//
|
| 195 |
// @see https://github.com/woocommerce/woocommerce-shipstation/issues/80.
|
| 196 |
+
$this->log( '$_REQUEST: ' . print_r( $obfuscated_request, true ) );
|
| 197 |
}
|
| 198 |
|
| 199 |
if ( ! function_exists( 'simplexml_import_dom' ) ) {
|
includes/class-wc-shipstation-api.php
CHANGED
|
@@ -68,8 +68,14 @@ class WC_Shipstation_API extends WC_Shipstation_API_Request {
|
|
| 68 |
self::$authenticated = true;
|
| 69 |
|
| 70 |
if ( in_array( $this->request['action'], array( 'export', 'shipnotify' ) ) ) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
/* translators: 1: query string */
|
| 72 |
-
$this->log( sprintf( __( 'Input params: %s', 'woocommerce-shipstation' ), http_build_query( $
|
| 73 |
$request_class = include( 'api-requests/class-wc-shipstation-api-' . $this->request['action'] . '.php' );
|
| 74 |
$request_class->request();
|
| 75 |
} else {
|
| 68 |
self::$authenticated = true;
|
| 69 |
|
| 70 |
if ( in_array( $this->request['action'], array( 'export', 'shipnotify' ) ) ) {
|
| 71 |
+
$mask = array(
|
| 72 |
+
'auth_key' => '***',
|
| 73 |
+
);
|
| 74 |
+
|
| 75 |
+
$obfuscated_request = $mask + $this->request;
|
| 76 |
+
|
| 77 |
/* translators: 1: query string */
|
| 78 |
+
$this->log( sprintf( __( 'Input params: %s', 'woocommerce-shipstation' ), http_build_query( $obfuscated_request ) ) );
|
| 79 |
$request_class = include( 'api-requests/class-wc-shipstation-api-' . $this->request['action'] . '.php' );
|
| 80 |
$request_class->request();
|
| 81 |
} else {
|
includes/data/data-settings.php
CHANGED
|
@@ -45,17 +45,17 @@ $fields = array(
|
|
| 45 |
'options' => $statuses,
|
| 46 |
'class' => 'chosen_select',
|
| 47 |
'css' => 'width: 450px;',
|
| 48 |
-
'description' => __( 'Define the order statuses you wish to export to ShipStation.', 'woocommerce' ),
|
| 49 |
'desc_tip' => true,
|
| 50 |
'custom_attributes' => array(
|
| 51 |
-
'data-placeholder' => __( 'Select Order Statuses', 'woocommerce' ),
|
| 52 |
),
|
| 53 |
),
|
| 54 |
'shipped_status' => array(
|
| 55 |
'title' => __( 'Shipped Order Status…', 'woocommerce-shipstation' ),
|
| 56 |
'type' => 'select',
|
| 57 |
'options' => $statuses,
|
| 58 |
-
'description' => __( 'Define the order status you wish to update to once an order has been shipping via ShipStation. By default this is "Completed".', 'woocommerce' ),
|
| 59 |
'desc_tip' => true,
|
| 60 |
'default' => 'wc-completed',
|
| 61 |
),
|
|
@@ -63,8 +63,8 @@ $fields = array(
|
|
| 63 |
'title' => __( 'Logging', 'woocommerce-shipstation' ),
|
| 64 |
'label' => __( 'Enable Logging', 'woocommerce-shipstation' ),
|
| 65 |
'type' => 'checkbox',
|
| 66 |
-
'description' => __( '
|
| 67 |
-
'desc_tip' =>
|
| 68 |
'default' => 'yes',
|
| 69 |
),
|
| 70 |
);
|
| 45 |
'options' => $statuses,
|
| 46 |
'class' => 'chosen_select',
|
| 47 |
'css' => 'width: 450px;',
|
| 48 |
+
'description' => __( 'Define the order statuses you wish to export to ShipStation.', 'woocommerce-shipstation' ),
|
| 49 |
'desc_tip' => true,
|
| 50 |
'custom_attributes' => array(
|
| 51 |
+
'data-placeholder' => __( 'Select Order Statuses', 'woocommerce-shipstation' ),
|
| 52 |
),
|
| 53 |
),
|
| 54 |
'shipped_status' => array(
|
| 55 |
'title' => __( 'Shipped Order Status…', 'woocommerce-shipstation' ),
|
| 56 |
'type' => 'select',
|
| 57 |
'options' => $statuses,
|
| 58 |
+
'description' => __( 'Define the order status you wish to update to once an order has been shipping via ShipStation. By default this is "Completed".', 'woocommerce-shipstation' ),
|
| 59 |
'desc_tip' => true,
|
| 60 |
'default' => 'wc-completed',
|
| 61 |
),
|
| 63 |
'title' => __( 'Logging', 'woocommerce-shipstation' ),
|
| 64 |
'label' => __( 'Enable Logging', 'woocommerce-shipstation' ),
|
| 65 |
'type' => 'checkbox',
|
| 66 |
+
'description' => __( 'Note: this may log personal information. We recommend using this for debugging purposes only and deleting the logs when finished.', 'woocommerce-shipstation' ),
|
| 67 |
+
'desc_tip' => 'Log all API interactions.',
|
| 68 |
'default' => 'yes',
|
| 69 |
),
|
| 70 |
);
|
languages/woocommerce-shipstation.pot
CHANGED
|
@@ -2,10 +2,10 @@
|
|
| 2 |
# This file is distributed under the same license as the WooCommerce - ShipStation Integration package.
|
| 3 |
msgid ""
|
| 4 |
msgstr ""
|
| 5 |
-
"Project-Id-Version: WooCommerce - ShipStation Integration 4.1.
|
| 6 |
"Report-Msgid-Bugs-To: "
|
| 7 |
"https://wordpress.org/support/plugin/woocommerce-shipstation\n"
|
| 8 |
-
"POT-Creation-Date: 2020-
|
| 9 |
"MIME-Version: 1.0\n"
|
| 10 |
"Content-Type: text/plain; charset=utf-8\n"
|
| 11 |
"Content-Transfer-Encoding: 8bit\n"
|
|
@@ -36,59 +36,59 @@ msgstr ""
|
|
| 36 |
msgid "Missing ShipNotify XML input."
|
| 37 |
msgstr ""
|
| 38 |
|
| 39 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 40 |
msgid "Missing SimpleXML extension for parsing ShipStation XML."
|
| 41 |
msgstr ""
|
| 42 |
|
| 43 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 44 |
msgid "ShipNotify XML: "
|
| 45 |
msgstr ""
|
| 46 |
|
| 47 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 48 |
msgid "Cannot parse XML"
|
| 49 |
msgstr ""
|
| 50 |
|
| 51 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 52 |
#. translators: 1: order id
|
| 53 |
msgid "Order %s can not be found."
|
| 54 |
msgstr ""
|
| 55 |
|
| 56 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 57 |
#. translators: 1: order id
|
| 58 |
msgid "Invalid order ID: %s"
|
| 59 |
msgstr ""
|
| 60 |
|
| 61 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 62 |
msgid "ShipNotify Item: "
|
| 63 |
msgstr ""
|
| 64 |
|
| 65 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 66 |
#. translators: 1: item name
|
| 67 |
msgid "Item %s is not shippable product. Skipping."
|
| 68 |
msgstr ""
|
| 69 |
|
| 70 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 71 |
#. translators: 1) shipped items 2) carrier's name 3) shipped date, 4) tracking
|
| 72 |
#. number
|
| 73 |
msgid "%1$s shipped via %2$s on %3$s with tracking number %4$s."
|
| 74 |
msgstr ""
|
| 75 |
|
| 76 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 77 |
#. translators: 1) number of shipped items 2) total shipped items 3) order ID
|
| 78 |
msgid "Shipped %1$d out of %2$d items in order %3$s"
|
| 79 |
msgstr ""
|
| 80 |
|
| 81 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 82 |
#. translators: 1) carrier's name 2) shipped date, 3) tracking number
|
| 83 |
msgid "Items shipped via %1$s on %2$s with tracking number %3$s (Shipstation)."
|
| 84 |
msgstr ""
|
| 85 |
|
| 86 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 87 |
#. translators: 1: order id
|
| 88 |
msgid "No items found - shipping entire order %d."
|
| 89 |
msgstr ""
|
| 90 |
|
| 91 |
-
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:
|
| 92 |
#. translators: 1) order ID 2) shipment status
|
| 93 |
msgid "Updated order %1$s to status %2$s"
|
| 94 |
msgstr ""
|
|
@@ -102,11 +102,11 @@ msgid "Invalid authentication key"
|
|
| 102 |
msgstr ""
|
| 103 |
|
| 104 |
#: includes/class-wc-shipstation-api.php:65
|
| 105 |
-
#: includes/class-wc-shipstation-api.php:
|
| 106 |
msgid "Invalid request"
|
| 107 |
msgstr ""
|
| 108 |
|
| 109 |
-
#: includes/class-wc-shipstation-api.php:
|
| 110 |
#. translators: 1: query string
|
| 111 |
msgid "Input params: %s"
|
| 112 |
msgstr ""
|
|
@@ -239,7 +239,9 @@ msgid "Enable Logging"
|
|
| 239 |
msgstr ""
|
| 240 |
|
| 241 |
#: includes/data/data-settings.php:66
|
| 242 |
-
msgid "
|
|
|
|
|
|
|
| 243 |
msgstr ""
|
| 244 |
|
| 245 |
#: woocommerce-shipstation.php:28
|
|
@@ -249,15 +251,15 @@ msgid ""
|
|
| 249 |
"download %s here."
|
| 250 |
msgstr ""
|
| 251 |
|
| 252 |
-
#: woocommerce-shipstation.php:
|
| 253 |
msgid "Settings"
|
| 254 |
msgstr ""
|
| 255 |
|
| 256 |
-
#: woocommerce-shipstation.php:
|
| 257 |
msgid "Support"
|
| 258 |
msgstr ""
|
| 259 |
|
| 260 |
-
#: woocommerce-shipstation.php:
|
| 261 |
msgid "Docs"
|
| 262 |
msgstr ""
|
| 263 |
|
| 2 |
# This file is distributed under the same license as the WooCommerce - ShipStation Integration package.
|
| 3 |
msgid ""
|
| 4 |
msgstr ""
|
| 5 |
+
"Project-Id-Version: WooCommerce - ShipStation Integration 4.1.35\n"
|
| 6 |
"Report-Msgid-Bugs-To: "
|
| 7 |
"https://wordpress.org/support/plugin/woocommerce-shipstation\n"
|
| 8 |
+
"POT-Creation-Date: 2020-04-21 19:34:10+00:00\n"
|
| 9 |
"MIME-Version: 1.0\n"
|
| 10 |
"Content-Type: text/plain; charset=utf-8\n"
|
| 11 |
"Content-Transfer-Encoding: 8bit\n"
|
| 36 |
msgid "Missing ShipNotify XML input."
|
| 37 |
msgstr ""
|
| 38 |
|
| 39 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:201
|
| 40 |
msgid "Missing SimpleXML extension for parsing ShipStation XML."
|
| 41 |
msgstr ""
|
| 42 |
|
| 43 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:206
|
| 44 |
msgid "ShipNotify XML: "
|
| 45 |
msgstr ""
|
| 46 |
|
| 47 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:211
|
| 48 |
msgid "Cannot parse XML"
|
| 49 |
msgstr ""
|
| 50 |
|
| 51 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:232
|
| 52 |
#. translators: 1: order id
|
| 53 |
msgid "Order %s can not be found."
|
| 54 |
msgstr ""
|
| 55 |
|
| 56 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:240
|
| 57 |
#. translators: 1: order id
|
| 58 |
msgid "Invalid order ID: %s"
|
| 59 |
msgstr ""
|
| 60 |
|
| 61 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:249
|
| 62 |
msgid "ShipNotify Item: "
|
| 63 |
msgstr ""
|
| 64 |
|
| 65 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:262
|
| 66 |
#. translators: 1: item name
|
| 67 |
msgid "Item %s is not shippable product. Skipping."
|
| 68 |
msgstr ""
|
| 69 |
|
| 70 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:280
|
| 71 |
#. translators: 1) shipped items 2) carrier's name 3) shipped date, 4) tracking
|
| 72 |
#. number
|
| 73 |
msgid "%1$s shipped via %2$s on %3$s with tracking number %4$s."
|
| 74 |
msgstr ""
|
| 75 |
|
| 76 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:296
|
| 77 |
#. translators: 1) number of shipped items 2) total shipped items 3) order ID
|
| 78 |
msgid "Shipped %1$d out of %2$d items in order %3$s"
|
| 79 |
msgstr ""
|
| 80 |
|
| 81 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:312
|
| 82 |
#. translators: 1) carrier's name 2) shipped date, 3) tracking number
|
| 83 |
msgid "Items shipped via %1$s on %2$s with tracking number %3$s (Shipstation)."
|
| 84 |
msgstr ""
|
| 85 |
|
| 86 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:319
|
| 87 |
#. translators: 1: order id
|
| 88 |
msgid "No items found - shipping entire order %d."
|
| 89 |
msgstr ""
|
| 90 |
|
| 91 |
+
#: includes/api-requests/class-wc-shipstation-api-shipnotify.php:345
|
| 92 |
#. translators: 1) order ID 2) shipment status
|
| 93 |
msgid "Updated order %1$s to status %2$s"
|
| 94 |
msgstr ""
|
| 102 |
msgstr ""
|
| 103 |
|
| 104 |
#: includes/class-wc-shipstation-api.php:65
|
| 105 |
+
#: includes/class-wc-shipstation-api.php:82
|
| 106 |
msgid "Invalid request"
|
| 107 |
msgstr ""
|
| 108 |
|
| 109 |
+
#: includes/class-wc-shipstation-api.php:78
|
| 110 |
#. translators: 1: query string
|
| 111 |
msgid "Input params: %s"
|
| 112 |
msgstr ""
|
| 239 |
msgstr ""
|
| 240 |
|
| 241 |
#: includes/data/data-settings.php:66
|
| 242 |
+
msgid ""
|
| 243 |
+
"Note: this may log personal information. We recommend using this for "
|
| 244 |
+
"debugging purposes only and deleting the logs when finished."
|
| 245 |
msgstr ""
|
| 246 |
|
| 247 |
#: woocommerce-shipstation.php:28
|
| 251 |
"download %s here."
|
| 252 |
msgstr ""
|
| 253 |
|
| 254 |
+
#: woocommerce-shipstation.php:97
|
| 255 |
msgid "Settings"
|
| 256 |
msgstr ""
|
| 257 |
|
| 258 |
+
#: woocommerce-shipstation.php:98
|
| 259 |
msgid "Support"
|
| 260 |
msgstr ""
|
| 261 |
|
| 262 |
+
#: woocommerce-shipstation.php:99
|
| 263 |
msgid "Docs"
|
| 264 |
msgstr ""
|
| 265 |
|
readme.txt
CHANGED
|
@@ -4,7 +4,7 @@ Tags: shipping, woocommerce, automattic
|
|
| 4 |
Requires at least: 4.4
|
| 5 |
Tested up to: 5.4
|
| 6 |
Requires PHP: 5.6
|
| 7 |
-
Stable tag: 4.1.
|
| 8 |
License: GPLv3
|
| 9 |
License URI: https://www.gnu.org/licenses/gpl-3.0.html
|
| 10 |
|
|
@@ -46,8 +46,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
|
|
| 46 |
|
| 47 |
== Changelog ==
|
| 48 |
|
| 49 |
-
= 4.1.
|
| 50 |
-
* Tweak -
|
| 51 |
-
* Tweak - WC tested up to 4.0.
|
| 52 |
|
| 53 |
[See changelog for all versions](https://github.com/woocommerce/woocommerce-shipstation/raw/master/changelog.txt).
|
| 4 |
Requires at least: 4.4
|
| 5 |
Tested up to: 5.4
|
| 6 |
Requires PHP: 5.6
|
| 7 |
+
Stable tag: 4.1.35
|
| 8 |
License: GPLv3
|
| 9 |
License URI: https://www.gnu.org/licenses/gpl-3.0.html
|
| 10 |
|
| 46 |
|
| 47 |
== Changelog ==
|
| 48 |
|
| 49 |
+
= 4.1.35 2020-04-21 =
|
| 50 |
+
* Tweak - Obfuscate logging data.
|
|
|
|
| 51 |
|
| 52 |
[See changelog for all versions](https://github.com/woocommerce/woocommerce-shipstation/raw/master/changelog.txt).
|
woocommerce-shipstation.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
/**
|
| 3 |
* Plugin Name: WooCommerce - ShipStation Integration
|
| 4 |
* Plugin URI: https://woocommerce.com/products/shipstation-integration/
|
| 5 |
-
* Version: 4.1.
|
| 6 |
* Description: Adds ShipStation label printing support to WooCommerce. Requires server DomDocument support.
|
| 7 |
* Author: WooCommerce
|
| 8 |
* Author URI: https://woocommerce.com/
|
|
@@ -41,14 +41,13 @@ function woocommerce_shipstation_init() {
|
|
| 41 |
return;
|
| 42 |
}
|
| 43 |
|
| 44 |
-
define( 'WC_SHIPSTATION_VERSION', '4.1.
|
| 45 |
define( 'WC_SHIPSTATION_FILE', __FILE__ );
|
| 46 |
|
| 47 |
if ( ! defined( 'WC_SHIPSTATION_EXPORT_LIMIT' ) ) {
|
| 48 |
define( 'WC_SHIPSTATION_EXPORT_LIMIT', 100 );
|
| 49 |
}
|
| 50 |
|
| 51 |
-
|
| 52 |
include_once( 'includes/class-wc-shipstation-integration.php' );
|
| 53 |
include_once( 'includes/class-wc-shipstation-privacy.php' );
|
| 54 |
}
|
| 2 |
/**
|
| 3 |
* Plugin Name: WooCommerce - ShipStation Integration
|
| 4 |
* Plugin URI: https://woocommerce.com/products/shipstation-integration/
|
| 5 |
+
* Version: 4.1.35
|
| 6 |
* Description: Adds ShipStation label printing support to WooCommerce. Requires server DomDocument support.
|
| 7 |
* Author: WooCommerce
|
| 8 |
* Author URI: https://woocommerce.com/
|
| 41 |
return;
|
| 42 |
}
|
| 43 |
|
| 44 |
+
define( 'WC_SHIPSTATION_VERSION', '4.1.35' ); // WRCS: DEFINED_VERSION.
|
| 45 |
define( 'WC_SHIPSTATION_FILE', __FILE__ );
|
| 46 |
|
| 47 |
if ( ! defined( 'WC_SHIPSTATION_EXPORT_LIMIT' ) ) {
|
| 48 |
define( 'WC_SHIPSTATION_EXPORT_LIMIT', 100 );
|
| 49 |
}
|
| 50 |
|
|
|
|
| 51 |
include_once( 'includes/class-wc-shipstation-integration.php' );
|
| 52 |
include_once( 'includes/class-wc-shipstation-privacy.php' );
|
| 53 |
}
|
