Flexible Shipping for WooCommerce - Version 4.11.2

Version Description

  • 2022-01-20 =
  • Added support for WooCommerce 6.2
  • Fixed fatal with WOOCS Currency Switcher for WooCommerce
Download this release

Release Info

Developer wpdesk
Plugin Icon 128x128 Flexible Shipping for WooCommerce
Version 4.11.2
Comparing to
See all releases

Code changes from version 4.11.1 to 4.11.2

Files changed (8) hide show
  1. classes/table-rate/{multicurrency.php → class-wpdesk-flexible-shipping-multicurrency.php} +8 -8
  2. flexible-shipping.php +4 -4
  3. lang/flexible-shipping.pot +2 -2
  4. readme.txt +5 -1
  5. vendor/autoload.php +1 -1
  6. vendor/composer/autoload_classmap.php +1 -1
  7. vendor/composer/autoload_real.php +4 -4
  8. vendor/composer/autoload_static.php +6 -6
classes/table-rate/{multicurrency.php → class-wpdesk-flexible-shipping-multicurrency.php} RENAMED
@@ -16,28 +16,28 @@ class WPDesk_Flexible_Shipping_Multicurrency {
16
  * @TODO move this functionality to wpdesk/wc-currency-switchers-integrations library.
17
  */
18
  public function hooks() {
19
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wpml' ), 1 );
20
 
21
  if ( class_exists( 'Aelia\WC\CurrencySwitcher\WC_Aelia_CurrencySwitcher' ) ) {
22
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_aelia_namespaces' ), 0 );
23
  } elseif ( class_exists( 'WC_Aelia_CurrencySwitcher' ) ) {
24
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_aelia' ), 1 );
25
  }
26
 
27
  if ( function_exists( 'wmcs_convert_price' ) ) {
28
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wmcs' ), 1 );
29
  }
30
 
31
  if ( isset( $GLOBALS['WOOCS'] ) ) {
32
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_woocs' ), 1 );
33
  }
34
 
35
  if ( class_exists( '\WOOMC\Price\Controller' ) ) {
36
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_woomc' ), 1 );
37
  }
38
 
39
  if ( function_exists( 'alg_wc_cs_get_currency_exchange_rate' ) ) {
40
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_alg' ), 1 );
41
  }
42
  }
43
 
@@ -109,7 +109,7 @@ class WPDesk_Flexible_Shipping_Multicurrency {
109
  * @return float
110
  */
111
  public function flexible_shipping_value_in_currency_woocs( $value ) {
112
- return $GLOBALS['WOOCS']->woocs_exchange_value( $value );
113
  }
114
 
115
  /**
16
  * @TODO move this functionality to wpdesk/wc-currency-switchers-integrations library.
17
  */
18
  public function hooks() {
19
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_wpml' ], 1 );
20
 
21
  if ( class_exists( 'Aelia\WC\CurrencySwitcher\WC_Aelia_CurrencySwitcher' ) ) {
22
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_aelia_namespaces' ], 0 );
23
  } elseif ( class_exists( 'WC_Aelia_CurrencySwitcher' ) ) {
24
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_aelia' ], 1 );
25
  }
26
 
27
  if ( function_exists( 'wmcs_convert_price' ) ) {
28
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_wmcs' ], 1 );
29
  }
30
 
31
  if ( isset( $GLOBALS['WOOCS'] ) ) {
32
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_woocs' ], 1 );
33
  }
34
 
35
  if ( class_exists( '\WOOMC\Price\Controller' ) ) {
36
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_woomc' ], 1 );
37
  }
38
 
39
  if ( function_exists( 'alg_wc_cs_get_currency_exchange_rate' ) ) {
40
+ add_filter( 'flexible_shipping_value_in_currency', [ $this, 'flexible_shipping_value_in_currency_alg' ], 1 );
41
  }
42
  }
43
 
109
  * @return float
110
  */
111
  public function flexible_shipping_value_in_currency_woocs( $value ) {
112
+ return $GLOBALS['WOOCS'] ? $GLOBALS['WOOCS']->woocs_exchange_value( $value ) : $value;
113
  }
114
 
115
  /**
flexible-shipping.php CHANGED
@@ -3,15 +3,15 @@
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: 4.11.1
7
  * Author: WP Desk
8
  * Author URI: https://flexibleshipping.com/?utm_source=fs&utm_medium=link&utm_campaign=plugin-list-author
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 5.2
12
  * Tested up to: 5.9
13
- * WC requires at least: 5.7
14
- * WC tested up to: 6.1
15
  * Requires PHP: 7.0
16
  *
17
  * Copyright 2017 WP Desk Ltd.
@@ -38,7 +38,7 @@ if ( ! defined( 'ABSPATH' ) ) {
38
  } // Exit if accessed directly
39
 
40
  /* THIS VARIABLE CAN BE CHANGED AUTOMATICALLY */
41
- $plugin_version = '4.11.1';
42
 
43
  $plugin_name = 'Flexible Shipping';
44
  $product_id = 'Flexible Shipping';
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: 4.11.2
7
  * Author: WP Desk
8
  * Author URI: https://flexibleshipping.com/?utm_source=fs&utm_medium=link&utm_campaign=plugin-list-author
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 5.2
12
  * Tested up to: 5.9
13
+ * WC requires at least: 5.8
14
+ * WC tested up to: 6.2
15
  * Requires PHP: 7.0
16
  *
17
  * Copyright 2017 WP Desk Ltd.
38
  } // Exit if accessed directly
39
 
40
  /* THIS VARIABLE CAN BE CHANGED AUTOMATICALLY */
41
+ $plugin_version = '4.11.2';
42
 
43
  $plugin_name = 'Flexible Shipping';
44
  $product_id = 'Flexible Shipping';
lang/flexible-shipping.pot CHANGED
@@ -2,14 +2,14 @@
2
  # This file is distributed under the same license as the Flexible Shipping plugin.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Flexible Shipping 4.11.1\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/flexible-shipping\n"
7
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
8
  "Language-Team: LANGUAGE <LL@li.org>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "POT-Creation-Date: 2022-01-04T10:34:17+00:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: flexible-shipping\n"
2
  # This file is distributed under the same license as the Flexible Shipping plugin.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Flexible Shipping 4.11.2\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/flexible-shipping\n"
7
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
8
  "Language-Team: LANGUAGE <LL@li.org>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "POT-Creation-Date: 2022-01-20T13:09:37+00:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: flexible-shipping\n"
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://flexibleshipping.com/products/flexible-shipping-pro-woocomm
4
  Tags: table rate, table rate shipping, conditional shipping, free 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, shipping, free shipping, advanced shipping
5
  Requires at least: 4.5
6
  Tested up to: 5.9
7
- Stable tag: 4.11.1
8
  Requires PHP: 7.0
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -200,6 +200,10 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
200
 
201
  == Changelog ==
202
 
 
 
 
 
203
  = 4.11.1 - 2022-01-04 =
204
  * Added support for WordPress 5.9
205
  * Added support for WooCommerce 6.1
4
  Tags: table rate, table rate shipping, conditional shipping, free 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, shipping, free shipping, advanced shipping
5
  Requires at least: 4.5
6
  Tested up to: 5.9
7
+ Stable tag: 4.11.2
8
  Requires PHP: 7.0
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
200
 
201
  == Changelog ==
202
 
203
+ = 4.11.2 - 2022-01-20 =
204
+ * Added support for WooCommerce 6.2
205
+ * Fixed fatal with WOOCS – Currency Switcher for WooCommerce
206
+
207
  = 4.11.1 - 2022-01-04 =
208
  * Added support for WordPress 5.9
209
  * Added support for WooCommerce 6.1
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit7221295640eab9ae78a49a20e9292138::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit5296db055b8c19f48f2402fa4473b96f::getLoader();
vendor/composer/autoload_classmap.php CHANGED
@@ -563,7 +563,7 @@ return array(
563
  'WPDesk_Flexible_Shipping_Logger_Factory' => $baseDir . '/classes/table-rate/logger/class-logger-factory.php',
564
  'WPDesk_Flexible_Shipping_Logger_Settings' => $baseDir . '/classes/table-rate/logger/class-logger-settings.php',
565
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => $baseDir . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
566
- 'WPDesk_Flexible_Shipping_Multicurrency' => $baseDir . '/classes/table-rate/multicurrency.php',
567
  'WPDesk_Flexible_Shipping_Multilingual' => $baseDir . '/classes/table-rate/multilingual.php',
568
  'WPDesk_Flexible_Shipping_Order_Item_Meta' => $baseDir . '/classes/table-rate/order-item-meta.php',
569
  'WPDesk_Flexible_Shipping_Settings' => $baseDir . '/classes/table-rate/flexible-shipping-settings.php',
563
  'WPDesk_Flexible_Shipping_Logger_Factory' => $baseDir . '/classes/table-rate/logger/class-logger-factory.php',
564
  'WPDesk_Flexible_Shipping_Logger_Settings' => $baseDir . '/classes/table-rate/logger/class-logger-settings.php',
565
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => $baseDir . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
566
+ 'WPDesk_Flexible_Shipping_Multicurrency' => $baseDir . '/classes/table-rate/class-wpdesk-flexible-shipping-multicurrency.php',
567
  'WPDesk_Flexible_Shipping_Multilingual' => $baseDir . '/classes/table-rate/multilingual.php',
568
  'WPDesk_Flexible_Shipping_Order_Item_Meta' => $baseDir . '/classes/table-rate/order-item-meta.php',
569
  'WPDesk_Flexible_Shipping_Settings' => $baseDir . '/classes/table-rate/flexible-shipping-settings.php',
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit7221295640eab9ae78a49a20e9292138
6
  {
7
  private static $loader;
8
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInit7221295640eab9ae78a49a20e9292138
22
  return self::$loader;
23
  }
24
 
25
- spl_autoload_register(array('ComposerAutoloaderInit7221295640eab9ae78a49a20e9292138', 'loadClassLoader'), true, true);
26
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
27
- spl_autoload_unregister(array('ComposerAutoloaderInit7221295640eab9ae78a49a20e9292138', 'loadClassLoader'));
28
 
29
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
30
  if ($useStaticLoader) {
31
  require_once __DIR__ . '/autoload_static.php';
32
 
33
- call_user_func(\Composer\Autoload\ComposerStaticInit7221295640eab9ae78a49a20e9292138::getInitializer($loader));
34
  } else {
35
  $map = require __DIR__ . '/autoload_namespaces.php';
36
  foreach ($map as $namespace => $path) {
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit5296db055b8c19f48f2402fa4473b96f
6
  {
7
  private static $loader;
8
 
22
  return self::$loader;
23
  }
24
 
25
+ spl_autoload_register(array('ComposerAutoloaderInit5296db055b8c19f48f2402fa4473b96f', 'loadClassLoader'), true, true);
26
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
27
+ spl_autoload_unregister(array('ComposerAutoloaderInit5296db055b8c19f48f2402fa4473b96f', 'loadClassLoader'));
28
 
29
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
30
  if ($useStaticLoader) {
31
  require_once __DIR__ . '/autoload_static.php';
32
 
33
+ call_user_func(\Composer\Autoload\ComposerStaticInit5296db055b8c19f48f2402fa4473b96f::getInitializer($loader));
34
  } else {
35
  $map = require __DIR__ . '/autoload_namespaces.php';
36
  foreach ($map as $namespace => $path) {
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit7221295640eab9ae78a49a20e9292138
8
  {
9
  public static $prefixLengthsPsr4 = array (
10
  'P' =>
@@ -582,7 +582,7 @@ class ComposerStaticInit7221295640eab9ae78a49a20e9292138
582
  'WPDesk_Flexible_Shipping_Logger_Factory' => __DIR__ . '/../..' . '/classes/table-rate/logger/class-logger-factory.php',
583
  'WPDesk_Flexible_Shipping_Logger_Settings' => __DIR__ . '/../..' . '/classes/table-rate/logger/class-logger-settings.php',
584
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => __DIR__ . '/../..' . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
585
- 'WPDesk_Flexible_Shipping_Multicurrency' => __DIR__ . '/../..' . '/classes/table-rate/multicurrency.php',
586
  'WPDesk_Flexible_Shipping_Multilingual' => __DIR__ . '/../..' . '/classes/table-rate/multilingual.php',
587
  'WPDesk_Flexible_Shipping_Order_Item_Meta' => __DIR__ . '/../..' . '/classes/table-rate/order-item-meta.php',
588
  'WPDesk_Flexible_Shipping_Settings' => __DIR__ . '/../..' . '/classes/table-rate/flexible-shipping-settings.php',
@@ -600,10 +600,10 @@ class ComposerStaticInit7221295640eab9ae78a49a20e9292138
600
  public static function getInitializer(ClassLoader $loader)
601
  {
602
  return \Closure::bind(function () use ($loader) {
603
- $loader->prefixLengthsPsr4 = ComposerStaticInit7221295640eab9ae78a49a20e9292138::$prefixLengthsPsr4;
604
- $loader->prefixDirsPsr4 = ComposerStaticInit7221295640eab9ae78a49a20e9292138::$prefixDirsPsr4;
605
- $loader->fallbackDirsPsr4 = ComposerStaticInit7221295640eab9ae78a49a20e9292138::$fallbackDirsPsr4;
606
- $loader->classMap = ComposerStaticInit7221295640eab9ae78a49a20e9292138::$classMap;
607
 
608
  }, null, ClassLoader::class);
609
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit5296db055b8c19f48f2402fa4473b96f
8
  {
9
  public static $prefixLengthsPsr4 = array (
10
  'P' =>
582
  'WPDesk_Flexible_Shipping_Logger_Factory' => __DIR__ . '/../..' . '/classes/table-rate/logger/class-logger-factory.php',
583
  'WPDesk_Flexible_Shipping_Logger_Settings' => __DIR__ . '/../..' . '/classes/table-rate/logger/class-logger-settings.php',
584
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => __DIR__ . '/../..' . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
585
+ 'WPDesk_Flexible_Shipping_Multicurrency' => __DIR__ . '/../..' . '/classes/table-rate/class-wpdesk-flexible-shipping-multicurrency.php',
586
  'WPDesk_Flexible_Shipping_Multilingual' => __DIR__ . '/../..' . '/classes/table-rate/multilingual.php',
587
  'WPDesk_Flexible_Shipping_Order_Item_Meta' => __DIR__ . '/../..' . '/classes/table-rate/order-item-meta.php',
588
  'WPDesk_Flexible_Shipping_Settings' => __DIR__ . '/../..' . '/classes/table-rate/flexible-shipping-settings.php',
600
  public static function getInitializer(ClassLoader $loader)
601
  {
602
  return \Closure::bind(function () use ($loader) {
603
+ $loader->prefixLengthsPsr4 = ComposerStaticInit5296db055b8c19f48f2402fa4473b96f::$prefixLengthsPsr4;
604
+ $loader->prefixDirsPsr4 = ComposerStaticInit5296db055b8c19f48f2402fa4473b96f::$prefixDirsPsr4;
605
+ $loader->fallbackDirsPsr4 = ComposerStaticInit5296db055b8c19f48f2402fa4473b96f::$fallbackDirsPsr4;
606
+ $loader->classMap = ComposerStaticInit5296db055b8c19f48f2402fa4473b96f::$classMap;
607
 
608
  }, null, ClassLoader::class);
609
  }