Flexible Shipping for WooCommerce - Version 3.9.19

Version Description

  • 2020-05-05 =
  • Added package items on shipping in admin order page
  • Fixed infinite loop with third party shipping methods
Download this release

Release Info

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

Code changes from version 3.9.18 to 3.9.19

Files changed (10) hide show
  1. classes/class-flexible-shipping-plugin.php +7 -1
  2. classes/table-rate/order-item-meta.php +32 -0
  3. classes/table-rate/shipping-method.php +1 -0
  4. composer.lock +49 -49
  5. flexible-shipping.php +4 -4
  6. readme.txt +7 -11
  7. vendor/autoload.php +1 -1
  8. vendor/composer/autoload_classmap.php +1 -0
  9. vendor/composer/autoload_real.php +4 -4
  10. vendor/composer/autoload_static.php +5 -4
classes/class-flexible-shipping-plugin.php CHANGED
@@ -167,6 +167,8 @@ class Flexible_Shipping_Plugin extends AbstractPlugin implements HookableCollect
167
  $this->add_hookable( new WPDesk_Flexible_Shipping_Rest_Api_Order_Response_Data_Appender() );
168
 
169
  $this->add_hookable( new ShippingIntegrations( 'flexible_shipping' ) );
 
 
170
 
171
  $this->init_contextual_info();
172
 
@@ -509,7 +511,11 @@ class Flexible_Shipping_Plugin extends AbstractPlugin implements HookableCollect
509
  * @return bool Possible or not
510
  */
