Flexible Shipping for WooCommerce - Version 2.1.6

Version Description

  • 2018-06-26 =
  • Fixed error with conflict static tracker
Download this release

Release Info

Developer jablonowski
Plugin Icon 128x128 Flexible Shipping for WooCommerce
Version 2.1.6
Comparing to
See all releases

Code changes from version 2.1.5 to 2.1.6

Files changed (15) hide show
  1. acceptance/reports/html/cucumber_reporter.html +4 -4
  2. acceptance/reports/html/plugins_tests_report.html +18 -18
  3. acceptance/reports/html/screenshot/{After_2468.png → After_7850.png} +0 -0
  4. acceptance/reports/html/screenshot/screenShot1.png +0 -0
  5. acceptance/reports/html/screenshot/screenShot2.png +0 -0
  6. acceptance/reports/html/screenshot/screenShot3.png +0 -0
  7. acceptance/reports/html/screenshot/screenShot4.png +0 -0
  8. acceptance/reports/json/cucumber_report.json +28 -28
  9. flexible-shipping.php +2 -2
  10. inc/wpdesk-tracker/class-wpdesk-tracker-factory.php +1 -1
  11. inc/wpdesk-tracker/class-wpdesk-tracker.php +8 -1
  12. readme.txt +4 -1
  13. vendor/autoload.php +1 -1
  14. vendor/composer/autoload_real.php +4 -4
  15. vendor/composer/autoload_static.php +2 -2
