Version Description
- 2017-07-14 =
- Added support for WooCommerce 3.1
- Fixed display shipping methods after adding Flexible Shipping to COD payment method
Download this release
Release Info
Developer | wpdesk |
Plugin | Flexible Shipping for WooCommerce |
Version | 1.9.5 |
Comparing to | |
See all releases |
Code changes from version 1.9.4 to 1.9.5
- classes/bulk-actions.php +2 -2
- flexible-shipping.php +28 -1
- readme.txt +8 -6
classes/bulk-actions.php
CHANGED
@@ -429,7 +429,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping_Bulk_Actions' ) ) {
|
|
429 |
if ( ! empty( $_REQUEST['bulk_flexible_shipping_send'] ) ) {
|
430 |
$bulk_flexible_shipping_send_count = intval( $_REQUEST['bulk_flexible_shipping_send'] );
|
431 |
printf( '<div id="message" class="updated fade"><p>' .
|
432 |
-
__( 'Bulk send shipment - processed orders: %d' ).
|
433 |
'</p></div>', $bulk_flexible_shipping_send_count
|
434 |
);
|
435 |
}
|
@@ -446,7 +446,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping_Bulk_Actions' ) ) {
|
|
446 |
if ( is_array( $labels ) ) {
|
447 |
$nonce = wp_create_nonce('flexible_shipping_labels');
|
448 |
printf('<div id="message" class="updated fade"><p>' .
|
449 |
-
__('Bulk labels - processed orders: %d. If download not start automatically click %shere%s.') .
|
450 |
'</p></div>', $bulk_flexible_shipping_labels_count, '<a id="flexible_shipping_labels_url" target="_blank" href=' . admin_url('?flexible_shipping_labels=' . basename($labels['tmp_zip']) . '&nonce=' . $nonce) . '>', '</a>'
|
451 |
);
|
452 |
}
|
429 |
if ( ! empty( $_REQUEST['bulk_flexible_shipping_send'] ) ) {
|
430 |
$bulk_flexible_shipping_send_count = intval( $_REQUEST['bulk_flexible_shipping_send'] );
|
431 |
printf( '<div id="message" class="updated fade"><p>' .
|
432 |
+
__( 'Bulk send shipment - processed orders: %d', 'flexible-shipping' ).
|
433 |
'</p></div>', $bulk_flexible_shipping_send_count
|
434 |
);
|
435 |
}
|
446 |
if ( is_array( $labels ) ) {
|
447 |
$nonce = wp_create_nonce('flexible_shipping_labels');
|
448 |
printf('<div id="message" class="updated fade"><p>' .
|
449 |
+
__('Bulk labels - processed orders: %d. If download not start automatically click %shere%s.', 'flexible-shipping') .
|
450 |
'</p></div>', $bulk_flexible_shipping_labels_count, '<a id="flexible_shipping_labels_url" target="_blank" href=' . admin_url('?flexible_shipping_labels=' . basename($labels['tmp_zip']) . '&nonce=' . $nonce) . '>', '</a>'
|
451 |
);
|
452 |
}
|
flexible-shipping.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
Plugin Name: Flexible Shipping
|
4 |
Plugin URI: https://wordpress.org/plugins/flexible-shipping/
|
5 |
Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
|
6 |
-
Version: 1.9.
|
7 |
Author: WP Desk
|
8 |
Author URI: https://www.wpdesk.net/
|
9 |
Text Domain: flexible-shipping
|
@@ -135,9 +135,36 @@ if ( wpdesk_is_plugin_active( 'woocommerce/woocommerce.php' ) && !class_exists(
|
|
135 |
if ( isset( $GLOBALS['WOOCS'] ) ) {
|
136 |
add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_woocs' ), 1 );
|
137 |
}
|
|
|
138 |
|
139 |
}
|
140 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
141 |
public function session_init() {
|
142 |
if ( ! session_id() ) {
|
143 |
session_start();
|
3 |
Plugin Name: Flexible Shipping
|
4 |
Plugin URI: https://wordpress.org/plugins/flexible-shipping/
|
5 |
Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
|
6 |
+
Version: 1.9.5
|
7 |
Author: WP Desk
|
8 |
Author URI: https://www.wpdesk.net/
|
9 |
Text Domain: flexible-shipping
|
135 |
if ( isset( $GLOBALS['WOOCS'] ) ) {
|
136 |
add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_woocs' ), 1 );
|
137 |
}
|
138 |
+
add_filter( 'option_woocommerce_cod_settings', array( $this, 'option_woocommerce_cod_settings' ) );
|
139 |
|
140 |
}
|
141 |
|
142 |
+
public function option_woocommerce_cod_settings( $value ) {
|
143 |
+
if ( is_checkout() ) {
|
144 |
+
if (
|
145 |
+
!empty( $value )
|
146 |
+
&& is_array( $value )
|
147 |
+
&& $value['enabled'] == 'yes'
|
148 |
+
&& !empty( $value['enable_for_methods'] )
|
149 |
+
&& is_array( $value['enable_for_methods'] )
|
150 |
+
) {
|
151 |
+
foreach ( $value['enable_for_methods'] as $method ) {
|
152 |
+
if ( $method == 'flexible_shipping' ) {
|
153 |
+
$all_fs_methods = flexible_shipping_get_all_shipping_methods();
|
154 |
+
$all_shipping_methods = flexible_shipping_get_all_shipping_methods();
|
155 |
+
$flexible_shipping = $all_shipping_methods['flexible_shipping'];
|
156 |
+
$flexible_shipping_rates = $flexible_shipping->get_all_rates();
|
157 |
+
foreach ( $flexible_shipping_rates as $flexible_shipping_rate ) {
|
158 |
+
$value['enable_for_methods'][] = $flexible_shipping_rate['id_for_shipping'];
|
159 |
+
}
|
160 |
+
break;
|
161 |
+
}
|
162 |
+
}
|
163 |
+
}
|
164 |
+
}
|
165 |
+
return $value;
|
166 |
+
}
|
167 |
+
|
168 |
public function session_init() {
|
169 |
if ( ! session_id() ) {
|
170 |
session_start();
|
readme.txt
CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.wpdesk.net/products/flexible-shipping-pro-woocommerce/
|
|
4 |
Tags: table rate, table rate shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes
|
5 |
Requires at least: 4.4
|
6 |
Tested up to: 4.8
|
7 |
-
Stable tag: 1.9.
|
8 |
License: GPLv3 or later
|
9 |
License URI: http://www.gnu.org/licenses/gpl-3.0.html
|
10 |
|
@@ -70,13 +70,11 @@ The Location Based Shipping Add-On extends Flexible Shipping for WooCommerce wit
|
|
70 |
|
71 |
= WooCommerce Compatibility =
|
72 |
|
73 |
-
**WooCommerce 3.
|
74 |
|
75 |
-
**
|
76 |
|
77 |
-
Flexible Shipping also plays well with older versions of WooCommerce. We tested the plugin with WooCommerce 2.5.x.
|
78 |
-
|
79 |
-
We dropped support for WooCommerce 2.3 and 2.4 in Flexible Shipping 1.8. Older versions of Flexible Shipping work with 2.3 and 2.4.
|
80 |
|
81 |
= Docs =
|
82 |
|
@@ -160,6 +158,10 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
|
|
160 |
|
161 |
== Changelog ==
|
162 |
|
|
|
|
|
|
|
|
|
163 |
= 1.9.4 - 2017-06-22 =
|
164 |
* Added support for WordPress below 4.7 in the WP Desk Tracker class
|
165 |
* Fixed shipping methods export in Flexible Shipping PRO
|
4 |
Tags: table rate, table rate shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes
|
5 |
Requires at least: 4.4
|
6 |
Tested up to: 4.8
|
7 |
+
Stable tag: 1.9.5
|
8 |
License: GPLv3 or later
|
9 |
License URI: http://www.gnu.org/licenses/gpl-3.0.html
|
10 |
|
70 |
|
71 |
= WooCommerce Compatibility =
|
72 |
|
73 |
+
**WooCommerce 3.1 ready!** In Flexible Shipping 1.9.5 we introduced support for WooCommerce 3.1.
|
74 |
|
75 |
+
**Shipping Zones ready!** Flexible Shipping is compatible with WooCommerce Shipping Zones introduced in version 2.6. Read more about [WooCommerce Shipping Zones](https://www.wpdesk.net/blog/woocommerce-shipping-zones-explained/).
|
76 |
|
77 |
+
Flexible Shipping also plays well with older versions of WooCommerce. We tested the plugin with WooCommerce 2.5.x and up.
|
|
|
|
|
78 |
|
79 |
= Docs =
|
80 |
|
158 |
|
159 |
== Changelog ==
|
160 |
|
161 |
+
= 1.9.5 - 2017-07-14 =
|
162 |
+
* Added support for WooCommerce 3.1
|
163 |
+
* Fixed display shipping methods after adding Flexible Shipping to COD payment method
|
164 |
+
|
165 |
= 1.9.4 - 2017-06-22 =
|
166 |
* Added support for WordPress below 4.7 in the WP Desk Tracker class
|
167 |
* Fixed shipping methods export in Flexible Shipping PRO
|