Flexible Shipping for WooCommerce - Version 1.9.6

Version Description

  • 2017-07-27 =
  • Fixed a problem with WPML when using multiple currencies
  • Fixed an error when product weight is not set
  • Tweaked message in WP Desk Tracker class
Download this release

Release Info

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

Code changes from version 1.9.5 to 1.9.6

Files changed (9) hide show
  1. classes/shipping_method.php +16 -1
  2. flexible-shipping.php +3 -7
  3. inc/wpdesk-tracker/class-wpdesk-tracker.php +31 -0
  4. inc/wpdesk-tracker/lang/wpdesk-tracker-pl_PL.mo +0 -0
  5. inc/wpdesk-tracker/lang/wpdesk-tracker-pl_PL.po +15 -8
  6. inc/wpdesk-tracker/views/tracker-notice.php +2 -2
  7. languages/flexible-shipping-pl_PL.mo +0 -0
  8. languages/flexible-shipping-pl_PL.po +28 -21
  9. readme.txt +8 -3
classes/shipping_method.php CHANGED
@@ -647,9 +647,24 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
647
  }
648
 
649
  public function cart_weight() {
650
- return WC()->cart->cart_contents_weight;
 
 
 
 
 
 
 
651
  }
652
 
 
 
 
 
 
 
 
 
653
  public function package_item_count( $items ) {
654
  $item_count = 0;
655
 
647
  }
648
 
649
  public function cart_weight() {
650
+ if ( version_compare( WC_VERSION, '2.7', '<' ) ) {
651
+ add_filter( 'woocommerce_product_weight', array( $this, 'woocommerce_product_weight' ) );
652
+ }
653
+ $cart_weight = WC()->cart->cart_contents_weight;
654
+ if ( version_compare( WC_VERSION, '2.7', '<' ) ) {
655
+ remove_filter( 'woocommerce_product_weight', array( $this, 'woocommerce_product_weight' ) );
656
+ }
657
+ return $cart_weight;
658
  }
659
 