acceptance/reports/html/cucumber_reporter.html CHANGED
@@ -203,7 +203,7 @@ th {
203
 
204
  <div class="container">
205
 
206
- <div class="generated-on">Mon Jun 25 2018 11:16:58 GMT+0000 (UTC)</div>
207
 
208
  <div class="row">
209
  <div class="chart col-lg-6 col-md-6" id="piechart_features"></div>
@@ -937,7 +937,7 @@ th {
937
  Skip tracker message
938
 
939
  <span class="step-duration">
940
- 1s
941
  </span>
942
 
943
 
@@ -1082,8 +1082,8 @@ th {
1082
 
1083
 
1084
  <a class="toggle" href="#">Screenshot -</a>
1085
- <a class="screenshot" href="screenshot/After_2468.png">
1086
- <img class="screenshot" style="height:100%;width:100%" id="my_images" src="screenshot/After_2468.png"/>
1087
  </a>
1088
 
1089
 
203
 
204
  <div class="container">
205
 
206
+ <div class="generated-on">Tue Jun 26 2018 09:00:42 GMT+0000 (UTC)</div>
207
 
208
  <div class="row">
209
  <div class="chart col-lg-6 col-md-6" id="piechart_features"></div>
937
  Skip tracker message
938
 
939
  <span class="step-duration">
940
+ 2s
941
  </span>
942
 
943
 
1082
 
1083
 
1084
  <a class="toggle" href="#">Screenshot -</a>
1085
+ <a class="screenshot" href="screenshot/After_7850.png">
1086
+ <img class="screenshot" style="height:100%;width:100%" id="my_images" src="screenshot/After_7850.png"/>
1087
  </a>
1088
 
1089
 
acceptance/reports/html/plugins_tests_report.html CHANGED
@@ -472,7 +472,7 @@
472
  <td class="steps-passed passed"></td>
473
  <td class="steps-failed failed"></td>
474
  <td class="steps-skipped skipped"></td>
475
- <td class="duration">6.04 s</td>
476
  <td class="status">failed</td>
477
  </tr>
478
  <tr class="passed">
@@ -484,7 +484,7 @@
484
  <td class="steps-passed passed"></td>
485
  <td class="steps-failed failed"></td>
486
  <td class="steps-skipped skipped"></td>
487
- <td class="duration">4.37 s</td>
488
  <td class="status">passed</td>
489
  </tr>
490
 
@@ -521,7 +521,7 @@
521
  </table>
522
  </td>
523
  <td>5</td>
524
- <td class="duration">0.32 s</td>
525
  <td class="status">passed</td>
526
  </tr>
527
 
@@ -559,7 +559,7 @@
559
  </table>
560
  </td>
561
  <td>15</td>
562
- <td class="duration">0.67 s</td>
563
  <td class="status">passed</td>
564
  </tr>
565
 
@@ -578,7 +578,7 @@
578
  </table>
579
  </td>
580
  <td>16</td>
581
- <td class="duration">1.34 s</td>
582
  <td class="status">passed</td>
583
  </tr>
584
 
@@ -597,7 +597,7 @@
597
  </table>
598
  </td>
599
  <td>17</td>
600
- <td class="duration">1.42 s</td>
601
  <td class="status">passed</td>
602
  </tr>
603
 
@@ -674,7 +674,7 @@
674
  </table>
675
  </td>
676
  <td>5</td>
677
- <td class="duration">0.27 s</td>
678
  <td class="status">passed</td>
679
  </tr>
680
 
@@ -712,7 +712,7 @@
712
  </table>
713
  </td>
714
  <td>9</td>
715
- <td class="duration">0.67 s</td>
716
  <td class="status">passed</td>
717
  </tr>
718
 
@@ -731,7 +731,7 @@
731
  </table>
732
  </td>
733
  <td>10</td>
734
- <td class="duration">0.11 s</td>
735
  <td class="status">passed</td>
736
  </tr>
737
 
@@ -750,7 +750,7 @@
750
  </table>
751
  </td>
752
  <td>11</td>
753
- <td class="duration">0.12 s</td>
754
  <td class="status">passed</td>
755
  </tr>
756
 
@@ -769,7 +769,7 @@
769
  </table>
770
  </td>
771
  <td>12</td>
772
- <td class="duration">1.02 s</td>
773
  <td class="status">passed</td>
774
  </tr>
775
 
@@ -815,7 +815,7 @@
815
  </table>
816
  </td>
817
  <td>5</td>
818
- <td class="duration">0.28 s</td>
819
  <td class="status">passed</td>
820
  </tr>
821
 
@@ -834,7 +834,7 @@
834
  </table>
835
  </td>
836
  <td>6</td>
837
- <td class="duration">0.03 s</td>
838
  <td class="status">passed</td>
839
  </tr>
840
 
@@ -853,7 +853,7 @@
853
  </table>
854
  </td>
855
  <td>9</td>
856
- <td class="duration">1.99 s</td>
857
  <td class="status">passed</td>
858
  </tr>
859
 
@@ -911,7 +911,7 @@
911
  </table>
912
  </td>
913
  <td>5</td>
914
- <td class="duration">0.28 s</td>
915
  <td class="status">passed</td>
916
  </tr>
917
 
@@ -949,7 +949,7 @@
949
  </table>
950
  </td>
951
  <td>13</td>
952
- <td class="duration">1.01 s</td>
953
  <td class="status">passed</td>
954
  </tr>
955
 
@@ -968,7 +968,7 @@
968
  </table>
969
  </td>
970
  <td>14</td>
971
- <td class="duration">0.36 s</td>
972
  <td class="status">passed</td>
973
  </tr>
974
 
@@ -1019,7 +1019,7 @@
1019
  <td class="steps-passed passed">19</td>
1020
  <td class="steps-failed failed">1</td>
1021
  <td class="steps-skipped skipped">1</td>
1022
- <td class="duration">10.41 s</td>
1023
  <td class="status">failed</td>
1024
  </tr>
1025
 
472
  <td class="steps-passed passed"></td>
473
  <td class="steps-failed failed"></td>
474
  <td class="steps-skipped skipped"></td>
475
+ <td class="duration">6.84 s</td>
476
  <td class="status">failed</td>
477
  </tr>
478
  <tr class="passed">
484
  <td class="steps-passed passed"></td>
485
  <td class="steps-failed failed"></td>
486
  <td class="steps-skipped skipped"></td>
487
+ <td class="duration">4.31 s</td>
488
  <td class="status">passed</td>
489
  </tr>
490
 
521
  </table>
522
  </td>
523
  <td>5</td>
524
+ <td class="duration">0.28 s</td>
525
  <td class="status">passed</td>
526
  </tr>
527
 
559
  </table>
560
  </td>
561
  <td>15</td>
562
+ <td class="duration">0.63 s</td>
563
  <td class="status">passed</td>
564
  </tr>
565
 
578
  </table>
579
  </td>
580
  <td>16</td>
581
+ <td class="duration">2.27 s</td>
582
  <td class="status">passed</td>
583
  </tr>
584
 
597
  </table>
598
  </td>
599
  <td>17</td>
600
+ <td class="duration">1.39 s</td>
601
  <td class="status">passed</td>
602
  </tr>
603
 
674
  </table>
675
  </td>
676
  <td>5</td>
677
+ <td class="duration">0.3 s</td>
678
  <td class="status">passed</td>
679
  </tr>
680
 
712
  </table>
713
  </td>
714
  <td>9</td>
715
+ <td class="duration">0.65 s</td>
716
  <td class="status">passed</td>
717
  </tr>
718
 
731
  </table>
732
  </td>
733
  <td>10</td>
734
+ <td class="duration">0.1 s</td>
735
  <td class="status">passed</td>
736
  </tr>
737
 
750
  </table>
751
  </td>
752
  <td>11</td>
753
+ <td class="duration">0.13 s</td>
754
  <td class="status">passed</td>
755
  </tr>
756
 
769
  </table>
770
  </td>
771
  <td>12</td>
772
+ <td class="duration">0.99 s</td>
773
  <td class="status">passed</td>
774
  </tr>
775
 
815
  </table>
816
  </td>
817
  <td>5</td>
818
+ <td class="duration">0.3 s</td>
819
  <td class="status">passed</td>
820
  </tr>
821
 
834
  </table>
835
  </td>
836
  <td>6</td>
837
+ <td class="duration">0.04 s</td>
838
  <td class="status">passed</td>
839
  </tr>
840
 
853
  </table>
854
  </td>
855
  <td>9</td>
856
+ <td class="duration">1.93 s</td>
857
  <td class="status">passed</td>
858
  </tr>
859
 
911
  </table>
912
  </td>
913
  <td>5</td>
914
+ <td class="duration">0.26 s</td>
915
  <td class="status">passed</td>
916
  </tr>
917
 
949
  </table>
950
  </td>
951
  <td>13</td>
952
+ <td class="duration">1.03 s</td>
953
  <td class="status">passed</td>
954
  </tr>
955
 
968
  </table>
969
  </td>
970
  <td>14</td>
971
+ <td class="duration">0.34 s</td>
972
  <td class="status">passed</td>
973
  </tr>
974
 
1019
  <td class="steps-passed passed">19</td>
1020
  <td class="steps-failed failed">1</td>
1021
  <td class="steps-skipped skipped">1</td>
1022
+ <td class="duration">11.16 s</td>
1023
  <td class="status">failed</td>
1024
  </tr>
1025
 
acceptance/reports/html/screenshot/{After_2468.png → After_7850.png} RENAMED
File without changes
acceptance/reports/html/screenshot/screenShot1.png CHANGED
Binary file
acceptance/reports/html/screenshot/screenShot2.png CHANGED
Binary file
acceptance/reports/html/screenshot/screenShot3.png CHANGED
Binary file
acceptance/reports/html/screenshot/screenShot4.png CHANGED
Binary file
acceptance/reports/json/cucumber_report.json CHANGED
@@ -12,7 +12,7 @@
12
  "keyword": "Before ",
13
  "result": {
14
  "status": "passed",
15
- "duration": 3599406680
16
  },
17
  "hidden": true,
18
  "match": {
@@ -25,7 +25,7 @@
25
  "name": "user is logged in to wordPress",
26
  "result": {
27
  "status": "passed",
28
- "duration": 282314689
29
  },
30
  "line": 5,
31
  "match": {
@@ -38,7 +38,7 @@
38
  "name": "i resets the consent to collect data in the database",
39
  "result": {
40
  "status": "passed",
41
- "duration": 34143651
42
  },
43
  "line": 6,
44
  "match": {
@@ -51,7 +51,7 @@
51
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
52
  "result": {
53
  "status": "passed",
54
- "duration": 1994588779
55
  },
56
  "line": 9,
57
  "match": {
@@ -64,7 +64,7 @@
64
  "name": "check if plugin with slug \"flexible-shipping\" is Active",
65
  "result": {
66
  "status": "passed",
67
- "duration": 393258709
68
  },
69
  "line": 10,
70
  "match": {
@@ -76,7 +76,7 @@
76
  "keyword": "After ",
77
  "result": {
78
  "status": "passed",
79
- "duration": 2005638388
80
  },
81
  "hidden": true,
82
  "match": {
@@ -103,7 +103,7 @@
103
  "keyword": "Before ",
104
  "result": {
105
  "status": "passed",
106
- "duration": 866650920
107
  },
108
  "hidden": true,
109
  "match": {
@@ -116,7 +116,7 @@
116
  "name": "user is logged in to wordPress",
117
  "result": {
118
  "status": "passed",
119
- "duration": 283896978
120
  },
121
  "line": 5,
122
  "match": {
@@ -129,7 +129,7 @@
129
  "name": "i resets the consent to collect data in the database",
130
  "result": {
131
  "status": "passed",
132
- "duration": 20358313
133
  },
134
  "line": 6,
135
  "match": {
@@ -142,7 +142,7 @@
142
  "name": "i open \"menu-plugins\" and deactivate plugin with slug \"flexible-shipping\"",
143
  "result": {
144
  "status": "passed",
145
- "duration": 1006091149
146
  },
147
  "line": 13,
148
  "match": {
@@ -155,7 +155,7 @@
155
  "name": "check if plugin with slug \"flexible-shipping\" is Inactive",
156
  "result": {
157
  "status": "passed",
158
- "duration": 358107833
159
  },
160
  "line": 14,
161
  "match": {
@@ -167,7 +167,7 @@
167
  "keyword": "After ",
168
  "result": {
169
  "status": "passed",
170
- "duration": 1947716328
171
  },
172
  "hidden": true,
173
  "match": {
@@ -209,7 +209,7 @@
209
  "keyword": "Before ",
210
  "result": {
211
  "status": "passed",
212
- "duration": 1062553304
213
  },
214
  "hidden": true,
215
  "match": {
@@ -222,7 +222,7 @@
222
  "name": "user is logged in to wordPress",
223
  "result": {
224
  "status": "passed",
225
- "duration": 266135692
226
  },
227
  "line": 5,
228
  "match": {
@@ -235,7 +235,7 @@
235
  "name": "i resets the consent to collect data in the database",
236
  "result": {
237
  "status": "passed",
238
- "duration": 908454
239
  },
240
  "line": 6,
241
  "match": {
@@ -248,7 +248,7 @@
248
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
249
  "result": {
250
  "status": "passed",
251
- "duration": 666316716
252
  },
253
  "line": 9,
254
  "match": {
@@ -261,7 +261,7 @@
261
  "name": "tracker message type \"short\" visible",
262
  "result": {
263
  "status": "passed",
264
- "duration": 107457293
265
  },
266
  "line": 10,
267
  "match": {
@@ -274,7 +274,7 @@
274
  "name": "Check if buttons skip and Allow & Continue visible in tracker message",
275
  "result": {
276
  "status": "passed",
277
- "duration": 122730481
278
  },
279
  "line": 11,
280
  "match": {
@@ -287,7 +287,7 @@
287
  "name": "i open \"menu-plugins\" and deactivate plugin with slug \"flexible-shipping\"",
288
  "result": {
289
  "status": "passed",
290
- "duration": 1024714441
291
  },
292
  "line": 12,
293
  "match": {
@@ -299,7 +299,7 @@
299
  "keyword": "After ",
300
  "result": {
301
  "status": "passed",
302
- "duration": 1970986080
303
  },
304
  "hidden": true,
305
  "match": {
@@ -326,7 +326,7 @@
326
  "keyword": "Before ",
327
  "result": {
328
  "status": "passed",
329
- "duration": 916184383
330
  },
331
  "hidden": true,
332
  "match": {
@@ -339,7 +339,7 @@
339
  "name": "user is logged in to wordPress",
340
  "result": {
341
  "status": "passed",
342
- "duration": 317356268
343
  },
344
  "line": 5,
345
  "match": {
@@ -352,7 +352,7 @@
352
  "name": "i resets the consent to collect data in the database",
353
  "result": {
354
  "status": "passed",
355
- "duration": 21112418
356
  },
357
  "line": 6,
358
  "match": {
@@ -365,7 +365,7 @@
365
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
366
  "result": {
367
  "status": "passed",
368
- "duration": 667289657
369
  },
370
  "line": 15,
371
  "match": {
@@ -378,7 +378,7 @@
378
  "name": "Skip tracker message",
379
  "result": {
380
  "status": "passed",
381
- "duration": 1339171885
382
  },
383
  "line": 16,
384
  "match": {
@@ -391,7 +391,7 @@
391
  "name": "i open menu \"toplevel_page_woocommerce\" and submenu \"Settings\" then open tab \"Shipping\"",
392
  "result": {
393
  "status": "passed",
394
- "duration": 1418840471
395
  },
396
  "line": 17,
397
  "match": {
@@ -404,7 +404,7 @@
404
  "name": "tracker message type \"long\" visible",
405
  "result": {
406
  "status": "failed",
407
- "duration": 88741344,
408
  "error_message": "AssertionError: expected 'Hey admin,\\nWe need your help to improve WP Desk plugins, so they are more useful for you and the rest of 30,000+ users. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe. Find out more »\\nAllow\\nDismiss this notice.' to include '\\nWe need your help to improve WP Desk plugins, so they are more useful for you and the rest of 18,000+ users. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe. Find out more'"
409
  },
410
  "line": 18,
@@ -429,7 +429,7 @@
429
  "keyword": "After ",
430
  "result": {
431
  "status": "passed",
432
- "duration": 2161554779
433
  },
434
  "hidden": true,
435
  "embeddings": [
12
  "keyword": "Before ",
13
  "result": {
14
  "status": "passed",
15
+ "duration": 3830859820
16
  },
17
  "hidden": true,
18
  "match": {
25
  "name": "user is logged in to wordPress",
26
  "result": {
27
  "status": "passed",
28
+ "duration": 300815990
29
  },
30
  "line": 5,
31
  "match": {
38
  "name": "i resets the consent to collect data in the database",
39
  "result": {
40
  "status": "passed",
41
+ "duration": 36065877
42
  },
43
  "line": 6,
44
  "match": {
51
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
52
  "result": {
53
  "status": "passed",
54
+ "duration": 1927858474
55
  },
56
  "line": 9,
57
  "match": {
64
  "name": "check if plugin with slug \"flexible-shipping\" is Active",
65
  "result": {
66
  "status": "passed",
67
+ "duration": 386889045
68
  },
69
  "line": 10,
70
  "match": {
76
  "keyword": "After ",
77
  "result": {
78
  "status": "passed",
79
+ "duration": 1976737313
80
  },
81
  "hidden": true,
82
  "match": {
103
  "keyword": "Before ",
104
  "result": {
105
  "status": "passed",
106
+ "duration": 902667120
107
  },
108
  "hidden": true,
109
  "match": {
116
  "name": "user is logged in to wordPress",
117
  "result": {
118
  "status": "passed",
119
+ "duration": 264720113
120
  },
121
  "line": 5,
122
  "match": {
129
  "name": "i resets the consent to collect data in the database",
130
  "result": {
131
  "status": "passed",
132
+ "duration": 22146402
133
  },
134
  "line": 6,
135
  "match": {
142
  "name": "i open \"menu-plugins\" and deactivate plugin with slug \"flexible-shipping\"",
143
  "result": {
144
  "status": "passed",
145
+ "duration": 1028160387
146
  },
147
  "line": 13,
148
  "match": {
155
  "name": "check if plugin with slug \"flexible-shipping\" is Inactive",
156
  "result": {
157
  "status": "passed",
158
+ "duration": 344575417
159
  },
160
  "line": 14,
161
  "match": {
167
  "keyword": "After ",
168
  "result": {
169
  "status": "passed",
170
+ "duration": 1968617753
171
  },
172
  "hidden": true,
173
  "match": {
209
  "keyword": "Before ",
210
  "result": {
211
  "status": "passed",
212
+ "duration": 849362265
213
  },
214
  "hidden": true,
215
  "match": {
222
  "name": "user is logged in to wordPress",
223
  "result": {
224
  "status": "passed",
225
+ "duration": 300023928
226
  },
227
  "line": 5,
228
  "match": {
235
  "name": "i resets the consent to collect data in the database",
236
  "result": {
237
  "status": "passed",
238
+ "duration": 896523
239
  },
240
  "line": 6,
241
  "match": {
248
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
249
  "result": {
250
  "status": "passed",
251
+ "duration": 646321169
252
  },
253
  "line": 9,
254
  "match": {
261
  "name": "tracker message type \"short\" visible",
262
  "result": {
263
  "status": "passed",
264
+ "duration": 104933204
265
  },
266
  "line": 10,
267
  "match": {
274
  "name": "Check if buttons skip and Allow & Continue visible in tracker message",
275
  "result": {
276
  "status": "passed",
277
+ "duration": 125880607
278
  },
279
  "line": 11,
280
  "match": {
287
  "name": "i open \"menu-plugins\" and deactivate plugin with slug \"flexible-shipping\"",
288
  "result": {
289
  "status": "passed",
290
+ "duration": 985899230
291
  },
292
  "line": 12,
293
  "match": {
299
  "keyword": "After ",
300
  "result": {
301
  "status": "passed",
302
+ "duration": 1996768158
303
  },
304
  "hidden": true,
305
  "match": {
326
  "keyword": "Before ",
327
  "result": {
328
  "status": "passed",
329
+ "duration": 885747598
330
  },
331
  "hidden": true,
332
  "match": {
339
  "name": "user is logged in to wordPress",
340
  "result": {
341
  "status": "passed",
342
+ "duration": 276719589
343
  },
344
  "line": 5,
345
  "match": {
352
  "name": "i resets the consent to collect data in the database",
353
  "result": {
354
  "status": "passed",
355
+ "duration": 19151287
356
  },
357
  "line": 6,
358
  "match": {
365
  "name": "i open \"menu-plugins\" and activate plugin with slug \"flexible-shipping\"",
366
  "result": {
367
  "status": "passed",
368
+ "duration": 631082914
369
  },
370
  "line": 15,
371
  "match": {
378
  "name": "Skip tracker message",
379
  "result": {
380
  "status": "passed",
381
+ "duration": 2271882665
382
  },
383
  "line": 16,
384
  "match": {
391
  "name": "i open menu \"toplevel_page_woocommerce\" and submenu \"Settings\" then open tab \"Shipping\"",
392
  "result": {
393
  "status": "passed",
394
+ "duration": 1392992301
395
  },
396
  "line": 17,
397
  "match": {
404
  "name": "tracker message type \"long\" visible",
405
  "result": {
406
  "status": "failed",
407
+ "duration": 89017288,
408
  "error_message": "AssertionError: expected 'Hey admin,\\nWe need your help to improve WP Desk plugins, so they are more useful for you and the rest of 30,000+ users. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe. Find out more »\\nAllow\\nDismiss this notice.' to include '\\nWe need your help to improve WP Desk plugins, so they are more useful for you and the rest of 18,000+ users. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe. Find out more'"
409
  },
410
  "line": 18,
429
  "keyword": "After ",
430
  "result": {
431
  "status": "passed",
432
+ "duration": 2164197223
433
  },
434
  "hidden": true,
435
  "embeddings": [
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: 2.1.5
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
@@ -36,7 +36,7 @@ if ( ! defined( 'ABSPATH' ) ) {
36
  exit;
37
  } // Exit if accessed directly
38
 
39
- $plugin_version = '2.1.5';
40
 
41
  define( 'FLEXIBLE_SHIPPING_VERSION', $plugin_version );
42
 
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: 2.1.6
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
36
  exit;
37
  } // Exit if accessed directly
38
 
39
+ $plugin_version = '2.1.6';
40
 
41
  define( 'FLEXIBLE_SHIPPING_VERSION', $plugin_version );
42
 
inc/wpdesk-tracker/class-wpdesk-tracker-factory.php CHANGED
@@ -66,7 +66,7 @@ if ( ! class_exists( 'WPDesk_Tracker_Factory' ) ) {
66
  $tracker->add_data_provider( new WPDesk_Tracker_Data_Provider_Users() );
67
  $tracker->add_data_provider( new WPDesk_Tracker_Data_Provider_Wordpress() );
68
 
69
- $tracker->init();
70
 
71
  return $tracker;
72
  }
66
  $tracker->add_data_provider( new WPDesk_Tracker_Data_Provider_Users() );
67
  $tracker->add_data_provider( new WPDesk_Tracker_Data_Provider_Wordpress() );
68
 
69
+ $tracker->init_hooks();
70
 
71
  return $tracker;
72
  }
inc/wpdesk-tracker/class-wpdesk-tracker.php CHANGED
@@ -42,6 +42,13 @@ if ( ! class_exists( 'WPDesk_Tracker' ) ) {
42
  */
43
  private $sender;
44
 
 
 
 
 
 
 
 
45
  public function __construct( $plugin_basename, WPDesk_Tracker_Sender $sender ) {
46
  $this->plugin_basename = $plugin_basename;
47
  $this->set_sender( $sender );
@@ -59,7 +66,7 @@ if ( ! class_exists( 'WPDesk_Tracker' ) ) {
59
  /**
60
  * Hook into cron event.
61
  */
62
- public function init() {
63
  add_action( 'plugins_loaded', array( $this, 'load_plugin_text_domain' ) );
64
  add_action( 'admin_init', array( $this, 'init_schedule' ) );
65
  add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ), 100 );
42
  */
43
  private $sender;
44
 
45
+ /**
46
+ * @deprecated do not use. This is for backward compatibility only.
47
+ */
48
+ public static function init( $foo = null ) {
49
+
50
+ }
51
+
52
  public function __construct( $plugin_basename, WPDesk_Tracker_Sender $sender ) {
53
  $this->plugin_basename = $plugin_basename;
54
  $this->set_sender( $sender );
66
  /**
67
  * Hook into cron event.
68
  */
69
+ public function init_hooks() {
70
  add_action( 'plugins_loaded', array( $this, 'load_plugin_text_domain' ) );
71
  add_action( 'admin_init', array( $this, 'init_schedule' ) );
72
  add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ), 100 );
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.5
6
  Tested up to: 4.9.6
7
- Stable tag: 2.1.5
8
  Requires PHP: 5.5
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -171,6 +171,9 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
171
 
172
  == Changelog ==
173
 
 
 
 
174
  = 2.1.5 - 2018-06-25 =
175
  * Tweaked tracker data anonymization
176
  * Fixed tracker notice
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.5
6
  Tested up to: 4.9.6
7
+ Stable tag: 2.1.6
8
  Requires PHP: 5.5
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
171
 
172
  == Changelog ==
173
 
174
+ = 2.1.6 - 2018-06-26 =
175
+ * Fixed error with conflict static tracker
176
+
177
  = 2.1.5 - 2018-06-25 =
178
  * Tweaked tracker data anonymization
179
  * Fixed tracker notice
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInitcf82b5fb62aaabc643f4fe04648afaad::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit4b4b62abe63a2bd5cece96babdecc242::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInitcf82b5fb62aaabc643f4fe04648afaad
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitcf82b5fb62aaabc643f4fe04648afaad
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInitcf82b5fb62aaabc643f4fe04648afaad', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInitcf82b5fb62aaabc643f4fe04648afaad', '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\ComposerStaticInitcf82b5fb62aaabc643f4fe04648afaad::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 ComposerAutoloaderInit4b4b62abe63a2bd5cece96babdecc242
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit4b4b62abe63a2bd5cece96babdecc242', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit4b4b62abe63a2bd5cece96babdecc242', '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\ComposerStaticInit4b4b62abe63a2bd5cece96babdecc242::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 ComposerStaticInitcf82b5fb62aaabc643f4fe04648afaad
8
  {
9
  public static $classMap = array (
10
  'Browser' => __DIR__ . '/../..' . '/classes/wpdesk/settings-api/modules/sysinfo/browser.php',
@@ -67,7 +67,7 @@ class ComposerStaticInitcf82b5fb62aaabc643f4fe04648afaad
67
  public static function getInitializer(ClassLoader $loader)
68
  {
69
  return \Closure::bind(function () use ($loader) {
70
- $loader->classMap = ComposerStaticInitcf82b5fb62aaabc643f4fe04648afaad::$classMap;
71
 
72
  }, null, ClassLoader::class);
73
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit4b4b62abe63a2bd5cece96babdecc242
8
  {
9
  public static $classMap = array (
10
  'Browser' => __DIR__ . '/../..' . '/classes/wpdesk/settings-api/modules/sysinfo/browser.php',
67
  public static function getInitializer(ClassLoader $loader)
68
  {
69
  return \Closure::bind(function () use ($loader) {
70
+ $loader->classMap = ComposerStaticInit4b4b62abe63a2bd5cece96babdecc242::$classMap;
71
 
72
  }, null, ClassLoader::class);
73
  }