Flexible Shipping for WooCommerce - Version 2.0

Version Description

  • 2018-01-24 =
  • Added support for WooCommerce 3.3
  • Fixed installing the plugin by wp-cli
  • Fixed error on cart page for WooCommerce below 3.2
Download this release

Release Info

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

Code changes from version 1.9.12 to 2.0

Files changed (14) hide show
  1. assets/css/font.css +59 -0
  2. assets/css/font.min.css +1 -0
  3. assets/fonts/flexible-shipping.eot +0 -0
  4. assets/fonts/flexible-shipping.svg +15 -0
  5. assets/fonts/flexible-shipping.ttf +0 -0
  6. assets/fonts/flexible-shipping.woff +0 -0
  7. classes/bulk-actions.php +4 -4
  8. classes/shipping_method.php +2 -1
  9. classes/tracker.php +3 -0
  10. classes/views/html-column-shipping-shipping.php +6 -3
  11. flexible-shipping.php +5 -4
  12. languages/flexible-shipping-pl_PL.mo +0 -0
  13. languages/flexible-shipping-pl_PL.po +26 -21
  14. readme.txt +8 -3
assets/css/font.css ADDED
@@ -0,0 +1,59 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ @font-face {
2
+ font-family: 'flexible-shipping';
3
+ src: url('../fonts/flexible-shipping.eot?imgwjn');
4
+ src: url('../fonts/flexible-shipping.eot?imgwjn#iefix') format('embedded-opentype'),
5
+ url('../fonts/flexible-shipping.ttf?imgwjn') format('truetype'),
6
+ url('../fonts/flexible-shipping.woff?imgwjn') format('woff'),
7
+ url('../fonts/flexible-shipping.svg?imgwjn#flexible-shipping') format('svg');
8
+ font-weight: normal;
9
+ font-style: normal;
10
+ }
11
+
12
+ div.shipping-status a.icon-status {
13
+ font-family: 'flexible-shipping' !important;
14
+ speak: none;
15
+ font-style: normal;
16
+ font-weight: normal;
17
+ font-variant: normal;
18
+ text-transform: none;
19
+ line-height: 1;
20
+ display: inline-block;
21
+ overflow: hidden;
22
+ text-indent: -9999px;
23
+ height: 2em!important;
24
+ width: 2em;
25
+ -webkit-font-smoothing: antialiased;
26
+ -moz-osx-font-smoothing: grayscale;
27
+ }
28
+
29
+ div.shipping-status a.icon-status:before {
30
+ font-size: 20px;
31
+ float: left;
32
+ text-align: center;
33
+ background: transparent none;
34
+ margin: 0 0 0 5px;
35
+ text-indent: 0;
36
+ }
37
+
38
+ .icon-plus-circle:before, .icon-status-new:before {
39
+ color: #ffba00;
40
+ background: transparent none;
41
+ text-indent: 0;
42
+ content: "\f055";
43
+ }
44
+ .icon-check-circle:before, .icon-status-confirmed:before {
45
+ color: #2ea2cc;
46
+ content: "\f058";
47
+ }
48
+ .icon-exclamation-circle:before, .icon-status-error:before {
49
+ color: #d0c21f;
50
+ content: "\f06a";
51
+ }
52
+ .icon-truck:before {
53
+ content: "\f0d1";
54
+ }
55
+ .icon-pause-circle:before, .icon-status-created:before {
56
+ color: #999;
57
+ content: "\f28b";
58
+ }
59
+
assets/css/font.min.css ADDED
@@ -0,0 +1 @@
 
