Flexible Shipping for WooCommerce - Version 1.5

Version Description

  • 2016-09-12 =
  • Added support for currency switching: WPML, Aelia Currency Switcher, Multi Currency Store
  • Added optional shipping method description
Download this release

Release Info

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

Code changes from version 1.4.1 to 1.5

Files changed (8) hide show
  1. classes/settings-shipping-method-form.php +8 -1
  2. classes/shipping_method.php +13 -6
  3. classes/views/html-shipping-method-settings.php +4 -1
  4. flexible-shipping.php +72 -4
  5. languages/flexible-shipping-pl_PL.mo +0 -0
  6. languages/flexible-shipping-pl_PL.po +98 -95
  7. readme.txt +9 -4
  8. templates/cart/flexible-shipping/after-shipping-rate.php +16 -0
classes/settings-shipping-method-form.php CHANGED
@@ -31,6 +31,14 @@ $settings = array(
31
  'default' => $shipping_method['method_title'],
32
  'custom_attributes' => array('required' => true)
33
  ),
 
 
 
 
 
 
 
 
34
  'method_free_shipping' => array(
35
  'title' => __( 'Free shipping', 'flexible-shipping' ),
36
  'type' => 'price',
@@ -83,7 +91,6 @@ if ( class_exists('WC_Shipping_Zones1') ) {
83
  foreach ( $shipping_zones as $shipping_zone ) {
84
  $shipping_zones_options[$shipping_zone['zone_id']] = $shipping_zone['zone_name'];
85
  }
86
- error_log(print_r($shipping_zones,true));
87
  $settings_with_zones = array();
88
  foreach ( $settings as $key => $setting ) {
89
  $settings_with_zones[$key] = $setting;
31
  'default' => $shipping_method['method_title'],
32
  'custom_attributes' => array('required' => true)
33
  ),
34
+ 'method_description' => array(
35
+ 'title' => __( 'Method Description', 'flexible-shipping' ),
36
+ 'type' => 'text',
37
+ 'description' => __( 'This controls method description which the user sees during checkout.', 'flexible-shipping' ),
38
+ 'default' => '',
39
+ 'desc_tip' => true,
40
+ 'default' => $shipping_method['method_description'],
41
+ ),
42
  'method_free_shipping' => array(
43
  'title' => __( 'Free shipping', 'flexible-shipping' ),
44
  'type' => 'price',
91
  foreach ( $shipping_zones as $shipping_zone ) {
92
  $shipping_zones_options[$shipping_zone['zone_id']] = $shipping_zone['zone_name'];
93
  }
 
94
  $settings_with_zones = array();
95
  foreach ( $settings as $key => $setting ) {
96
  $settings_with_zones[$key] = $setting;
classes/shipping_method.php CHANGED
@@ -210,6 +210,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
210
  }
211
  $shipping_method['id'] = $method_id;
212
  $shipping_method['method_title'] = $_POST['woocommerce_' . $this->id . '_method_title'];
 
213
  $shipping_method['method_free_shipping'] = $_POST['woocommerce_' . $this->id . '_method_free_shipping'];
214
  $shipping_method['method_calculation_method'] = $_POST['woocommerce_' . $this->id . '_method_calculation_method'];
215
  $shipping_method['method_visibility'] = 'no';
@@ -228,7 +229,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
228
  //
229
  $shipping_method = apply_filters( 'flexible_shipping_process_admin_options', $shipping_method );
230
  //
231
- $count = 0;
232
  $shipping_method['method_rules'] = array();
233
  foreach ( $_POST['method_rules'] as $rule ) {
234
  $count++;
@@ -478,13 +479,13 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
478
  $min = 0;
479
  }
480
  else {
481
- $min = floatval( $method_rule['min'] );
482
  }
483
  if ( trim( $method_rule['max'] ) == '' ) {
484
  $max = INF;
485
  }
486
  else {
487
- $max = floatval( $method_rule['max'] );
488
  }
489
 
490
  if ( $contents_cost >= $min && $contents_cost <= $max ) {
@@ -524,7 +525,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
524
 
525
  if ( $add_method === true ) {
526
  if ( isset( $shipping_method['method_free_shipping'] ) && $shipping_method['method_free_shipping'] != '' ) {
527
- if ( floatval( $shipping_method['method_free_shipping'] ) <= floatval( $cart_contents_cost ) ) {
528
  $cost = 0;
529
  }
530
  }
@@ -536,8 +537,14 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
536
  'label' => $shipping_method['method_title'],
537
  'cost' => $cost,
538
  'method' => $shipping_method,
539
- 'rule_costs' => $rule_costs,
540
  ) );
 
 
 
 
 
 
541
  if ( !$default_method_is_set && isset( $shipping_method['method_default'] ) && $shipping_method['method_default'] == 'yes' ) {
542
  $chosen_shipping_method = WC()->session->get( 'chosen_shipping_methods', array() );
543
  if ( empty( $chosen_shipping_method['0'] ) ) {
@@ -583,7 +590,7 @@ if ( ! class_exists( 'WPDesk_Flexible_Shipping' ) ) {
583
  $rates = $this->get_all_rates();
584
  return $rates[$rate_id];
585
  }
586
-
587
  }
588
 
589
  function wpdesk_add_flexible_shipping( $methods ) {
210
  }
211
  $shipping_method['id'] = $method_id;
212
  $shipping_method['method_title'] = $_POST['woocommerce_' . $this->id . '_method_title'];
213
+ $shipping_method['method_description'] = $_POST['woocommerce_' . $this->id . '_method_description'];
214
  $shipping_method['method_free_shipping'] = $_POST['woocommerce_' . $this->id . '_method_free_shipping'];
215
  $shipping_method['method_calculation_method'] = $_POST['woocommerce_' . $this->id . '_method_calculation_method'];
216
  $shipping_method['method_visibility'] = 'no';
229
  //
230
  $shipping_method = apply_filters( 'flexible_shipping_process_admin_options', $shipping_method );
231
  //
232
+ $count = 0;
233
  $shipping_method['method_rules'] = array();
234
  foreach ( $_POST['method_rules'] as $rule ) {
235
  $count++;
479
  $min = 0;
480
  }
481
  else {
482
+ $min = apply_filters( 'flexible_shipping_value_in_currency', floatval( $method_rule['min'] ) );
483
  }
484
  if ( trim( $method_rule['max'] ) == '' ) {
485
  $max = INF;
486
  }
487
  else {
488
+ $max = apply_filters( 'flexible_shipping_value_in_currency', floatval( $method_rule['max'] ) );
489
  }
490
 
491
  if ( $contents_cost >= $min && $contents_cost <= $max ) {
525
 
526
  if ( $add_method === true ) {
527
  if ( isset( $shipping_method['method_free_shipping'] ) && $shipping_method['method_free_shipping'] != '' ) {
528
+ if ( apply_filters( 'flexible_shipping_value_in_currency', floatval( $shipping_method['method_free_shipping'] ) ) <= floatval( $cart_contents_cost ) ) {
529
  $cost = 0;
530
  }
531
  }
537
  'label' => $shipping_method['method_title'],
538
  'cost' => $cost,
539
  'method' => $shipping_method,
540
+ 'rule_costs' => $rule_costs,
541
  ) );
542
+ if ( isset( $shipping_method['method_description'] ) ) {
543
+ WC()->session->set('flexible_shipping_description_' . $id, $shipping_method['method_description'] );
544
+ }
545
+ else {
546
+ WC()->session->set( 'flexible_shipping_description_' . $id, '' );
547
+ }
548
  if ( !$default_method_is_set && isset( $shipping_method['method_default'] ) && $shipping_method['method_default'] == 'yes' ) {
549
  $chosen_shipping_method = WC()->session->get( 'chosen_shipping_methods', array() );
550
  if ( empty( $chosen_shipping_method['0'] ) ) {
590
  $rates = $this->get_all_rates();
591
  return $rates[$rate_id];
592
  }
593
+
594
  }
595
 
596
  function wpdesk_add_flexible_shipping( $methods ) {
classes/views/html-shipping-method-settings.php CHANGED
@@ -36,8 +36,11 @@
36
  </td>
37
  <td class="title">
38
  <a href="<?php echo add_query_arg( 'method_id' , $shipping_method_id, add_query_arg( 'action', 'edit' ) ); ?>">
39
- <strong><?php echo esc_html( $shipping_method['method_title'] ); ?></strong>
40
  </a>
 
 
 
41
  </td>
42
  <td width="1%" class="status">
43
  <?php if ( isset($shipping_method['method_enabled']) && 'yes' === $shipping_method['method_enabled'] ) : ?>
36
  </td>
37
  <td class="title">
38
  <a href="<?php echo add_query_arg( 'method_id' , $shipping_method_id, add_query_arg( 'action', 'edit' ) ); ?>">
39
+ <strong><?php echo esc_html( $shipping_method['method_title'] ); ?></strong>
40
  </a>
41
+ <?php if ( isset( $shipping_method['method_description'] ) && $shipping_method['method_description'] != '' ) : ?>
42
+ (<?php echo $shipping_method['method_description']; ?>)
43
+ <?php endif; ?>
44
  </td>
45
  <td width="1%" class="status">
46
  <?php if ( isset($shipping_method['method_enabled']) && 'yes' === $shipping_method['method_enabled'] ) : ?>
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 shipping methods in WooCommerce and enable pricing based on cart weight or total.
6
- Version: 1.4.1
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.5.2
12
 
13
  Copyright 2016 WP Desk Ltd.
14
 
@@ -49,9 +49,24 @@ if ( in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', g
49
  public function init_flexible_shipping() {
50
  require_once('classes/shipping_method.php');
51
  add_action( 'admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 75 );
52
-
53
  add_action( 'admin_notices', array( $this, 'admin_notices' ) );
54
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  }
56
 
57
  public function admin_notices() {
@@ -128,13 +143,66 @@ if ( in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', g
128
  $support_link = get_locale() === 'pl_PL' ? 'https://www.wpdesk.pl/support/' : 'https://www.wpdesk.net/support';
129
 
130
  $plugin_links = array(
131
- '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=shipping&section=wpdesk_flexible_shipping') . '">' . __( 'Settings', 'flexible-shipping-pro' ) . '</a>',
132
  '<a href="' . $docs_link . '">' . __( 'Docs', 'flexible-shipping-pro' ) . '</a>',
133
  '<a href="' . $support_link . '">' . __( 'Support', 'flexible-shipping-pro' ) . '</a>',
134
  );
135
 
136
  return array_merge( $plugin_links, $links );
137
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
138
  }
139
 
140
  if ( !function_exists('wpdesk_redirect') ) {
3
  Plugin Name: Flexible Shipping
4
  Plugin URI: https://wordpress.org/plugins/flexible-shipping/
5
  Description: Create additional shipping methods in WooCommerce and enable pricing based on cart weight or total.
6
+ Version: 1.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.6.1
12
 
13
  Copyright 2016 WP Desk Ltd.
14
 
49
  public function init_flexible_shipping() {
50
  require_once('classes/shipping_method.php');
51
  add_action( 'admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 75 );
 
52
  add_action( 'admin_notices', array( $this, 'admin_notices' ) );
53
 
54
+ add_action( 'woocommerce_after_shipping_rate', array( $this, 'woocommerce_after_shipping_rate' ), 10, 2 );
55
+
56
+ global $woocommerce_wpml;
57
+
58
+ if ( isset( $woocommerce_wpml ) ) {
59
+ add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wpml' ), 1 );
60
+ }
61
+
62
+ if ( class_exists( 'WC_Aelia_CurrencySwitcher' ) ) {
63
+ add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_aelia' ), 1 );
64
+ }
65
+
66
+ if ( function_exists( 'wmcs_convert_price' ) ) {
67
+ add_filter( 'flexible_shipping_value_in_currency', array( $this, 'flexible_shipping_value_in_currency_wmcs' ), 1 );
68
+ }
69
+
70
  }
71
 
72
  public function admin_notices() {
143
  $support_link = get_locale() === 'pl_PL' ? 'https://www.wpdesk.pl/support/' : 'https://www.wpdesk.net/support';
144
 
145
  $plugin_links = array(
146
+ '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=shipping') . '">' . __( 'Settings', 'flexible-shipping-pro' ) . '</a>',
147
  '<a href="' . $docs_link . '">' . __( 'Docs', 'flexible-shipping-pro' ) . '</a>',
148
  '<a href="' . $support_link . '">' . __( 'Support', 'flexible-shipping-pro' ) . '</a>',
149
  );
150
 
151
  return array_merge( $plugin_links, $links );
152
  }
153
+
154
+
155
+ public function woocommerce_after_shipping_rate( $method, $index ) {
156
+ if ( $method->method_id == 'flexible_shipping' ) {
157
+ $description = WC()->session->get('flexible_shipping_description_' . $method->id, false );
158
+ if ( $description && $description != '' ) {
159
+ wc_get_template(
160
+ 'cart/flexible-shipping/after-shipping-rate.php',
161
+ array(
162
+ 'method_description' => $description,
163
+ )
164
+ , ''
165
+ , trailingslashit( plugin_dir_path( __FILE__ ) ) . 'templates/'
166
+ );
167
+ }
168
+ }
169
+ }
170
+
171
+ public function flexible_shipping_value_in_currency_aelia( $value ) {
172
+ $aelia = WC_Aelia_CurrencySwitcher::instance();
173
+ $aelia_settings = WC_Aelia_CurrencySwitcher::settings();
174
+ $from_currency = $aelia_settings->base_currency();
175
+ $to_currency = $aelia->get_selected_currency();
176
+ $value = $aelia->convert( $value, $from_currency, $to_currency );
177
+ return $value;
178
+ }
179
+
180
+ public function flexible_shipping_value_in_currency_wmcs( $value ) {
181
+ $value = wmcs_convert_price( $value );
182
+ return $value;
183
+ }
184
+
185
+ public function flexible_shipping_value_in_currency_wpml( $value ) {
186
+ return apply_filters( 'wcml_raw_price_amount', $value );
187
+ }
188
+
189
+ }
190
+
191
+ function flexible_shipping_method_selected( $order_id, $shipping_method_integration ) {
192
+ $order = new WC_Order( $order_id );
193
+ $shippings = $order->get_shipping_methods();
194
+ $all_shipping_methods = WC()->shipping()->get_shipping_methods();
195
+ $flexible_shipping = $all_shipping_methods['flexible_shipping'];
196
+ $flexible_shipping_rates = $all_shipping_methods['flexible_shipping']->get_all_rates();
197
+ foreach ( $shippings as $id => $shipping ) {
198
+ if ( isset( $flexible_shipping_rates[$shipping['method_id']] ) ) {
199
+ $shipping_method = $flexible_shipping_rates[$shipping['method_id']];
200
+ if ( $shipping_method['method_integration'] == $shipping_method_integration ) {
201
+ return $shipping_method;
202
+ }
203
+ }
204
+ }
205
+ return false;
206
  }
207
 
208
  if ( !function_exists('wpdesk_redirect') ) {
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: 2016-06-14 12:12+0200\n"
5
- "PO-Revision-Date: 2016-06-14 12:12+0200\n"
6
- "Last-Translator: Maciej Swoboda <maciej.swoboda@gmail.com>\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 1.8.7\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 "
@@ -18,34 +18,55 @@ msgstr ""
18
  "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
19
  "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
20
  "_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
21
- "X-Poedit-SearchPath-0: .\n"
22
  "X-Poedit-SearchPathExcluded-0: *.js\n"
 
23
 
24
- #: classes/inspire/plugin4.php:218
25
  msgid ""
26
- "An Unexpected HTTP Error occurred during the API request. <a href=\"?\" "
27
- "onclick=\"document.location.reload(); return false;\">Try again</a>"
28
  msgstr ""
29
- "Wystąpił nieoczekiwany błąd HTTP podczas zapytania API.</p> <p><a href=„?” "
30
- "onclick=„document.location.reload(); return false;”>Spróbuj ponownie</a>"
31
 
32
- #: classes/inspire/plugin4.php:223
33
- msgid "An unknown error occurred"
34
- msgstr "Wystąpił nieznany błąd"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
 
36
- #: classes/inspire/plugin4.php:387 flexible-shipping.php:131
37
  msgid "Settings"
38
  msgstr "Ustawienia"
39
 
40
- #: classes/inspire/plugin4.php:388 flexible-shipping.php:132
41
  msgid "Docs"
42
  msgstr "Docs"
43
 
44
- #: classes/inspire/plugin4.php:389 flexible-shipping.php:133
45
  msgid "Support"
46
  msgstr "Wsparcie"
47
 
48
- #. Plugin Name of the plugin/theme
 
 
 
 
 
 
49
  #: classes/settings-flexible-shipping.php:14
50
  #: classes/settings-flexible-shipping.php:28
51
  #: classes/settings-shipping-method-form.php:29 classes/shipping_method.php:24
@@ -119,10 +140,18 @@ msgid "This controls the title which the user sees during checkout."
119
  msgstr "Tytuł, który widzi użytkownik podczas składania zamówienia."
120
 
121
  #: classes/settings-shipping-method-form.php:35
 
 
 
 
 
 
 
 
122
  msgid "Free shipping"
123
  msgstr "Darmowa wysyłka"
124
 
125
- #: classes/settings-shipping-method-form.php:38
126
  msgid ""
127
  "Enter a minimum order amount for free shipping. This will override the costs "
128
  "configured below."
@@ -130,37 +159,37 @@ msgstr ""
130
  "Wpisz minimalną kwotę zamówienia dla bezpłatnej wysyłki. Spowoduje to "
131
  "zastąpienie reguł skonfigurowanych poniżej."
132
 
133
- #: classes/settings-shipping-method-form.php:42
134
  msgid "Calculation method"
135
  msgstr "Metoda obliczania"
136
 
137
- #: classes/settings-shipping-method-form.php:44
138
  msgid ""
139
  "Select how rules will be calculated. If you choose \"sum\" the rules order "
140
  "is important."
141
  msgstr ""
142
  "Wybierz jak będą obliczane reguły. Dla sumy, kolejność reguł ma znaczenie."
143
 
144
- #: classes/settings-shipping-method-form.php:47
145
  msgid "Sum"
146
  msgstr "Suma"
147
 
148
- #: classes/settings-shipping-method-form.php:50
149
  #: classes/views/html-shipping-method-settings.php:21
150
  msgid "Visibility"
151
  msgstr "Wyświetlanie"
152
 
153
- #: classes/settings-shipping-method-form.php:53
154
- #: classes/views/html-shipping-method-settings.php:51
155
  msgid "Show only for logged in users"
156
  msgstr "Pokaż tylko dla zalogowanych użytkowników"
157
 
158
- #: classes/settings-shipping-method-form.php:56
159
  #: classes/views/html-shipping-method-settings.php:22
160
  msgid "Default"
161
  msgstr "Domyślnie"
162
 
163
- #: classes/settings-shipping-method-form.php:59
164
  msgid ""
165
  "Check the box to set this option as the default selected choice on the cart "
166
  "page."
@@ -168,29 +197,29 @@ msgstr ""
168
  "Zaznacz, aby ustawić tę metodę wysyłki jako domyślną przy składaniu "
169
  "zamówienia."
170
 
171
- #: classes/settings-shipping-method-form.php:62
172
  #: classes/views/html-shipping-method-settings.php:23
173
  msgid "Integration"
174
  msgstr "Integracja"
175
 
176
- #: classes/settings-shipping-method-form.php:64
177
  msgid "Select integration. "
178
  msgstr "Wybierz integrację."
179
 
180
- #: classes/settings-shipping-method-form.php:67
181
  #: classes/views/html-shipping-method-rules.php:7
182
  msgid "None"
183
  msgstr "Brak"
184
 
185
- #: classes/settings-shipping-method-form.php:74
186
  msgid "Rules"
187
  msgstr "Reguły"
188
 
189
- #: classes/settings-shipping-method-form.php:92
190
  msgid "Shipping Zone"
191
  msgstr "Strefa wysyłki"
192
 
193
- #: classes/settings-shipping-method-form.php:104
194
  #, php-format
195
  msgid "See how to %sconfigure shipping methods%s."
196
  msgstr "Zobacz jak %sskonfigurować metody wysyłki %s."
@@ -204,33 +233,45 @@ msgstr "Tytuł"
204
  msgid "Add New"
205
  msgstr "Dodaj nową"
206
 
207
- #: classes/shipping_method.php:306
208
  msgid "New Shipping Method"
209
  msgstr "Nowa metoda wysyłki"
210
 
211
- #: classes/shipping_method.php:309
212
  msgid "Edit Shipping Method"
213
  msgstr "Edytuj metodę wysyłki"
214
 
215
- #: classes/shipping_method.php:319 classes/shipping_method.php:356
216
  #, php-format
217
  msgid "Shipping method %s added."
218
  msgstr "Metoda wysyłki dodana: %s."
219
 
220
- #: classes/shipping_method.php:340
221
  #, php-format
222
  msgid "Shipping method %s deleted."
223
  msgstr "Metoda wysyłki usunięta: %s."
224
 
225
- #: classes/shipping_method.php:343
226
  msgid "Shipping method not found."
227
  msgstr "Metoda wysyłki nie znaleziona."
228
 
229
- #: classes/shipping_method.php:368
230
  #, php-format
231
  msgid "Shipping method %s updated."
232
  msgstr "Metoda wysyłki zaktualizowana: %s."
233
 
 
 
 
 
 
 
 
 
 
 
 
 
234
  #: classes/views/html-shipping-method-rules.php:8
235
  msgid "Price"
236
  msgstr "Cena"
@@ -299,7 +340,7 @@ msgid "Are you sure?"
299
  msgstr "Na pewno?"
300
 
301
  #: classes/views/html-shipping-method-rules.php:231
302
- #: classes/views/html-shipping-method-settings.php:93
303
  msgid "Shipping Zones"
304
  msgstr "Strefy wysyłki"
305
 
@@ -315,21 +356,21 @@ msgstr "Włączona"
315
  msgid "Action"
316
  msgstr "Akcje"
317
 
318
- #: classes/views/html-shipping-method-settings.php:44
319
- #: classes/views/html-shipping-method-settings.php:51
320
- #: classes/views/html-shipping-method-settings.php:58
321
  msgid "yes"
322
  msgstr "tak"
323
 
324
- #: classes/views/html-shipping-method-settings.php:53
325
  msgid "Show for all users"
326
  msgstr "Pokaż dla wszystkich użytkowników"
327
 
328
- #: classes/views/html-shipping-method-settings.php:68
329
  msgid "Delete"
330
  msgstr "Usuń"
331
 
332
- #: classes/views/html-shipping-method-settings.php:77
333
  msgid ""
334
  "Drag and drop the above shipping methods to control their display order. "
335
  "Confirm by clicking Save changes button below."
@@ -337,59 +378,21 @@ msgstr ""
337
  "Przeciągnij i upuść metody wysyłki aby ustawić ich kolejność wyświetlania. "
338
  "Potwierdź przez kliknięcie przycisku Zapisz zmiany poniżej."
339
 
340
- #: flexible-shipping.php:64
341
- msgid ""
342
- "Flexible Shipping requires at least version 2.7 of Active Payments plugin."
343
- msgstr ""
344
- "Flexible Shipping wymaga wtyczki Aktywne płatności w wersji co najmniej 2.7."
345
 
346
- #: flexible-shipping.php:75
347
- msgid "Flexible Shipping requires at least version 1.2 of eNadawca plugin."
348
- msgstr "Flexible Shipping wymaga wtyczki eNadawca w wersji co najmniej 1.2."
349
-
350
- #: flexible-shipping.php:86
351
- msgid ""
352
- "Flexible Shipping requires at least version 1.1 of Paczka w Ruchu plugin."
353
- msgstr ""
354
- "Flexible Shipping wymaga wtyczki Paczka w Ruchu w wersji co najmniej 1.1."
355
-
356
- #: flexible-shipping.php:94
357
- #, php-format
358
- msgid ""
359
- "You are using WooCommerce Flexible Shipping below 1.4. Please deactivate it "
360
- "on %splugins page%s. Read about big changes in Flexible Shipping on %sour "
361
- "blog →%s"
362
- msgstr ""
363
- " Masz włączony WooCommerce Flexible Shipping w wersji starszej niż 1.4. "
364
- "Wyłącz go na %sstronie wtyczek%s. Przeczytaj o dużej zmianie we Flexible "
365
- "Shipping na %snaszym blogu →%s"
366
-
367
- #: flexible-shipping.php:144
368
- #, php-format
369
- msgid "Redirecting. If page not redirects click %s here %s."
370
- msgstr ""
371
- "Przekierowywanie. Jeśli strona nie przekierowuje cię automatycznie, kliknij "
372
- "%s tu %s."
373
-
374
- #. Plugin URI of the plugin/theme
375
- msgid "https://wordpress.org/plugins/flexible-shipping/"
376
- msgstr "https://pl.wordpress.org/plugins/flexible-shipping/"
377
-
378
- #. Description of the plugin/theme
379
- msgid ""
380
- "Create additional shipping methods in WooCommerce and enable pricing based "
381
- "on cart weight or total."
382
- msgstr ""
383
- "Stwórz dodatkowe metody wysyłki w WooCommerce i włącz obliczanie kosztów w "
384
- "oparciu o wagę lub wartość zamówienia."
385
 
386
- #. Author of the plugin/theme
387
- msgid "WP Desk"
388
- msgstr "WP Desk"
389
 
390
- #. Author URI of the plugin/theme
391
- msgid "https://www.wpdesk.net/"
392
- msgstr "https://www.wpdesk.pl/"
393
 
394
  #~ msgid "Insert row"
395
  #~ msgstr "Dodaj wiersz"
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: Flexible Shipping\n"
4
+ "POT-Creation-Date: 2016-08-29 17:02+0100\n"
5
+ "PO-Revision-Date: 2016-08-29 17:03+0100\n"
6
+ "Last-Translator: wp-kat <admin@wp-kat.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 1.5.7\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 "
18
  "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
19
  "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
20
  "_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
 
21
  "X-Poedit-SearchPathExcluded-0: *.js\n"
22
+ "X-Poedit-SearchPath-0: .\n"
23
 
24
+ #: flexible-shipping.php:65
25
  msgid ""
26
+ "Flexible Shipping requires at least version 2.7 of Active Payments plugin."
 
27
  msgstr ""
28
+ "Flexible Shipping wymaga wtyczki Aktywne płatności w wersji co najmniej 2.7."
 
29
 
30
+ #: flexible-shipping.php:76
31
+ msgid "Flexible Shipping requires at least version 1.2 of eNadawca plugin."
32
+ msgstr "Flexible Shipping wymaga wtyczki eNadawca w wersji co najmniej 1.2."
33
+
34
+ #: flexible-shipping.php:87
35
+ msgid ""
36
+ "Flexible Shipping requires at least version 1.1 of Paczka w Ruchu plugin."
37
+ msgstr ""
38
+ "Flexible Shipping wymaga wtyczki Paczka w Ruchu w wersji co najmniej 1.1."
39
+
40
+ #: flexible-shipping.php:95
41
+ #, php-format
42
+ msgid ""
43
+ "You are using WooCommerce Flexible Shipping below 1.4. Please deactivate it "
44
+ "on %splugins page%s. Read about big changes in Flexible Shipping on %sour "
45
+ "blog →%s"
46
+ msgstr ""
47
+ " Masz włączony WooCommerce Flexible Shipping w wersji starszej niż 1.4. "
48
+ "Wyłącz go na %sstronie wtyczek%s. Przeczytaj o dużej zmianie we Flexible "
49
+ "Shipping na %snaszym blogu →%s"
50
 
51
+ #: flexible-shipping.php:132 classes/inspire/plugin4.php:387
52
  msgid "Settings"
53
  msgstr "Ustawienia"
54
 
55
+ #: flexible-shipping.php:133 classes/inspire/plugin4.php:388
56
  msgid "Docs"
57
  msgstr "Docs"
58
 
59
+ #: flexible-shipping.php:134 classes/inspire/plugin4.php:389
60
  msgid "Support"
61
  msgstr "Wsparcie"
62
 
63
+ #: flexible-shipping.php:181
64
+ #, php-format
65
+ msgid "Redirecting. If page not redirects click %s here %s."
66
+ msgstr ""
67
+ "Przekierowywanie. Jeśli strona nie przekierowuje cię automatycznie, kliknij "
68
+ "%s tu %s."
69
+
70
  #: classes/settings-flexible-shipping.php:14
71
  #: classes/settings-flexible-shipping.php:28
72
  #: classes/settings-shipping-method-form.php:29 classes/shipping_method.php:24
140
  msgstr "Tytuł, który widzi użytkownik podczas składania zamówienia."
141
 
142
  #: classes/settings-shipping-method-form.php:35
143
+ msgid "Method Description"
144
+ msgstr "Opis"
145
+
146
+ #: classes/settings-shipping-method-form.php:37
147
+ msgid "This controls method description which the user sees during checkout."
148
+ msgstr "Opis, który widzi użytkownik podczas składania zamówienia."
149
+
150
+ #: classes/settings-shipping-method-form.php:43
151
  msgid "Free shipping"
152
  msgstr "Darmowa wysyłka"
153
 
154
+ #: classes/settings-shipping-method-form.php:46
155
  msgid ""
156
  "Enter a minimum order amount for free shipping. This will override the costs "
157
  "configured below."
159
  "Wpisz minimalną kwotę zamówienia dla bezpłatnej wysyłki. Spowoduje to "
160
  "zastąpienie reguł skonfigurowanych poniżej."
161
 
162
+ #: classes/settings-shipping-method-form.php:50
163
  msgid "Calculation method"
164
  msgstr "Metoda obliczania"
165
 
166
+ #: classes/settings-shipping-method-form.php:52
167
  msgid ""
168
  "Select how rules will be calculated. If you choose \"sum\" the rules order "
169
  "is important."
170
  msgstr ""
171
  "Wybierz jak będą obliczane reguły. Dla sumy, kolejność reguł ma znaczenie."
172
 
173
+ #: classes/settings-shipping-method-form.php:55
174
  msgid "Sum"
175
  msgstr "Suma"
176
 
177
+ #: classes/settings-shipping-method-form.php:58
178
  #: classes/views/html-shipping-method-settings.php:21
179
  msgid "Visibility"
180
  msgstr "Wyświetlanie"
181
 
182
+ #: classes/settings-shipping-method-form.php:61
183
+ #: classes/views/html-shipping-method-settings.php:54
184
  msgid "Show only for logged in users"
185
  msgstr "Pokaż tylko dla zalogowanych użytkowników"
186
 
187
+ #: classes/settings-shipping-method-form.php:64
188
  #: classes/views/html-shipping-method-settings.php:22
189
  msgid "Default"
190
  msgstr "Domyślnie"
191
 
192
+ #: classes/settings-shipping-method-form.php:67
193
  msgid ""
194
  "Check the box to set this option as the default selected choice on the cart "
195
  "page."
197
  "Zaznacz, aby ustawić tę metodę wysyłki jako domyślną przy składaniu "
198
  "zamówienia."
199
 
200
+ #: classes/settings-shipping-method-form.php:70
201
  #: classes/views/html-shipping-method-settings.php:23
202
  msgid "Integration"
203
  msgstr "Integracja"
204
 
205
+ #: classes/settings-shipping-method-form.php:72
206
  msgid "Select integration. "
207
  msgstr "Wybierz integrację."
208
 
209
+ #: classes/settings-shipping-method-form.php:75
210
  #: classes/views/html-shipping-method-rules.php:7
211
  msgid "None"
212
  msgstr "Brak"
213
 
214
+ #: classes/settings-shipping-method-form.php:82
215
  msgid "Rules"
216
  msgstr "Reguły"
217
 
218
+ #: classes/settings-shipping-method-form.php:99
219
  msgid "Shipping Zone"
220
  msgstr "Strefa wysyłki"
221
 
222
+ #: classes/settings-shipping-method-form.php:111
223
  #, php-format
224
  msgid "See how to %sconfigure shipping methods%s."
225
  msgstr "Zobacz jak %sskonfigurować metody wysyłki %s."
233
  msgid "Add New"
234
  msgstr "Dodaj nową"
235
 
236
+ #: classes/shipping_method.php:307
237
  msgid "New Shipping Method"
238
  msgstr "Nowa metoda wysyłki"
239
 
240
+ #: classes/shipping_method.php:310
241
  msgid "Edit Shipping Method"
242
  msgstr "Edytuj metodę wysyłki"
243
 
244
+ #: classes/shipping_method.php:320 classes/shipping_method.php:357
245
  #, php-format
246
  msgid "Shipping method %s added."
247
  msgstr "Metoda wysyłki dodana: %s."
248
 
249
+ #: classes/shipping_method.php:341
250
  #, php-format
251
  msgid "Shipping method %s deleted."
252
  msgstr "Metoda wysyłki usunięta: %s."
253
 
254
+ #: classes/shipping_method.php:344
255
  msgid "Shipping method not found."
256
  msgstr "Metoda wysyłki nie znaleziona."
257
 
258
+ #: classes/shipping_method.php:369
259
  #, php-format
260
  msgid "Shipping method %s updated."
261
  msgstr "Metoda wysyłki zaktualizowana: %s."
262
 
263
+ #: classes/inspire/plugin4.php:218
264
+ msgid ""
265
+ "An Unexpected HTTP Error occurred during the API request. <a href=\"?\" "
266
+ "onclick=\"document.location.reload(); return false;\">Try again</a>"
267
+ msgstr ""
268
+ "Wystąpił nieoczekiwany błąd HTTP podczas zapytania API.</p> <p><a href=„?” "
269
+ "onclick=„document.location.reload(); return false;”>Spróbuj ponownie</a>"
270
+
271
+ #: classes/inspire/plugin4.php:223
272
+ msgid "An unknown error occurred"
273
+ msgstr "Wystąpił nieznany błąd"
274
+
275
  #: classes/views/html-shipping-method-rules.php:8
276
  msgid "Price"
277
  msgstr "Cena"
340
  msgstr "Na pewno?"
341
 
342
  #: classes/views/html-shipping-method-rules.php:231
343
+ #: classes/views/html-shipping-method-settings.php:96
344
  msgid "Shipping Zones"
345
  msgstr "Strefy wysyłki"
346
 
356
  msgid "Action"
357
  msgstr "Akcje"
358
 
359
+ #: classes/views/html-shipping-method-settings.php:47
360
+ #: classes/views/html-shipping-method-settings.php:54
361
+ #: classes/views/html-shipping-method-settings.php:61
362
  msgid "yes"
363
  msgstr "tak"
364
 
365
+ #: classes/views/html-shipping-method-settings.php:56
366
  msgid "Show for all users"
367
  msgstr "Pokaż dla wszystkich użytkowników"
368
 
369
+ #: classes/views/html-shipping-method-settings.php:71
370
  msgid "Delete"
371
  msgstr "Usuń"
372
 
373
+ #: classes/views/html-shipping-method-settings.php:80
374
  msgid ""
375
  "Drag and drop the above shipping methods to control their display order. "
376
  "Confirm by clicking Save changes button below."
378
  "Przeciągnij i upuść metody wysyłki aby ustawić ich kolejność wyświetlania. "
379
  "Potwierdź przez kliknięcie przycisku Zapisz zmiany poniżej."
380
 
381
+ #~ msgid "https://wordpress.org/plugins/flexible-shipping/"
382
+ #~ msgstr "https://pl.wordpress.org/plugins/flexible-shipping/"
 
 
 
383
 
384
+ #~ msgid ""
385
+ #~ "Create additional shipping methods in WooCommerce and enable pricing "
386
+ #~ "based on cart weight or total."
387
+ #~ msgstr ""
388
+ #~ "Stwórz dodatkowe metody wysyłki w WooCommerce i włącz obliczanie kosztów "
389
+ #~ "w oparciu o wagę lub wartość zamówienia."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
390
 
391
+ #~ msgid "WP Desk"
392
+ #~ msgstr "WP Desk"
 
393
 
394
+ #~ msgid "https://www.wpdesk.net/"
395
+ #~ msgstr "https://www.wpdesk.pl/"
 
396
 
397
  #~ msgid "Insert row"
398
  #~ msgstr "Dodaj wiersz"
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
  === Flexible Shipping for WooCommerce ===
2
  Contributors: wpdesk, swoboda, jablonowski
3
- Donate link: https://www.wpdesk.net/
4
- Tags: table rate, table rate shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart total
5
  Requires at least: 4.0
6
- Tested up to: 4.5.2
7
- Stable tag: 1.4.1
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -34,6 +34,7 @@ These are just a few examples. The possibilities are probably endless ;) We desc
34
  = Features =
35
 
36
  * Unlimited shipping methods and cost rules
 
37
  * Shipping cost based on cart total and/or weight
38
  * Minimum and maximum values for cart total and/or weight
39
  * Summing cost rules if they are matched - option to add costs based on cart total and weight at the same time
@@ -116,6 +117,10 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
116
 
117
  == Changelog ==
118
 
 
 
 
 
119
  = 1.4.1 - 2016-06-17 =
120
  * Fixed default shipping method in the checkout
121
 
1
  === Flexible Shipping for WooCommerce ===
2
  Contributors: wpdesk, swoboda, jablonowski
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 total, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes
5
  Requires at least: 4.0
6
+ Tested up to: 4.6.1
7
+ Stable tag: 1.5
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
34
  = Features =
35
 
36
  * Unlimited shipping methods and cost rules
37
+ * Add titles and **descriptions** to your shipping methods
38
  * Shipping cost based on cart total and/or weight
39
  * Minimum and maximum values for cart total and/or weight
40
  * Summing cost rules if they are matched - option to add costs based on cart total and weight at the same time
117
 
118
  == Changelog ==
119
 
120
+ = 1.5 - 2016-09-12 =
121
+ * Added support for currency switching: WPML, Aelia Currency Switcher, Multi Currency Store
122
+ * Added optional shipping method description
123
+
124
  = 1.4.1 - 2016-06-17 =
125
  * Fixed default shipping method in the checkout
126
 
templates/cart/flexible-shipping/after-shipping-rate.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Checkout before customer details
4
+ *
5
+ * This template can be overridden by copying it to yourtheme/woocommerce/cart/flexible-shipping/after_shipping_rate.php
6
+ *
7
+ */
8
+
9
+ if ( ! defined( 'ABSPATH' ) ) {
10
+ exit; // Exit if accessed directly
11
+ }
12
+ ?>
13
+
14
+ <p class="shipping-method-description">
15
+ <?php echo $method_description; ?>
16
+ </p>