Changeset 2619724
- Timestamp:
- 10/25/2021 10:59:34 PM (4 years ago)
- Location:
- smart-send-logistics
- Files:
-
- 5 edited
- 4 copied
-
tags/8.0.25 (copied) (copied from smart-send-logistics/trunk)
-
tags/8.0.25/includes/class-ss-shipping-shipment.php (modified) (2 diffs)
-
tags/8.0.25/includes/class-ss-shipping-wc-method.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-wc-method.php)
-
tags/8.0.25/includes/lib/Smartsend/Client.php (modified) (1 diff)
-
tags/8.0.25/readme.txt (copied) (copied from smart-send-logistics/trunk/readme.txt) (2 diffs)
-
tags/8.0.25/smart-send-logistics.php (copied) (copied from smart-send-logistics/trunk/smart-send-logistics.php) (2 diffs)
-
trunk/includes/class-ss-shipping-shipment.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/smart-send-logistics.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
smart-send-logistics/tags/8.0.25/includes/class-ss-shipping-shipment.php
r2066580 r2619724 164 164 ); 165 165 166 // If shipping phone number doesn't exist, try to get billing phone number 167 if (!isset($shipping_address['phone']) && isset($billing_address['phone'])) { 168 $shipping_address['phone'] = $billing_address['phone']; 169 } 170 171 // If shipping email doesn't exist, try to get billing email 166 // The shipping phone field was added in WooCommerce 5.6 but often added by hooks/plugins before that. 167 // Note that the field is not shown on checkout per default but can be enabled by filters/plugins. 168 // See: https://github.com/woocommerce/woocommerce/pull/30097#issuecomment-943114632 169 if (isset($shipping_address['phone']) && $shipping_address['phone']) { // Field did not exist prior to WooCommerce 5.6 170 $phone = $shipping_address['phone']; 171 } elseif ($shipping_address['country'] == $billing_address['country']) { // Require as only local phone numbers is accepted 172 $phone = $billing_address['phone']; 173 } else { 174 $phone = null; 175 } 176 177 // The shipping email field does not exist in default WP installations but can be added by filters/hooks. 172 178 if (!isset($shipping_address['email']) && isset($billing_address['email'])) { 173 179 $shipping_address['email'] = $billing_address['email']; … … 186 192 ->setCity($shipping_address['city'] ?: null) 187 193 ->setCountry($shipping_address['country'] ?: null) 188 ->setSms($ shipping_address['phone']?: null)194 ->setSms($phone ?: null) 189 195 ->setEmail($shipping_address['email'] ?: null); 190 196 -
smart-send-logistics/tags/8.0.25/includes/lib/Smartsend/Client.php
r2061608 r2619724 400 400 'timeout' => $timeout, 401 401 'httpversion' => '1.1', 402 'sslverify' => apply_filters('smart_send_sslverify', true), 402 403 )); 403 404 -
smart-send-logistics/tags/8.0.25/readme.txt
r2486879 r2619724 8 8 Tags: smartsend, smart send, shipping, shipping label, pickup, pick-up, pakkelabel, pakkelabels, pakkeboks, pakkeshop, hente selv, døgnboks, postnord, post nord, post danmark, gls, swipbox, bring, dao, dao365, dao 365, carrier, pacsoft, yourgls, mybring, postage, shipping method, your-gls, my-bring, pacosft-online, pacsoftonline, denmark, sweeden, posten, norway, post 9 9 Requires at least: 3.0.1 10 Tested up to: 5. 711 Stable tag: 8.0.2 310 Tested up to: 5.9 11 Stable tag: 8.0.25 12 12 License: GNU General Public License v3.0 13 13 License URI: http://www.gnu.org/licenses/gpl-3.0.html 14 14 WC requires at least: 3.0.0 15 WC tested up to: 5. 115 WC tested up to: 5.6 16 16 Requires PHP: 5.6.0 17 17 … … 201 201 == Changelog == 202 202 203 = 8.0.23 203 = 8.0.25 = 204 * Fix issue with missing receiver phone on some WooCommerce versions (v5.6+) 205 206 = 8.0.24 = 207 * Add filter smart_send_sslverify to fix ssl issues on older servers with incorrect SSL libraries 208 209 = 8.0.23 = 204 210 * Add WordPress 5.7 support 205 211 * Add WooCommerce 5.1 support -
smart-send-logistics/tags/8.0.25/smart-send-logistics.php
r2486942 r2619724 7 7 * Author URI: https://www.smartsend.io 8 8 * Text Domain: smart-send-logistics 9 * Version: 8.0.2 39 * Version: 8.0.25 10 10 * WC requires at least: 3.0.1 11 11 * WC tested up to: 5.1 … … 35 35 { 36 36 37 private $version = "8.0.2 3";37 private $version = "8.0.25"; 38 38 39 39 /** -
smart-send-logistics/trunk/includes/class-ss-shipping-shipment.php
r2066580 r2619724 164 164 ); 165 165 166 // If shipping phone number doesn't exist, try to get billing phone number 167 if (!isset($shipping_address['phone']) && isset($billing_address['phone'])) { 168 $shipping_address['phone'] = $billing_address['phone']; 169 } 170 171 // If shipping email doesn't exist, try to get billing email 166 // The shipping phone field was added in WooCommerce 5.6 but often added by hooks/plugins before that. 167 // Note that the field is not shown on checkout per default but can be enabled by filters/plugins. 168 // See: https://github.com/woocommerce/woocommerce/pull/30097#issuecomment-943114632 169 if (isset($shipping_address['phone']) && $shipping_address['phone']) { // Field did not exist prior to WooCommerce 5.6 170 $phone = $shipping_address['phone']; 171 } elseif ($shipping_address['country'] == $billing_address['country']) { // Require as only local phone numbers is accepted 172 $phone = $billing_address['phone']; 173 } else { 174 $phone = null; 175 } 176 177 // The shipping email field does not exist in default WP installations but can be added by filters/hooks. 172 178 if (!isset($shipping_address['email']) && isset($billing_address['email'])) { 173 179 $shipping_address['email'] = $billing_address['email']; … … 186 192 ->setCity($shipping_address['city'] ?: null) 187 193 ->setCountry($shipping_address['country'] ?: null) 188 ->setSms($ shipping_address['phone']?: null)194 ->setSms($phone ?: null) 189 195 ->setEmail($shipping_address['email'] ?: null); 190 196 -
smart-send-logistics/trunk/readme.txt
r2607814 r2619724 9 9 Requires at least: 3.0.1 10 10 Tested up to: 5.9 11 Stable tag: 8.0.2 411 Stable tag: 8.0.25 12 12 License: GNU General Public License v3.0 13 13 License URI: http://www.gnu.org/licenses/gpl-3.0.html … … 201 201 == Changelog == 202 202 203 = 8.0.25 = 204 * Fix issue with missing receiver phone on some WooCommerce versions (v5.6+) 205 203 206 = 8.0.24 = 204 207 * Add filter smart_send_sslverify to fix ssl issues on older servers with incorrect SSL libraries -
smart-send-logistics/trunk/smart-send-logistics.php
r2607804 r2619724 7 7 * Author URI: https://www.smartsend.io 8 8 * Text Domain: smart-send-logistics 9 * Version: 8.0.2 49 * Version: 8.0.25 10 10 * WC requires at least: 3.0.1 11 11 * WC tested up to: 5.1 … … 35 35 { 36 36 37 private $version = "8.0.2 4";37 private $version = "8.0.25"; 38 38 39 39 /**
Note: See TracChangeset
for help on using the changeset viewer.