1
+ @font-face{font-family:'flexible-shipping';src:url('../fonts/flexible-shipping.eot?imgwjn');src:url('../fonts/flexible-shipping.eot?imgwjn#iefix') format('embedded-opentype'),url('../fonts/flexible-shipping.ttf?imgwjn') format('truetype'),url('../fonts/flexible-shipping.woff?imgwjn') format('woff'),url('../fonts/flexible-shipping.svg?imgwjn#flexible-shipping') format('svg');font-weight:normal;font-style:normal}div.shipping-status a.icon-status{font-family:'flexible-shipping' !important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;display:inline-block;overflow:hidden;text-indent:-9999px;height:2em !important;width:2em;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}div.shipping-status a.icon-status:before{font-size:20px;float:left;text-align:center;background:transparent none;margin:0 0 0 5px;text-indent:0}.icon-plus-circle:before,.icon-status-new:before{color:#ffba00;background:transparent none;text-indent:0;content:"\f055"}.icon-check-circle:before,.icon-status-confirmed:before{color:#2ea2cc;content:"\f058"}.icon-exclamation-circle:before,.icon-status-error:before{color:#d0c21f;content:"\f06a"}.icon-truck:before{content:"\f0d1"}.icon-pause-circle:before,.icon-status-created:before{color:#999;content:"\f28b"}
assets/fonts/flexible-shipping.eot ADDED
Binary file
assets/fonts/flexible-shipping.svg ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0" standalone="no"?>
2
+ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3
+ <svg xmlns="http://www.w3.org/2000/svg">
4
+ <metadata>Generated by IcoMoon</metadata>
5
+ <defs>
6
+ <font id="flexible-shipping" horiz-adv-x="1024">
7
+ <font-face units-per-em="1024" ascent="960" descent="-64" />
8
+ <missing-glyph horiz-adv-x="1024" />
9
+ <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
10
+ <glyph unicode="&#xf055;" glyph-name="plus-circle" horiz-adv-x="878" d="M694.857 402.286v73.143c0 20-16.571 36.571-36.571 36.571h-146.286v146.286c0 20-16.571 36.571-36.571 36.571h-73.143c-20 0-36.571-16.571-36.571-36.571v-146.286h-146.286c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h146.286v-146.286c0-20 16.571-36.571 36.571-36.571h73.143c20 0 36.571 16.571 36.571 36.571v146.286h146.286c20 0 36.571 16.571 36.571 36.571zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
11
+ <glyph unicode="&#xf058;" glyph-name="check-circle" horiz-adv-x="878" d="M733.714 531.428c0 9.714-3.429 19.429-10.286 26.286l-52 51.429c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-233.143-232.571-129.143 129.143c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-52-51.429c-6.857-6.857-10.286-16.571-10.286-26.286s3.429-18.857 10.286-25.714l206.857-206.857c6.857-6.857 16.571-10.857 25.714-10.857 9.714 0 19.429 4 26.286 10.857l310.286 310.286c6.857 6.857 10.286 16 10.286 25.714zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
12
+ <glyph unicode="&#xf06a;" glyph-name="exclamation-circle" horiz-adv-x="878" d="M438.857 877.714c242.286 0 438.857-196.571 438.857-438.857s-196.571-438.857-438.857-438.857-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857zM512 165.143v108.571c0 10.286-8 18.857-17.714 18.857h-109.714c-10.286 0-18.857-8.571-18.857-18.857v-108.571c0-10.286 8.571-18.857 18.857-18.857h109.714c9.714 0 17.714 8.571 17.714 18.857zM510.857 361.714l10.286 354.857c0 4-1.714 8-5.714 10.286-3.429 2.857-8.571 4.571-13.714 4.571h-125.714c-5.143 0-10.286-1.714-13.714-4.571-4-2.286-5.714-6.286-5.714-10.286l9.714-354.857c0-8 8.571-14.286 19.429-14.286h105.714c10.286 0 18.857 6.286 19.429 14.286z" />
13
+ <glyph unicode="&#xf0d1;" glyph-name="truck" horiz-adv-x="1061" d="M365.714 146.286c0 40-33.143 73.143-73.143 73.143s-73.143-33.143-73.143-73.143 33.143-73.143 73.143-73.143 73.143 33.143 73.143 73.143zM146.286 438.857h219.429v146.286h-90.286c-2.286 0-10.857-3.429-12.571-5.143l-111.429-111.429c-1.714-1.714-5.143-10.286-5.143-12.571v-17.143zM877.714 146.286c0 40-33.143 73.143-73.143 73.143s-73.143-33.143-73.143-73.143 33.143-73.143 73.143-73.143 73.143 33.143 73.143 73.143zM1024 768v-585.143c0-42.286-44.571-36.571-73.143-36.571 0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286h-219.429c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286h-36.571c-28.571 0-73.143-5.714-73.143 36.571 0 20 16.571 36.571 36.571 36.571v182.857c0 40.571-5.714 85.714 25.714 117.143l113.143 113.143c14.286 14.286 41.714 25.714 62.286 25.714h91.429v109.714c0 20 16.571 36.571 36.571 36.571h585.143c20 0 36.571-16.571 36.571-36.571z" />
14
+ <glyph unicode="&#xf28b;" glyph-name="pause-circle" horiz-adv-x="878" d="M402.286 274.286v329.143c0 10.286-8 18.286-18.286 18.286h-146.286c-10.286 0-18.286-8-18.286-18.286v-329.143c0-10.286 8-18.286 18.286-18.286h146.286c10.286 0 18.286 8 18.286 18.286zM658.286 274.286v329.143c0 10.286-8 18.286-18.286 18.286h-146.286c-10.286 0-18.286-8-18.286-18.286v-329.143c0-10.286 8-18.286 18.286-18.286h146.286c10.286 0 18.286 8 18.286 18.286zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
15
+ </font></defs></svg>
assets/fonts/flexible-shipping.ttf ADDED
Binary file
assets/fonts/flexible-shipping.woff ADDED
Binary file
classes/bulk-actions.php CHANGED
@@ -239,10 +239,10 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping_Bulk_Actions' ) ) {
239
  }