511
  private function check_if_shipment_available_for_current_cart( $shipment_method_id ) {
512
- $shipping_packages = WC()->shipping()->calculate_shipping( WC()->cart->get_shipping_packages() );
 
 
 
 
513
  if ( is_array( $shipping_packages ) ) {
514
  foreach ( $shipping_packages as $package ) {
515
  if ( isset( $package['rates'][ $shipment_method_id ] ) && $package['rates'][ $shipment_method_id ] ) {
167
  $this->add_hookable( new WPDesk_Flexible_Shipping_Rest_Api_Order_Response_Data_Appender() );
168
 
169
  $this->add_hookable( new ShippingIntegrations( 'flexible_shipping' ) );
170
+
171
+ $this->add_hookable( new WPDesk_Flexible_Shipping_Order_Item_Meta() );
172
 
173
  $this->init_contextual_info();
174
 
511
  * @return bool Possible or not
512
  */
513
  private function check_if_shipment_available_for_current_cart( $shipment_method_id ) {
514
+ if ( empty( WC()->shipping()->packages ) ) {
515
+ $shipping_packages = WC()->shipping()->calculate_shipping( WC()->cart->get_shipping_packages() );
516
+ } else {
517
+ $shipping_packages = WC()->shipping()->packages;
518
+ }
519
  if ( is_array( $shipping_packages ) ) {
520
  foreach ( $shipping_packages as $package ) {
521
  if ( isset( $package['rates'][ $shipment_method_id ] ) && $package['rates'][ $shipment_method_id ] ) {
classes/table-rate/order-item-meta.php ADDED
@@ -0,0 +1,32 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Order item meta.
4
+ *
5
+ * @package Flexible Shipping.
6
+ */
7
+
8
+ use FSVendor\WPDesk\PluginBuilder\Plugin\Hookable;
9
+
10
+ /**
11
+ * Manages hidden order item meta.
12
+ */
13
+ class WPDesk_Flexible_Shipping_Order_Item_Meta implements Hookable {
14
+
15
+ /**
16
+ * Hooks.
17
+ */
18
+ public function hooks() {
19
+ add_filter( 'woocommerce_hidden_order_itemmeta', array( $this, 'add_hidden_order_itemmeta' ) );
20
+ }
21
+
22
+ /**
23
+ * @param array $hidden_order_itemmeta .
24
+ *
25
+ * @return string
26
+ */
27
+ public function add_hidden_order_itemmeta( $hidden_order_itemmeta ) {
28
+ $hidden_order_itemmeta[] = WPDesk_Flexible_Shipping::META_DEFAULT;
29
+ return $hidden_order_itemmeta;
30
+ }
31
+
32
+ }
classes/table-rate/shipping-method.php CHANGED
@@ -652,6 +652,7 @@ class WPDesk_Flexible_Shipping extends WC_Shipping_Method {
652
  'cost' => $cost,
653
  'method' => $shipping_method,
654
  'rule_costs' => $rule_costs,
 
655
  'meta_data' => array(
656
  self::META_DEFAULT => $shipping_method['method_default'],
657
  '_fs_method' => $shipping_method
652
  'cost' => $cost,
653
  'method' => $shipping_method,
654
  'rule_costs' => $rule_costs,
655
+ 'package' => $package,
656
  'meta_data' => array(
657
  self::META_DEFAULT => $shipping_method['method_default'],
658
  '_fs_method' => $shipping_method
composer.lock CHANGED
@@ -722,16 +722,16 @@
722
  },
723
  {
724
  "name": "codeception/module-webdriver",
725
- "version": "1.0.7",
726
  "source": {
727
  "type": "git",
728
  "url": "https://github.com/Codeception/module-webdriver.git",
729
- "reference": "f05c5c25e39d10fbfb2d508779e1537df019ff9b"
730
  },
731
  "dist": {
732
  "type": "zip",
733
- "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/f05c5c25e39d10fbfb2d508779e1537df019ff9b",
734
- "reference": "f05c5c25e39d10fbfb2d508779e1537df019ff9b",
735
  "shasum": ""
736
  },
737
  "require": {
@@ -773,7 +773,7 @@
773
  "browser-testing",
774
  "codeception"
775
  ],
776
- "time": "2020-04-01T10:18:18+00:00"
777
  },
778
  {
779
  "name": "codeception/phpunit-wrapper",
@@ -2122,16 +2122,16 @@
2122
  },
2123
  {
2124
  "name": "lucatume/wp-browser",
2125
- "version": "2.4.7",
2126
  "source": {
2127
  "type": "git",
2128
  "url": "https://github.com/lucatume/wp-browser.git",
2129
- "reference": "393a4cc5c0c3b6a417d7715231dcf95e43b4b659"
2130
  },
2131
  "dist": {
2132
  "type": "zip",
2133
- "url": "https://api.github.com/repos/lucatume/wp-browser/zipball/393a4cc5c0c3b6a417d7715231dcf95e43b4b659",
2134
- "reference": "393a4cc5c0c3b6a417d7715231dcf95e43b4b659",
2135
  "shasum": ""
2136
  },
2137
  "require": {
@@ -2199,7 +2199,7 @@
2199
  "codeception",
2200
  "wordpress"
2201
  ],
2202
- "time": "2020-04-23T16:21:02+00:00"
2203
  },
2204
  {
2205
  "name": "matthiasmullie/minify",
@@ -4305,20 +4305,20 @@
4305
  },
4306
  {
4307
  "name": "seld/jsonlint",
4308
- "version": "1.7.2",
4309
  "source": {
4310
  "type": "git",
4311
  "url": "https://github.com/Seldaek/jsonlint.git",
4312
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
4313
  },
4314
  "dist": {
4315
  "type": "zip",
4316
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
4317
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
4318
  "shasum": ""
4319
  },
4320
  "require": {
4321
- "php": "^5.3 || ^7.0"
4322
  },
4323
  "require-dev": {
4324
  "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
@@ -4350,7 +4350,7 @@
4350
  "parser",
4351
  "validator"
4352
  ],
4353
- "time": "2019-10-24T14:27:39+00:00"
4354
  },
4355
  {
4356
  "name": "seld/phar-utils",
@@ -4449,7 +4449,7 @@
4449
  },
4450
  {
4451
  "name": "symfony/browser-kit",
4452
- "version": "v3.4.39",
4453
  "source": {
4454
  "type": "git",
4455
  "url": "https://github.com/symfony/browser-kit.git",
@@ -4506,7 +4506,7 @@
4506
  },
4507
  {
4508
  "name": "symfony/console",
4509
- "version": "v3.4.39",
4510
  "source": {
4511
  "type": "git",
4512
  "url": "https://github.com/symfony/console.git",
@@ -4578,7 +4578,7 @@
4578
  },
4579
  {
4580
  "name": "symfony/css-selector",
4581
- "version": "v3.4.39",
4582
  "source": {
4583
  "type": "git",
4584
  "url": "https://github.com/symfony/css-selector.git",
@@ -4631,7 +4631,7 @@
4631
  },
4632
  {
4633
  "name": "symfony/debug",
4634
- "version": "v3.4.39",
4635
  "source": {
4636
  "type": "git",
4637
  "url": "https://github.com/symfony/debug.git",
@@ -4687,7 +4687,7 @@
4687
  },
4688
  {
4689
  "name": "symfony/dom-crawler",
4690
- "version": "v3.4.39",
4691
  "source": {
4692
  "type": "git",
4693
  "url": "https://github.com/symfony/dom-crawler.git",
@@ -4744,7 +4744,7 @@
4744
  },
4745
  {
4746
  "name": "symfony/event-dispatcher",
4747
- "version": "v3.4.39",
4748
  "source": {
4749
  "type": "git",
4750
  "url": "https://github.com/symfony/event-dispatcher.git",
@@ -4807,16 +4807,16 @@
4807
  },
4808
  {
4809
  "name": "symfony/filesystem",
4810
- "version": "v3.4.39",
4811
  "source": {
4812
  "type": "git",
4813
  "url": "https://github.com/symfony/filesystem.git",
4814
- "reference": "ec47520778d524b1736e768e0678cd1f01c03019"
4815
  },
4816
  "dist": {
4817
  "type": "zip",
4818
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/ec47520778d524b1736e768e0678cd1f01c03019",
4819
- "reference": "ec47520778d524b1736e768e0678cd1f01c03019",
4820
  "shasum": ""
4821
  },
4822
  "require": {
@@ -4853,11 +4853,11 @@
4853
  ],
4854
  "description": "Symfony Filesystem Component",
4855
  "homepage": "https://symfony.com",
4856
- "time": "2020-03-16T08:31:04+00:00"
4857
  },
4858
  {
4859
  "name": "symfony/finder",
4860
- "version": "v3.4.39",
4861
  "source": {
4862
  "type": "git",
4863
  "url": "https://github.com/symfony/finder.git",
@@ -5140,16 +5140,16 @@
5140
  },
5141
  {
5142
  "name": "symfony/process",
5143
- "version": "v3.4.39",
5144
  "source": {
5145
  "type": "git",
5146
  "url": "https://github.com/symfony/process.git",
5147
- "reference": "1dbc09f6e14703ae2398efc86b02ae2bcd9a9931"
5148
  },
5149
  "dist": {
5150
  "type": "zip",
5151
- "url": "https://api.github.com/repos/symfony/process/zipball/1dbc09f6e14703ae2398efc86b02ae2bcd9a9931",
5152
- "reference": "1dbc09f6e14703ae2398efc86b02ae2bcd9a9931",
5153
  "shasum": ""
5154
  },
5155
  "require": {
@@ -5185,20 +5185,20 @@
5185
  ],
5186
  "description": "Symfony Process Component",
5187
  "homepage": "https://symfony.com",
5188
- "time": "2020-03-20T06:07:50+00:00"
5189
  },
5190
  {
5191
  "name": "symfony/yaml",
5192
- "version": "v3.4.39",
5193
  "source": {
5194
  "type": "git",
5195
  "url": "https://github.com/symfony/yaml.git",
5196
- "reference": "e701b47e11749970f63803879c4febb520f07b6c"
5197
  },
5198
  "dist": {
5199
  "type": "zip",
5200
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e701b47e11749970f63803879c4febb520f07b6c",
5201
- "reference": "e701b47e11749970f63803879c4febb520f07b6c",
5202
  "shasum": ""
5203
  },
5204
  "require": {
@@ -5244,24 +5244,24 @@
5244
  ],
5245
  "description": "Symfony Yaml Component",
5246
  "homepage": "https://symfony.com",
5247
- "time": "2020-03-25T12:02:26+00:00"
5248
  },
5249
  {
5250
  "name": "vlucas/phpdotenv",
5251
- "version": "v3.6.3",
5252
  "source": {
5253
  "type": "git",
5254
  "url": "https://github.com/vlucas/phpdotenv.git",
5255
- "reference": "1b3103013797f04521c6cae5560f604649484066"
5256
  },
5257
  "dist": {
5258
  "type": "zip",
5259
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066",
5260
- "reference": "1b3103013797f04521c6cae5560f604649484066",
5261
  "shasum": ""
5262
  },
5263
  "require": {
5264
- "php": "^5.4 || ^7.0",
5265
  "phpoption/phpoption": "^1.5",
5266
  "symfony/polyfill-ctype": "^1.9"
5267
  },
@@ -5307,7 +5307,7 @@
5307
  "env",
5308
  "environment"
5309
  ],
5310
- "time": "2020-04-12T15:18:03+00:00"
5311
  },
5312
  {
5313
  "name": "vria/nodiacritic",
@@ -8083,16 +8083,16 @@
8083
  },
8084
  {
8085
  "name": "wpdesk/wp-wpdesk-composer",
8086
- "version": "2.8.0",
8087
  "source": {
8088
  "type": "git",
8089
  "url": "https://gitlab.com/wpdesk/wp-wpdesk-composer.git",
8090
- "reference": "627ad5dcfbc6d793a4cc96d3b5b4b44419ea719a"
8091
  },
8092
  "dist": {
8093
  "type": "zip",
8094
- "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-wpdesk-composer/repository/archive.zip?sha=627ad5dcfbc6d793a4cc96d3b5b4b44419ea719a",
8095
- "reference": "627ad5dcfbc6d793a4cc96d3b5b4b44419ea719a",
8096
  "shasum": ""
8097
  },
8098
  "require": {
@@ -8122,7 +8122,7 @@
8122
  "email": "krzysiek@wpdesk.pl"
8123
  }
8124
  ],
8125
- "time": "2020-04-27T07:37:18+00:00"
8126
  },
8127
  {
8128
  "name": "wpdesk/wp-wpdesk-helper",
722
  },
723
  {
724
  "name": "codeception/module-webdriver",
725
+ "version": "1.0.8",
726
  "source": {
727
  "type": "git",
728
  "url": "https://github.com/Codeception/module-webdriver.git",
729
+ "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
730
  },
731
  "dist": {
732
  "type": "zip",
733
+ "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
734
+ "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
735
  "shasum": ""
736
  },
737
  "require": {
773
  "browser-testing",
774
  "codeception"
775
  ],
776
+ "time": "2020-04-29T13:45:52+00:00"
777
  },
778
  {
779
  "name": "codeception/phpunit-wrapper",
2122
  },
2123
  {
2124
  "name": "lucatume/wp-browser",
2125
+ "version": "2.4.8",
2126
  "source": {
2127
  "type": "git",
2128
  "url": "https://github.com/lucatume/wp-browser.git",
2129
+ "reference": "b484620bca5bde60920affad9b2e74435be65e54"
2130
  },
2131
  "dist": {
2132
  "type": "zip",
2133
+ "url": "https://api.github.com/repos/lucatume/wp-browser/zipball/b484620bca5bde60920affad9b2e74435be65e54",
2134
+ "reference": "b484620bca5bde60920affad9b2e74435be65e54",
2135
  "shasum": ""
2136
  },
2137
  "require": {
2199
  "codeception",
2200
  "wordpress"
2201
  ],
2202
+ "time": "2020-05-01T11:37:05+00:00"
2203
  },
2204
  {
2205
  "name": "matthiasmullie/minify",
4305
  },
4306
  {
4307
  "name": "seld/jsonlint",
4308
+ "version": "1.8.0",
4309
  "source": {
4310
  "type": "git",
4311
  "url": "https://github.com/Seldaek/jsonlint.git",
4312
+ "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
4313
  },
4314
  "dist": {
4315
  "type": "zip",
4316
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
4317
+ "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
4318
  "shasum": ""
4319
  },
4320
  "require": {
4321
+ "php": "^5.3 || ^7.0 || ^8.0"
4322
  },
4323
  "require-dev": {
4324
  "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
4350
  "parser",
4351
  "validator"
4352
  ],
4353
+ "time": "2020-04-30T19:05:18+00:00"
4354
  },
4355
  {
4356
  "name": "seld/phar-utils",
4449
  },
4450
  {
4451
  "name": "symfony/browser-kit",
4452
+ "version": "v3.4.40",
4453
  "source": {
4454
  "type": "git",
4455
  "url": "https://github.com/symfony/browser-kit.git",
4506
  },
4507
  {
4508
  "name": "symfony/console",
4509
+ "version": "v3.4.40",
4510
  "source": {
4511
  "type": "git",
4512
  "url": "https://github.com/symfony/console.git",
4578
  },
4579
  {
4580
  "name": "symfony/css-selector",
4581
+ "version": "v3.4.40",
4582
  "source": {
4583
  "type": "git",
4584
  "url": "https://github.com/symfony/css-selector.git",
4631
  },
4632
  {
4633
  "name": "symfony/debug",
4634
+ "version": "v3.4.40",
4635
  "source": {
4636
  "type": "git",
4637
  "url": "https://github.com/symfony/debug.git",
4687
  },
4688
  {
4689
  "name": "symfony/dom-crawler",
4690
+ "version": "v3.4.40",
4691
  "source": {
4692
  "type": "git",
4693
  "url": "https://github.com/symfony/dom-crawler.git",
4744
  },
4745
  {
4746
  "name": "symfony/event-dispatcher",
4747
+ "version": "v3.4.40",
4748
  "source": {
4749
  "type": "git",
4750
  "url": "https://github.com/symfony/event-dispatcher.git",
4807
  },
4808
  {
4809
  "name": "symfony/filesystem",
4810
+ "version": "v3.4.40",
4811
  "source": {
4812
  "type": "git",
4813
  "url": "https://github.com/symfony/filesystem.git",
4814
+ "reference": "78a93e5606a19d0fb490afc3c4a9b7ecd86e1515"
4815
  },
4816
  "dist": {
4817
  "type": "zip",
4818
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/78a93e5606a19d0fb490afc3c4a9b7ecd86e1515",
4819
+ "reference": "78a93e5606a19d0fb490afc3c4a9b7ecd86e1515",
4820
  "shasum": ""
4821
  },
4822
  "require": {
4853
  ],
4854
  "description": "Symfony Filesystem Component",
4855
  "homepage": "https://symfony.com",
4856
+ "time": "2020-04-12T16:54:01+00:00"
4857
  },
4858
  {
4859
  "name": "symfony/finder",
4860
+ "version": "v3.4.40",
4861
  "source": {
4862
  "type": "git",
4863
  "url": "https://github.com/symfony/finder.git",
5140
  },
5141
  {
5142
  "name": "symfony/process",
5143
+ "version": "v3.4.40",
5144
  "source": {
5145
  "type": "git",
5146
  "url": "https://github.com/symfony/process.git",
5147
+ "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271"
5148
  },
5149
  "dist": {
5150
  "type": "zip",
5151
+ "url": "https://api.github.com/repos/symfony/process/zipball/f5104c9dcbc2cfad45d01d5150c1da9836967271",
5152
+ "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271",
5153
  "shasum": ""
5154
  },
5155
  "require": {
5185
  ],
5186
  "description": "Symfony Process Component",
5187
  "homepage": "https://symfony.com",
5188
+ "time": "2020-04-12T14:33:46+00:00"
5189
  },
5190
  {
5191
  "name": "symfony/yaml",
5192
+ "version": "v3.4.40",
5193
  "source": {
5194
  "type": "git",
5195
  "url": "https://github.com/symfony/yaml.git",
5196
+ "reference": "8fef49ac1357f4e05c997a1f139467ccb186bffa"
5197
  },
5198
  "dist": {
5199
  "type": "zip",
5200
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/8fef49ac1357f4e05c997a1f139467ccb186bffa",
5201
+ "reference": "8fef49ac1357f4e05c997a1f139467ccb186bffa",
5202
  "shasum": ""
5203
  },
5204
  "require": {
5244
  ],
5245
  "description": "Symfony Yaml Component",
5246
  "homepage": "https://symfony.com",
5247
+ "time": "2020-04-24T10:16:04+00:00"
5248
  },
5249
  {
5250
  "name": "vlucas/phpdotenv",
5251
+ "version": "v3.6.4",
5252
  "source": {
5253
  "type": "git",
5254
  "url": "https://github.com/vlucas/phpdotenv.git",
5255
+ "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5"
5256
  },
5257
  "dist": {
5258
  "type": "zip",
5259
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
5260
+ "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
5261
  "shasum": ""
5262
  },
5263
  "require": {
5264
+ "php": "^5.4 || ^7.0 || ^8.0",
5265
  "phpoption/phpoption": "^1.5",
5266
  "symfony/polyfill-ctype": "^1.9"
5267
  },
5307
  "env",
5308
  "environment"
5309
  ],
5310
+ "time": "2020-05-02T13:46:13+00:00"
5311
  },
5312
  {
5313
  "name": "vria/nodiacritic",
8083
  },
8084
  {
8085
  "name": "wpdesk/wp-wpdesk-composer",
8086
+ "version": "2.8.1",
8087
  "source": {
8088
  "type": "git",
8089
  "url": "https://gitlab.com/wpdesk/wp-wpdesk-composer.git",
8090
+ "reference": "6c65313b78e8168414c5a7b08ae09224de97cffb"
8091
  },
8092
  "dist": {
8093
  "type": "zip",
8094
+ "url": "https://gitlab.com/api/v4/projects/wpdesk%2Fwp-wpdesk-composer/repository/archive.zip?sha=6c65313b78e8168414c5a7b08ae09224de97cffb",
8095
+ "reference": "6c65313b78e8168414c5a7b08ae09224de97cffb",
8096
  "shasum": ""
8097
  },
8098
  "require": {
8122
  "email": "krzysiek@wpdesk.pl"
8123
  }
8124
  ],
8125
+ "time": "2020-05-02T20:19:07+00:00"
8126
  },
8127
  {
8128
  "name": "wpdesk/wp-wpdesk-helper",
flexible-shipping.php CHANGED
@@ -3,13 +3,13 @@
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: 3.9.18
7
  * Author: WP Desk
8
  * Author URI: https://www.wpdesk.net/
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 4.5
12
- * Tested up to: 5.4
13
  * WC requires at least: 3.1.0
14
  * WC tested up to: 4.1
15
  * Requires PHP: 5.6
@@ -38,8 +38,8 @@ if ( ! defined( 'ABSPATH' ) ) {
38
  } // Exit if accessed directly
39
 
40
  /* THESE TWO VARIABLES CAN BE CHANGED AUTOMATICALLY */
41
- $plugin_version = '3.9.18';
42
- $plugin_release_timestamp = '2020-04-29 09:34';
43
 
44
  $plugin_name = 'Flexible Shipping';
45
  $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: 3.9.19
7
  * Author: WP Desk
8
  * Author URI: https://www.wpdesk.net/
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 4.5
12
+ * Tested up to: 5.4.1
13
  * WC requires at least: 3.1.0
14
  * WC tested up to: 4.1
15
  * Requires PHP: 5.6
38
  } // Exit if accessed directly
39
 
40
  /* THESE TWO VARIABLES CAN BE CHANGED AUTOMATICALLY */
41
+ $plugin_version = '3.9.19';
42
+ $plugin_release_timestamp = '2020-05-05 14:45';
43
 
44
  $plugin_name = 'Flexible Shipping';
45
  $product_id = 'Flexible Shipping';
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
  === Table Rate for WooCommerce by Flexible Shipping ===
2
- Contributors: wpdesk,dyszczo,grola,piotrpo,marcinkolanko
3
  Donate link: https://flexibleshipping.com/table-rate/
4
  Tags: table rate, table rate shipping, conditional shipping, shipping method, 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.4
7
- Stable tag: 3.9.18
8
  Requires PHP: 5.6
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -69,14 +69,6 @@ Flexible Shipping Locations Add-On extends the default Flexible Shipping for Woo
69
 
70
  [Buy Flexible Shipping Locations Add-On now &rarr;](https://flexibleshipping.com/products/flexible-shipping-locations-woocommerce/)
71
 
72
- = WooCommerce Compatibility =
73
-
74
- **WooCommerce 3.9 ready!** In the 3.9.5 Flexible Shipping version we added the WooCommerce 3.9 support.
75
-
76
- **Shipping Zones ready!** Flexible Shipping is compatible with WooCommerce Shipping Zones introduced in the 2.6 release. Read more about [WooCommerce Shipping Zones &rarr;](https://flexibleshipping.com/woocommerce-shipping-zones-explained/).
77
-
78
- Flexible Shipping also goes well with the older versions of WooCommerce. It has been tested with WooCommerce 3.1.0 release and later ones.
79
-
80
  = Docs =
81
 
82
  [View Flexible Shipping Docs](https://docs.flexibleshipping.com/collection/20-fs-table-rate)
@@ -171,6 +163,10 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
171
 
172
  == Changelog ==
173
 
 
 
 
 
174
  = 3.9.18 - 2020-04-28 =
175
  * Added integration with WooCommerce Multi-Currency plugin
176
 
1
  === Table Rate for WooCommerce by Flexible Shipping ===
2
+ Contributors: wpdesk,dyszczo,grola,piotrpo,marcinkolanko,damianmachnik
3
  Donate link: https://flexibleshipping.com/table-rate/
4
  Tags: table rate, table rate shipping, conditional shipping, shipping method, 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.4.1
7
+ Stable tag: 3.9.19
8
  Requires PHP: 5.6
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
69
 
70
  [Buy Flexible Shipping Locations Add-On now &rarr;](https://flexibleshipping.com/products/flexible-shipping-locations-woocommerce/)
71
 
 
 
 
 
 
 
 
 
72
  = Docs =
73
 
74
  [View Flexible Shipping Docs](https://docs.flexibleshipping.com/collection/20-fs-table-rate)
163
 
164
  == Changelog ==
165
 
166
+ = 3.9.19 - 2020-05-05 =
167
+ * Added package items on shipping in admin order page
168
+ * Fixed infinite loop with third party shipping methods
169
+
170
  = 3.9.18 - 2020-04-28 =
171
  * Added integration with WooCommerce Multi-Currency plugin
172
 
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit392c5757d24484ff121921ee97587055::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit238439d4c6417766d295b451af2d1839::getLoader();
vendor/composer/autoload_classmap.php CHANGED
@@ -327,6 +327,7 @@ return array(
327
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => $baseDir . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
328
  'WPDesk_Flexible_Shipping_Multicurrency' => $baseDir . '/classes/table-rate/multicurrency.php',
329
  'WPDesk_Flexible_Shipping_Multilingual' => $baseDir . '/classes/table-rate/multilingual.php',
 
330
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/interface-rest-api-order-data-provider.php',
331
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider_Default' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-provider-default.php',
332
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Providers_Collection' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-providers-collection.php',
327
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => $baseDir . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
328
  'WPDesk_Flexible_Shipping_Multicurrency' => $baseDir . '/classes/table-rate/multicurrency.php',
329
  'WPDesk_Flexible_Shipping_Multilingual' => $baseDir . '/classes/table-rate/multilingual.php',
330
+ 'WPDesk_Flexible_Shipping_Order_Item_Meta' => $baseDir . '/classes/table-rate/order-item-meta.php',
331
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/interface-rest-api-order-data-provider.php',
332
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider_Default' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-provider-default.php',
333
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Providers_Collection' => $baseDir . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-providers-collection.php',
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit392c5757d24484ff121921ee97587055
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit392c5757d24484ff121921ee97587055
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit392c5757d24484ff121921ee97587055', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit392c5757d24484ff121921ee97587055', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
- call_user_func(\Composer\Autoload\ComposerStaticInit392c5757d24484ff121921ee97587055::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit238439d4c6417766d295b451af2d1839
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit238439d4c6417766d295b451af2d1839', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit238439d4c6417766d295b451af2d1839', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
+ call_user_func(\Composer\Autoload\ComposerStaticInit238439d4c6417766d295b451af2d1839::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit392c5757d24484ff121921ee97587055
8
  {
9
  public static $prefixLengthsPsr4 = array (
10
  'P' =>
@@ -342,6 +342,7 @@ class ComposerStaticInit392c5757d24484ff121921ee97587055
342
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => __DIR__ . '/../..' . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
343
  'WPDesk_Flexible_Shipping_Multicurrency' => __DIR__ . '/../..' . '/classes/table-rate/multicurrency.php',
344
  'WPDesk_Flexible_Shipping_Multilingual' => __DIR__ . '/../..' . '/classes/table-rate/multilingual.php',
 
345
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/interface-rest-api-order-data-provider.php',
346
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider_Default' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-provider-default.php',
347
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Providers_Collection' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-providers-collection.php',
@@ -370,9 +371,9 @@ class ComposerStaticInit392c5757d24484ff121921ee97587055
370
  public static function getInitializer(ClassLoader $loader)
371
  {
372
  return \Closure::bind(function () use ($loader) {
373
- $loader->prefixLengthsPsr4 = ComposerStaticInit392c5757d24484ff121921ee97587055::$prefixLengthsPsr4;
374
- $loader->prefixDirsPsr4 = ComposerStaticInit392c5757d24484ff121921ee97587055::$prefixDirsPsr4;
375
- $loader->classMap = ComposerStaticInit392c5757d24484ff121921ee97587055::$classMap;
376
 
377
  }, null, ClassLoader::class);
378
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit238439d4c6417766d295b451af2d1839
8
  {
9
  public static $prefixLengthsPsr4 = array (
10
  'P' =>
342
  'WPDesk_Flexible_Shipping_Method_Created_Tracker_Deactivation_Data' => __DIR__ . '/../..' . '/classes/tracker/class-method-created-tracker-deactivation-data.php',
343
  'WPDesk_Flexible_Shipping_Multicurrency' => __DIR__ . '/../..' . '/classes/table-rate/multicurrency.php',
344
  'WPDesk_Flexible_Shipping_Multilingual' => __DIR__ . '/../..' . '/classes/table-rate/multilingual.php',
345
+ 'WPDesk_Flexible_Shipping_Order_Item_Meta' => __DIR__ . '/../..' . '/classes/table-rate/order-item-meta.php',
346
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/interface-rest-api-order-data-provider.php',
347
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Provider_Default' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-provider-default.php',
348
  'WPDesk_Flexible_Shipping_Rest_Api_Order_Data_Providers_Collection' => __DIR__ . '/../..' . '/classes/wp-wpdesk-fs-shipment/rest-api/class-rest-api-order-data-providers-collection.php',
371
  public static function getInitializer(ClassLoader $loader)
372
  {
373
  return \Closure::bind(function () use ($loader) {
374
+ $loader->prefixLengthsPsr4 = ComposerStaticInit238439d4c6417766d295b451af2d1839::$prefixLengthsPsr4;
375
+ $loader->prefixDirsPsr4 = ComposerStaticInit238439d4c6417766d295b451af2d1839::$prefixDirsPsr4;
376
+ $loader->classMap = ComposerStaticInit238439d4c6417766d295b451af2d1839::$classMap;
377
 
378
  }, null, ClassLoader::class);
379
  }