660
+ /* Fix for Woocommerce 2.6 weight calculation */
661
+ /* PHP Warning: A non-numeric value encountered in /wp-content/plugins/woocommerce/includes/class-wc-cart.php on line 359 */
662
+ public function woocommerce_product_weight( $weight ) {
663
+ if ( $weight == '' ) {
664
+ return 0;
665
+ }
666
+ }
667
+
668
  public function package_item_count( $items ) {
669
  $item_count = 0;
670
 
flexible-shipping.php CHANGED
@@ -3,12 +3,12 @@
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
10
  Domain Path: /languages/
11
- Tested up to: 4.8
12
 
13
  Copyright 2017 WP Desk Ltd.
14
 
@@ -118,11 +118,7 @@ if ( wpdesk_is_plugin_active( 'woocommerce/woocommerce.php' ) && !class_exists(
118
  add_action( 'init', array( $this, 'init_polylang') );
119
  add_action( 'admin_init', array( $this, 'init_wpml') );
120
 
121
- global $woocommerce_wpml;
122
-
123
- if ( isset( $woocommerce_wpml ) ) {
124
- add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wpml' ), 1 );
125
- }
126
 
127
  if ( class_exists( 'WC_Aelia_CurrencySwitcher' ) ) {
128
  add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_aelia' ), 1 );
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.6
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
10
  Domain Path: /languages/
11
+ Tested up to: 4.8.1
12
 
13
  Copyright 2017 WP Desk Ltd.
14
 
118
  add_action( 'init', array( $this, 'init_polylang') );
119
  add_action( 'admin_init', array( $this, 'init_wpml') );
120
 
121
+ add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wpml' ), 1 );
 
 
 
 
122
 
123
  if ( class_exists( 'WC_Aelia_CurrencySwitcher' ) ) {
124
  add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_aelia' ), 1 );
inc/wpdesk-tracker/class-wpdesk-tracker.php CHANGED
@@ -56,6 +56,7 @@ if ( !class_exists( 'WPDesk_Tracker' ) ) {
56
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_shipping_classes' ) );
57
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_product_variations' ) );
58
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_orders_per_month' ) );
 
59
 
60
  global $pagenow;
61
  if ( 'plugins.php' === $pagenow ) {
@@ -401,6 +402,36 @@ if ( !class_exists( 'WPDesk_Tracker' ) ) {
401
  return $data;
402
  }
403
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
404
 
405
  public static function send_deactivation_data() {
406
 
56
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_shipping_classes' ) );
57
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_product_variations' ) );
58
  add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_orders_per_month' ) );
59
+ add_filter( 'wpdesk_tracker_data', array( __CLASS__, 'wpdesk_tracker_data_shipping_methods_in_zones' ) );
60
 
61
  global $pagenow;
62
  if ( 'plugins.php' === $pagenow ) {
402
  return $data;
403
  }
404
 
405
+ public static function wpdesk_tracker_data_shipping_methods_in_zones( $data ) {
406
+ if ( class_exists( 'WC_Shipping_Zones' )) {
407
+ $other_zones = WC_Shipping_Zones::get_zones();
408
+ $zones = array();
409
+ foreach ( $other_zones as $zone ) {
410
+ $zones[] = WC_Shipping_Zones::get_zone_by( 'zone_id', $zone['zone_id'] );
411
+ }
412
+ $zones[] = WC_Shipping_Zones::get_zone_by();
413
+ $data['shipping_methods_by_title'] = array();
414
+ $data['shipping_zones_by_name'] = array();
415
+ foreach ( $zones as $zone ) {
416
+ if ( empty( $data['shipping_zones_by_name'][$zone->get_zone_name()] ) ) {
417
+ $data['shipping_zones_by_name'][$zone->get_zone_name()] = 1;
418
+ }
419
+ else {
420
+ $data['shipping_zones_by_name'][$zone->get_zone_name()]++;
421
+ }
422
+ foreach ( $zone->get_shipping_methods() as $shipping_method ) {
423
+ if ( empty( $data['shipping_methods_by_title'][$shipping_method->method_title] ) ) {
424
+ $data['shipping_methods_by_title'][$shipping_method->method_title] = 1;
425
+ }
426
+ else {
427
+ $data['shipping_methods_by_title'][$shipping_method->method_title]++;
428
+ }
429
+ }
430
+ }
431
+ }
432
+ return $data;
433
+ }
434
+
435
 
436
  public static function send_deactivation_data() {
437
 
inc/wpdesk-tracker/lang/wpdesk-tracker-pl_PL.mo CHANGED
Binary file
inc/wpdesk-tracker/lang/wpdesk-tracker-pl_PL.po CHANGED
@@ -1,15 +1,15 @@
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WP Desk Tracker\n"
4
- "POT-Creation-Date: 2017-05-29 16:08+0200\n"
5
- "PO-Revision-Date: 2017-05-29 16:08+0200\n"
6
  "Last-Translator: Piotr Jabłonowski <piotr.jablonowski@wpdesk.net>\n"
7
  "Language-Team: \n"
8
  "Language: pl_PL\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "X-Generator: Poedit 2.0.2\n"
13
  "X-Poedit-Basepath: ../..\n"
14
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
15
  "|| n%100>=20) ? 1 : 2);\n"
@@ -153,12 +153,11 @@ msgstr "Wyślij i dezaktywuj"
153
 
154
  #: wpdesk-tracker/views/tracker-notice.php:6
155
  msgid ""
156
- "Allow WP Desk to collect plugin usage information and <strong>get discount "
157
- "coupon</strong> in our shop. No sensitive data is tracked."
158
  msgstr ""
159
- "Pozwól WP Desk na zbieranie danych użytkowania wtyczek i <strong>otrzymaj "
160
- "kupon rabatowy</strong> do naszego sklepu. Żadne wrażliwe dane nie będą "
161
- "zbierane."
162
 
163
  #: wpdesk-tracker/views/tracker-notice.php:10
164
  #: wpdesk-tracker/views/tracker-notice.php:21
@@ -174,6 +173,14 @@ msgstr ""
174
  "została przyjęta. Jeśli zmienisz zdanie, zawsze możesz włączyć zgodę poprzez "
175
  "szybkie linki w menu wtyczek."
176
 
 
 
 
 
 
 
 
 
177
  #~ msgid "Error"
178
  #~ msgstr "Błąd"
179
 
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WP Desk Tracker\n"
4
+ "POT-Creation-Date: 2017-07-25 17:30+0200\n"
5
+ "PO-Revision-Date: 2017-07-25 17:30+0200\n"
6
  "Last-Translator: Piotr Jabłonowski <piotr.jablonowski@wpdesk.net>\n"
7
  "Language-Team: \n"
8
  "Language: pl_PL\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "X-Generator: Poedit 2.0.1\n"
13
  "X-Poedit-Basepath: ../..\n"
14
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
15
  "|| n%100>=20) ? 1 : 2);\n"
153
 
154
  #: wpdesk-tracker/views/tracker-notice.php:6
155
  msgid ""
156
+ "Please help us improve our plugins and get a <strong>20&#37; discount "
157
+ "coupon</strong> for <strong>WP Desk</strong> plugins."
158
  msgstr ""
159
+ "Pomóż nam ulepszyć nasze wtyczki i otrzymaj <strong>kupon rabatowy 20&#37;</"
160
+ "strong> na kolejne zakupy w <strong>WP Desk</strong>."
 
161
 
162
  #: wpdesk-tracker/views/tracker-notice.php:10
163
  #: wpdesk-tracker/views/tracker-notice.php:21
173
  "została przyjęta. Jeśli zmienisz zdanie, zawsze możesz włączyć zgodę poprzez "
174
  "szybkie linki w menu wtyczek."
175
 
176
+ #~ msgid ""
177
+ #~ "Allow WP Desk to collect plugin usage information and <strong>get "
178
+ #~ "discount coupon</strong> in our shop. No sensitive data is tracked."
179
+ #~ msgstr ""
180
+ #~ "Pozwól WP Desk na zbieranie danych użytkowania wtyczek i <strong>otrzymaj "
181
+ #~ "kupon rabatowy</strong> do naszego sklepu. Żadne wrażliwe dane nie będą "
182
+ #~ "zbierane."
183
+
184
  #~ msgid "Error"
185
  #~ msgstr "Błąd"
186
 
inc/wpdesk-tracker/views/tracker-notice.php CHANGED
@@ -3,8 +3,8 @@
3
  <div id="wpdesk_tracker_notice_coupon" class="updated notice wpdesk_tracker_notice is-dismissible">
4
  <p>
5
  <?php printf ( __( 'Hey %s,', 'wpdesk-tracker'), $username ); ?><br/>
6
- <?php _e( 'Allow WP Desk to collect plugin usage information and <strong>get discount coupon</strong> in our shop. No sensitive data is tracked.', 'wpdesk-tracker'); ?>
7
- <a href="<?php echo $terms_url; ?>" target="_blank"><?php _e( 'Find out more &raquo;', 'wpdesk-tracker' ); ?></a>
8
  </p>
9
  <p>
10
  <button id="wpdesk_tracker_allow_coupon_button_notice" class="button button-primary"><?php _e( 'Allow', 'wpdesk-tracker' ); ?></button>
3
  <div id="wpdesk_tracker_notice_coupon" class="updated notice wpdesk_tracker_notice is-dismissible">
4
  <p>
5
  <?php printf ( __( 'Hey %s,', 'wpdesk-tracker'), $username ); ?><br/>
6
+ <?php _e( 'Please help us improve our plugins and get a <strong>20&#37; discount coupon</strong> for <strong>WP Desk</strong> plugins.', 'wpdesk-tracker'); ?>
7
+ <a href="<?php echo $terms_url; ?>?utm_source=tracker&utm_medium=link&utm_campaign=tracker-coupon-message" target="_blank"><?php _e( 'Find out more &raquo;', 'wpdesk-tracker' ); ?></a>
8
  </p>
9
  <p>
10
  <button id="wpdesk_tracker_allow_coupon_button_notice" class="button button-primary"><?php _e( 'Allow', 'wpdesk-tracker' ); ?></button>
languages/flexible-shipping-pl_PL.mo CHANGED
Binary file
languages/flexible-shipping-pl_PL.po CHANGED
@@ -1,15 +1,15 @@
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: Flexible Shipping\n"
4
- "POT-Creation-Date: 2017-06-13 18:41+0200\n"
5
- "PO-Revision-Date: 2017-06-13 18:46+0200\n"
6
- "Last-Translator: Piotr Jabłonowski <piotr.jablonowski@inspirelabs.pl>\n"
7
  "Language-Team: Maciej Swoboda <maciej.swoboda@gmail.com>\n"
8
  "Language: pl_PL\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "X-Generator: Poedit 2.0.1\n"
13
  "X-Poedit-Basepath: ..\n"
14
  "X-Poedit-WPHeader: flexible-shipping.php\n"
15
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
@@ -139,15 +139,15 @@ msgstr ""
139
  msgid "An unknown error occurred"
140
  msgstr "Wystąpił nieznany błąd"
141
 
142
- #: classes/inspire/plugin4.php:386 flexible-shipping.php:496
143
  msgid "Settings"
144
  msgstr "Ustawienia"
145
 
146
- #: classes/inspire/plugin4.php:387 flexible-shipping.php:497
147
  msgid "Docs"
148
  msgstr "Docs"
149
 
150
- #: classes/inspire/plugin4.php:388 flexible-shipping.php:498
151
  msgid "Support"
152
  msgstr "Wsparcie"
153
 
@@ -281,8 +281,8 @@ msgstr "Dodaj przesyłkę"
281
  #: classes/settings-flexible-shipping.php:28
282
  #: classes/settings-shipping-method-form.php:44 classes/shipping_method.php:24
283
  #: classes/shipping_method.php:25 classes/shipping_method.php:43
284
- #: flexible-shipping.php:380 flexible-shipping.php:383
285
- #: flexible-shipping.php:386
286
  msgid "Flexible Shipping"
287
  msgstr "Flexible Shipping"
288
 
@@ -339,7 +339,7 @@ msgstr ""
339
  "%sDodaj integrację%s z DPD, DHL, InPost, eNadawca Poczta Polska, Paczka w "
340
  "Ruchu."
341
 
342
- #: classes/settings-shipping-method-form.php:19 classes/shipping_method.php:786
343
  msgid "Free"
344
  msgstr "Bezpłatnie"
345
 
@@ -839,23 +839,23 @@ msgstr "Proszę wybrać metody wysyłki do usunięcia"
839
  msgid "Select file to import"
840
  msgstr "Wybierz plik do importu"
841
 
842
- #: flexible-shipping.php:420
843
  msgid ""
844
  "Flexible Shipping requires at least version 2.7 of Active Payments plugin."
845
  msgstr ""
846
  "Flexible Shipping wymaga wtyczki Aktywne płatności w wersji co najmniej 2.7."
847
 
848
- #: flexible-shipping.php:431
849
  msgid "Flexible Shipping requires at least version 1.2 of eNadawca plugin."
850
  msgstr "Flexible Shipping wymaga wtyczki eNadawca w wersji co najmniej 1.2."
851
 
852
- #: flexible-shipping.php:442
853
  msgid ""
854
  "Flexible Shipping requires at least version 1.1 of Paczka w Ruchu plugin."
855
  msgstr ""
856
  "Flexible Shipping wymaga wtyczki Paczka w Ruchu w wersji co najmniej 1.1."
857
 
858
- #: flexible-shipping.php:450
859
  #, php-format
860
  msgid ""
861
  "You are using WooCommerce Flexible Shipping below 1.4. Please deactivate it "
@@ -866,11 +866,11 @@ msgstr ""
866
  "Wyłącz go na %sstronie wtyczek%s. Przeczytaj o dużej zmianie we Flexible "
867
  "Shipping na %snaszym blogu →%s"
868
 
869
- #: flexible-shipping.php:504
870
  msgid "Upgrade"
871
  msgstr "Kup PRO"
872
 
873
- #: flexible-shipping.php:620
874
  #, php-format
875
  msgid "Redirecting. If page not redirects click %s here %s."
876
  msgstr ""
@@ -1006,12 +1006,11 @@ msgstr "Anuluj"
1006
 
1007
  #: inc/wpdesk-tracker/views/tracker-notice.php:6
1008
  msgid ""
1009
- "Allow WP Desk to collect plugin usage information and <strong>get discount "
1010
- "coupon</strong> in our shop. No sensitive data is tracked."
1011
  msgstr ""
1012
- "Pozwól WP Desk na zbieranie danych użytkowania wtyczek i <strong>otrzymaj "
1013
- "kupon rabatowy</strong> do naszego sklepu. Żadne wrażliwe dane nie będą "
1014
- "zbierane."
1015
 
1016
  #: inc/wpdesk-tracker/views/tracker-notice.php:10
1017
  #: inc/wpdesk-tracker/views/tracker-notice.php:21
@@ -1047,6 +1046,14 @@ msgstr "WP Desk"
1047
  msgid "https://www.wpdesk.net/"
1048
  msgstr "https://www.wpdesk.pl/"
1049
 
 
 
 
 
 
 
 
 
1050
  #~ msgid "Integration "
1051
  #~ msgstr "Integracja "
1052
 
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: Flexible Shipping\n"
4
+ "POT-Creation-Date: 2017-07-27 10:16+0200\n"
5
+ "PO-Revision-Date: 2017-07-27 10:17+0200\n"
6
+ "Last-Translator: Piotr Jabłonowski <piotr.jablonowski@wpdesk.net>\n"
7
  "Language-Team: Maciej Swoboda <maciej.swoboda@gmail.com>\n"
8
  "Language: pl_PL\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "X-Generator: Poedit 2.0.3\n"
13
  "X-Poedit-Basepath: ..\n"
14
  "X-Poedit-WPHeader: flexible-shipping.php\n"
15
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
139
  msgid "An unknown error occurred"
140
  msgstr "Wystąpił nieznany błąd"
141
 
142
+ #: classes/inspire/plugin4.php:386 flexible-shipping.php:523
143
  msgid "Settings"
144
  msgstr "Ustawienia"
145
 
146
+ #: classes/inspire/plugin4.php:387 flexible-shipping.php:524
147
  msgid "Docs"
148
  msgstr "Docs"
149
 
150
+ #: classes/inspire/plugin4.php:388 flexible-shipping.php:525
151
  msgid "Support"
152
  msgstr "Wsparcie"
153
 
281
  #: classes/settings-flexible-shipping.php:28
282
  #: classes/settings-shipping-method-form.php:44 classes/shipping_method.php:24
283
  #: classes/shipping_method.php:25 classes/shipping_method.php:43
284
+ #: flexible-shipping.php:407 flexible-shipping.php:410
285
+ #: flexible-shipping.php:413
286
  msgid "Flexible Shipping"
287
  msgstr "Flexible Shipping"
288
 
339
  "%sDodaj integrację%s z DPD, DHL, InPost, eNadawca Poczta Polska, Paczka w "
340
  "Ruchu."
341
 
342
+ #: classes/settings-shipping-method-form.php:19 classes/shipping_method.php:801
343
  msgid "Free"
344
  msgstr "Bezpłatnie"
345
 
839
  msgid "Select file to import"
840
  msgstr "Wybierz plik do importu"
841
 
842
+ #: flexible-shipping.php:447
843
  msgid ""
844
  "Flexible Shipping requires at least version 2.7 of Active Payments plugin."
845
  msgstr ""
846
  "Flexible Shipping wymaga wtyczki Aktywne płatności w wersji co najmniej 2.7."
847
 
848
+ #: flexible-shipping.php:458
849
  msgid "Flexible Shipping requires at least version 1.2 of eNadawca plugin."
850
  msgstr "Flexible Shipping wymaga wtyczki eNadawca w wersji co najmniej 1.2."
851
 
852
+ #: flexible-shipping.php:469
853
  msgid ""
854
  "Flexible Shipping requires at least version 1.1 of Paczka w Ruchu plugin."
855
  msgstr ""
856
  "Flexible Shipping wymaga wtyczki Paczka w Ruchu w wersji co najmniej 1.1."
857
 
858
+ #: flexible-shipping.php:477
859
  #, php-format
860
  msgid ""
861
  "You are using WooCommerce Flexible Shipping below 1.4. Please deactivate it "
866
  "Wyłącz go na %sstronie wtyczek%s. Przeczytaj o dużej zmianie we Flexible "
867
  "Shipping na %snaszym blogu →%s"
868
 
869
+ #: flexible-shipping.php:531
870
  msgid "Upgrade"
871
  msgstr "Kup PRO"
872
 
873
+ #: flexible-shipping.php:647
874
  #, php-format
875
  msgid "Redirecting. If page not redirects click %s here %s."
876
  msgstr ""
1006
 
1007
  #: inc/wpdesk-tracker/views/tracker-notice.php:6
1008
  msgid ""
1009
+ "Please help us improve our plugins and get a <strong>20&#37; discount "
1010
+ "coupon</strong> for <strong>WP Desk</strong> plugins."
1011
  msgstr ""
1012
+ "Pomóż nam ulepszyć nasze wtyczki i otrzymaj <strong>kupon rabatowy 20&#37;</"
1013
+ "strong> na kolejne zakupy w <strong>WP Desk</strong>."
 
1014
 
1015
  #: inc/wpdesk-tracker/views/tracker-notice.php:10
1016
  #: inc/wpdesk-tracker/views/tracker-notice.php:21
1046
  msgid "https://www.wpdesk.net/"
1047
  msgstr "https://www.wpdesk.pl/"
1048
 
1049
+ #~ msgid ""
1050
+ #~ "Allow WP Desk to collect plugin usage information and <strong>get "
1051
+ #~ "discount coupon</strong> in our shop. No sensitive data is tracked."
1052
+ #~ msgstr ""
1053
+ #~ "Pozwól WP Desk na zbieranie danych użytkowania wtyczek i <strong>otrzymaj "
1054
+ #~ "kupon rabatowy</strong> do naszego sklepu. Żadne wrażliwe dane nie będą "
1055
+ #~ "zbierane."
1056
+
1057
  #~ msgid "Integration "
1058
  #~ msgstr "Integracja "
1059
 
readme.txt CHANGED
@@ -2,9 +2,9 @@
2
  Contributors: wpdesk, swoboda, jablonowski, barczakszymon, ospiotr
3
  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.5
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -147,7 +147,7 @@ We provide a limited support for the free version in the [plugin Support Forum](
147
  == Screenshots ==
148
 
149
  1. Main Settings in WooCommerce 2.5.
150
- 2. Main Settings in WooCommerce 2.6.
151
  3. Shipping Methods list.
152
  4. Add/Edit Shipping Method.
153
  5. Shipping Rules Settings.
@@ -158,6 +158,11 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
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
2
  Contributors: wpdesk, swoboda, jablonowski, barczakszymon, ospiotr
3
  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.8
7
+ Stable tag: 1.9.6
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
147
  == Screenshots ==
148
 
149
  1. Main Settings in WooCommerce 2.5.
150
+ 2. Main Settings in WooCommerce 2.6 and up.
151
  3. Shipping Methods list.
152
  4. Add/Edit Shipping Method.
153
  5. Shipping Rules Settings.
158
 
159
  == Changelog ==
160
 
161
+ = 1.9.6 - 2017-07-27 =
162
+ * Fixed a problem with WPML when using multiple currencies
163
+ * Fixed an error when product weight is not set
164
+ * Tweaked message in WP Desk Tracker class
165
+
166
  = 1.9.5 - 2017-07-14 =
167
  * Added support for WooCommerce 3.1
168
  * Fixed display shipping methods after adding Flexible Shipping to COD payment method