240
 
241
  public function manage_edit_shop_order_columns( $columns ) {
242
- $integrations = apply_filters( 'flexible_shipping_integration_options', array() );
243
- if ( count( $integrations ) == 0 ) {
244
- return $columns;
245
- }
246
  if ( isset( $columns['flexible_shipping'] ) ) {
247
  return $columns;
248
  }
239
  }
240
 
241
  public function manage_edit_shop_order_columns( $columns ) {
242
+ $integrations = apply_filters( 'flexible_shipping_integration_options', array() );
243
+ if ( count( $integrations ) == 0 ) {
244
+ return $columns;
245
+ }
246
  if ( isset( $columns['flexible_shipping'] ) ) {
247
  return $columns;
248
  }
classes/shipping_method.php CHANGED
@@ -737,11 +737,12 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
737
  $taxes = array();
738
  if ( version_compare( WC_VERSION, '3.2', '<' ) ) {
739
  $taxes = WC()->cart->taxes;
 
740
  }
741
  else {
742
  $taxes = WC()->cart->get_cart_contents_taxes();
 
743
  }
744
- $contents_cost = WC()->cart->get_cart_contents_total() + array_sum( $taxes );
745
  }
746
  else {
747
  $contents_cost = WC()->cart->cart_contents_total;
737
  $taxes = array();
738
  if ( version_compare( WC_VERSION, '3.2', '<' ) ) {
739
  $taxes = WC()->cart->taxes;
740
+ $contents_cost = WC()->cart->cart_contents_total + array_sum( $taxes );
741
  }
742
  else {
743
  $taxes = WC()->cart->get_cart_contents_taxes();
744
+ $contents_cost = WC()->cart->get_cart_contents_total() + array_sum( $taxes );
745
  }
 
746
  }
747
  else {
748
  $contents_cost = WC()->cart->cart_contents_total;
classes/tracker.php CHANGED
@@ -186,6 +186,9 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping_Tracker' ) ) {
186
 
187
 
188
  public function activated_plugin( $plugin, $network_wide ) {
 
 
 
189
  if ( !wpdesk_tracker_enabled() ) {
190
  return;
191
  }
186
 
187
 
188
  public function activated_plugin( $plugin, $network_wide ) {
189
+ if ( defined( 'WP_CLI' ) && WP_CLI ) {
190
+ return;
191
+ }
192
  if ( !wpdesk_tracker_enabled() ) {
193
  return;
194
  }
classes/views/html-column-shipping-shipping.php CHANGED
@@ -1,8 +1,11 @@
1
  <?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
2
  <div class="shipping">
3
- <div class="shipping-status column-order_status">
4
- <a href="<?php echo $shipping['url']; ?>">
5
- <mark class="<?php echo $classes[$shipping['status']]; ?> tips" data-tip="<?php echo $statuses[$shipping['status']]; ?>"><?php echo $statuses[$shipping['status']]; ?></mark>
 
 
 
6
  </a>
7
  <?php do_action( 'flexible_shipping_shipping_status_html', $shipping ); ?>
8
  </div>
1
  <?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
2
  <div class="shipping">
3
+ <div class="shipping-status">
4
+ <a class="icon-status icon-status-<?php echo $shipping['status']; ?> tips" href="<?php echo $shipping['url']; ?>" data-tip="<?php echo $statuses[$shipping['status']]; ?>">
5
+ <?php echo $statuses[$shipping['status']]; ?>
6
+ <?php /*
7
+ <span class="icon-status icon-status-<?php echo $shipping['status']; ?> tips" data-tip="<?php echo $statuses[$shipping['status']]; ?>"><?php echo $statuses[$shipping['status']]; ?></span>
8
+ */ ?>
9
  </a>
10
  <?php do_action( 'flexible_shipping_shipping_status_html', $shipping ); ?>
11
  </div>
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: 1.9.12
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
10
  Domain Path: /languages/
11
  Requires at least: 4.5
12
- Tested up to: 4.9
13
  WC requires at least: 2.6.14
14
- WC tested up to: 3.2.6
15
 
16
  Copyright 2017 WP Desk Ltd.
17
 
@@ -57,7 +57,7 @@ if ( wpdesk_is_plugin_active( 'woocommerce/woocommerce.php' ) && !class_exists(
57
 
58
  class WPDesk_Flexible_Shipping_Free_Plugin extends inspire_Plugin4 {
59
 
60
- private $scripts_version = '37';
61
 
62
  protected $_pluginNamespace = "flexible-shipping";
63
 
@@ -515,6 +515,7 @@ if ( wpdesk_is_plugin_active( 'woocommerce/woocommerce.php' ) && !class_exists(
515
  ));
516
  wp_enqueue_script( 'fs_admin' );
517
  wp_enqueue_style( 'fs_admin', $this->getPluginUrl() . 'assets/css/admin' . $suffix . '.css', array(), $this->scripts_version );
 
518
  }
519
  }
520
 
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.0
7
  Author: WP Desk
8
  Author URI: https://www.wpdesk.net/
9
  Text Domain: flexible-shipping
10
  Domain Path: /languages/
11
  Requires at least: 4.5
12
+ Tested up to: 4.9.2
13
  WC requires at least: 2.6.14
14
+ WC tested up to: 3.3
15
 
16
  Copyright 2017 WP Desk Ltd.
17
 
57
 
58
  class WPDesk_Flexible_Shipping_Free_Plugin extends inspire_Plugin4 {
59
 
60
+ private $scripts_version = '58';
61
 
62
  protected $_pluginNamespace = "flexible-shipping";
63
 
515
  ));
516
  wp_enqueue_script( 'fs_admin' );
517
  wp_enqueue_style( 'fs_admin', $this->getPluginUrl() . 'assets/css/admin' . $suffix . '.css', array(), $this->scripts_version );
518
+ wp_enqueue_style( 'fs_font', $this->getPluginUrl() . 'assets/css/font' . $suffix . '.css', array(), $this->scripts_version );
519
  }
520
  }
521
 
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-12-07 12:40+0100\n"
5
- "PO-Revision-Date: 2017-12-07 12:41+0100\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 "
@@ -54,35 +54,35 @@ msgstr "Nowa"
54
  msgid "Manifest created"
55
  msgstr "Protokół nadania utworzony"
56
 
57
- #: classes/bulk-actions.php:252
58
  msgid "Shipping"
59
  msgstr "Wysyłka"
60
 
61
- #: classes/bulk-actions.php:262
62
  msgid "Send shipment"
63
  msgstr "Nadaj przesyłki"
64
 
65
- #: classes/bulk-actions.php:263
66
  msgid "Get labels"
67
  msgstr "Pobierz etykiety nadawcze"
68
 
69
- #: classes/bulk-actions.php:265
70
  msgid "Create shipping manifest"
71
  msgstr "Utwórz protokół nadania"
72
 
73
- #: classes/bulk-actions.php:286
74
  msgid "Shipment created."
75
  msgstr "Przesyłka utworzona."
76
 
77
- #: classes/bulk-actions.php:298
78
  msgid "No action performed."
79
  msgstr "Nie wykonano żdanych działań."
80
 
81
- #: classes/bulk-actions.php:318
82
  msgid "Label downloaded."
83
  msgstr "Etykieta została pobrana."
84
 
85
- #: classes/bulk-actions.php:336
86
  msgid ""
87
  "Unable to create temporary zip archive for labels. Check temporary folder "
88
  "configuration on server."
@@ -90,7 +90,7 @@ msgstr ""
90
  "Nie można utworzyć tymczasowego archwium zip dla etykiet. Sprawdź "
91
  "konfigurację folderu na serwerze."
92
 
93
- #: classes/bulk-actions.php:400
94
  #, php-format
95
  msgid ""
96
  "Created manifest: %s (%s). If download not start automatically click %shere"
@@ -99,28 +99,28 @@ msgstr ""
99
  "Utworzone protokoły nadania: %s (%s). Jesli pobieranie nie rozpoczęło się "
100
  "automatycznie kliknij %stutaj%s."
101
 
102
- #: classes/bulk-actions.php:412
103
  #, php-format
104
  msgid "Manifest creation error: %s (%s)."
105
  msgstr "Błąd podczas tworzenia protokołu nadania: %s (%s)."
106
 
107
- #: classes/bulk-actions.php:423
108
  msgid "No manifests created."
109
  msgstr "Nie zostały utworzone protokoły nadania."
110
 
111
- #: classes/bulk-actions.php:437
112
  #, php-format
113
  msgid "Bulk send shipment - processed orders: %d"
114
  msgstr "Masowe nadawanie przesyłek - przetworzone zamówienia: %d"
115
 
116
- #: classes/bulk-actions.php:446
117
  #, php-format
118
  msgid "Bulk labels - processed orders: %d. No labels for processed orders."
119
  msgstr ""
120
  "Masowe pobieranie etykiet - przetworzone zamówienia: %d. Brak etykiet dla "
121
  "przetworzonych zamówień."
122
 
123
- #: classes/bulk-actions.php:462
124
  #, php-format
125
  msgid ""
126
  "Bulk labels - processed orders: %d. If download not start automatically "
@@ -129,7 +129,7 @@ msgstr ""
129
  "Masowe pobieranie etykiet - przetworzone zamówienia: %d. Jeśli pobieranie "
130
  "nie rozpoczęło się automatycznie kliknij %stutaj%s ."
131
 
132
- #: classes/bulk-actions.php:471
133
  #, php-format
134
  msgid "Bulk shipping manifest - processed orders: %d"
135
  msgstr "Zbiorcze tworzenie protokołów nadania - przetworzone zamówienia: %d"
@@ -275,11 +275,16 @@ msgstr "Zamówienie"
275
  msgid "Shipment for order %s, %s"
276
  msgstr "Przesyłka do zamówienia %s, %s"
277
 
278
- #: classes/order-add-shipping.php:81
 
 
 
 
 
279
  msgid "Select integration"
280
  msgstr "Wybierz integrację"
281
 
282
- #: classes/order-add-shipping.php:90
283
  msgid "Add shipping"
284
  msgstr "Dodaj przesyłkę"
285
 
@@ -356,7 +361,7 @@ msgstr "Zintegruj z DPD."
356
  msgid "%sAdd integration%s"
357
  msgstr "%sDodaj integrację%s"
358
 
359
- #: classes/settings-shipping-method-form.php:32 classes/shipping_method.php:809
360
  msgid "Free"
361
  msgstr "Bezpłatnie"
362
 
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: Flexible Shipping\n"
4
+ "POT-Creation-Date: 2017-12-22 12:55+0100\n"
5
+ "PO-Revision-Date: 2017-12-22 12:57+0100\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.4\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 "
54
  msgid "Manifest created"
55
  msgstr "Protokół nadania utworzony"
56
 
57
+ #: classes/bulk-actions.php:255 classes/bulk-actions.php:261
58
  msgid "Shipping"
59
  msgstr "Wysyłka"
60
 
61
+ #: classes/bulk-actions.php:269
62
  msgid "Send shipment"
63
  msgstr "Nadaj przesyłki"
64
 
65
+ #: classes/bulk-actions.php:270
66
  msgid "Get labels"
67
  msgstr "Pobierz etykiety nadawcze"
68
 
69
+ #: classes/bulk-actions.php:272
70
  msgid "Create shipping manifest"
71
  msgstr "Utwórz protokół nadania"
72
 
73
+ #: classes/bulk-actions.php:293
74
  msgid "Shipment created."
75
  msgstr "Przesyłka utworzona."
76
 
77
+ #: classes/bulk-actions.php:305
78
  msgid "No action performed."
79
  msgstr "Nie wykonano żdanych działań."
80
 
81
+ #: classes/bulk-actions.php:325
82
  msgid "Label downloaded."
83
  msgstr "Etykieta została pobrana."
84
 
85
+ #: classes/bulk-actions.php:343
86
  msgid ""
87
  "Unable to create temporary zip archive for labels. Check temporary folder "
88
  "configuration on server."
90
  "Nie można utworzyć tymczasowego archwium zip dla etykiet. Sprawdź "
91
  "konfigurację folderu na serwerze."
92
 
93
+ #: classes/bulk-actions.php:407
94
  #, php-format
95
  msgid ""
96
  "Created manifest: %s (%s). If download not start automatically click %shere"
99
  "Utworzone protokoły nadania: %s (%s). Jesli pobieranie nie rozpoczęło się "
100
  "automatycznie kliknij %stutaj%s."
101
 
102
+ #: classes/bulk-actions.php:419
103
  #, php-format
104
  msgid "Manifest creation error: %s (%s)."
105
  msgstr "Błąd podczas tworzenia protokołu nadania: %s (%s)."
106
 
107
+ #: classes/bulk-actions.php:430
108
  msgid "No manifests created."
109
  msgstr "Nie zostały utworzone protokoły nadania."
110
 
111
+ #: classes/bulk-actions.php:444
112
  #, php-format
113
  msgid "Bulk send shipment - processed orders: %d"
114
  msgstr "Masowe nadawanie przesyłek - przetworzone zamówienia: %d"
115
 
116
+ #: classes/bulk-actions.php:453
117
  #, php-format
118
  msgid "Bulk labels - processed orders: %d. No labels for processed orders."
119
  msgstr ""
120
  "Masowe pobieranie etykiet - przetworzone zamówienia: %d. Brak etykiet dla "
121
  "przetworzonych zamówień."
122
 
123
+ #: classes/bulk-actions.php:469
124
  #, php-format
125
  msgid ""
126
  "Bulk labels - processed orders: %d. If download not start automatically "
129
  "Masowe pobieranie etykiet - przetworzone zamówienia: %d. Jeśli pobieranie "
130
  "nie rozpoczęło się automatycznie kliknij %stutaj%s ."
131
 
132
+ #: classes/bulk-actions.php:478
133
  #, php-format
134
  msgid "Bulk shipping manifest - processed orders: %d"
135
  msgstr "Zbiorcze tworzenie protokołów nadania - przetworzone zamówienia: %d"
275
  msgid "Shipment for order %s, %s"
276
  msgstr "Przesyłka do zamówienia %s, %s"
277
 
278
+ #: classes/order-add-shipping.php:45
279
+ #, php-format
280
+ msgid "Added new shipment via metabox. Shipment ID: %s"
281
+ msgstr "Dodano nową przesyłkę. Numer przesyłki: %s"
282
+
283
+ #: classes/order-add-shipping.php:82
284
  msgid "Select integration"
285
  msgstr "Wybierz integrację"
286
 
287
+ #: classes/order-add-shipping.php:91
288
  msgid "Add shipping"
289
  msgstr "Dodaj przesyłkę"
290
 
361
  msgid "%sAdd integration%s"
362
  msgstr "%sDodaj integrację%s"
363
 
364
+ #: classes/settings-shipping-method-form.php:32 classes/shipping_method.php:816
365
  msgid "Free"
366
  msgstr "Bezpłatnie"
367
 
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: wpdesk, swoboda
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.9.1
7
- Stable tag: 1.9.12
8
  Requires PHP: 5.3
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -71,7 +71,7 @@ The Location Based Shipping Add-On extends Flexible Shipping for WooCommerce wit
71
 
72
  = WooCommerce Compatibility =
73
 
74
- **WooCommerce 3.2 ready!** In Flexible Shipping 1.9.10 we introduced support for WooCommerce 3.2.
75
 
76
  **Shipping Zones ready!** Flexible Shipping is compatible with WooCommerce Shipping Zones introduced in version 2.6. Read more about [WooCommerce Shipping Zones](https://www.wpdesk.net/blog/woocommerce-shipping-zones-explained/).
77
 
@@ -165,6 +165,11 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
165
 
166
  == Changelog ==
167
 
 
 
 
 
 
168
  = 1.9.12 - 2017-12-22 =
169
  * Fixed generating empty zip file for labels with no shipment
170
  * Fixed some minor notices with WooCommerce 3.2.x
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.9.2
7
+ Stable tag: 2.0
8
  Requires PHP: 5.3
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
71
 
72
  = WooCommerce Compatibility =
73
 
74
+ **WooCommerce 3.3 ready!** In Flexible Shipping 2.0 we introduced support for WooCommerce 3.3.
75
 
76
  **Shipping Zones ready!** Flexible Shipping is compatible with WooCommerce Shipping Zones introduced in version 2.6. Read more about [WooCommerce Shipping Zones](https://www.wpdesk.net/blog/woocommerce-shipping-zones-explained/).
77
 
165
 
166
  == Changelog ==
167
 
168
+ = 2.0 - 2018-01-24 =
169
+ * Added support for WooCommerce 3.3
170
+ * Fixed installing the plugin by wp-cli
171
+ * Fixed error on cart page for WooCommerce below 3.2
172
+
173
  = 1.9.12 - 2017-12-22 =
174
  * Fixed generating empty zip file for labels with no shipment
175
  * Fixed some minor notices with WooCommerce 3.2.x