Changeset 3122012
- Timestamp:
- 07/19/2024 11:48:24 AM (21 months ago)
- Location:
- bpost-shipping/trunk
- Files:
-
- 11 edited
-
bpost-shipping.php (modified) (2 diffs)
-
classes/factory/class-wc-bpost-shipping-factory-form.php (modified) (1 diff)
-
classes/options/class-wc-bpost-shipping-options-base.php (modified) (4 diffs)
-
languages/bpost_shipping-en_GB.mo (modified) (previous)
-
languages/bpost_shipping-en_US.mo (modified) (previous)
-
languages/bpost_shipping-fr_BE.mo (modified) (previous)
-
languages/bpost_shipping-fr_FR.mo (modified) (previous)
-
languages/bpost_shipping-nl_BE.mo (modified) (previous)
-
languages/bpost_shipping-nl_NL.mo (modified) (previous)
-
languages/bpost_shipping.pot (modified) (7 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
bpost-shipping/trunk/bpost-shipping.php
r3119293 r3122012 6 6 * Author: bpost 7 7 * Author URI: https://www.bpost.be/ 8 * Version: 3.1. 78 * Version: 3.1.8 9 9 * WC requires at least: 3.0 10 10 * WC tested up to: 8.9 … … 15 15 define( 'BPOST_PLUGIN_DIR', __DIR__ ); 16 16 define( 'BPOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); 17 define( 'BPOST_PLUGIN_VERSION', '3.1. 7' );17 define( 'BPOST_PLUGIN_VERSION', '3.1.8' ); 18 18 19 19 /** -
bpost-shipping/trunk/classes/factory/class-wc-bpost-shipping-factory-form.php
r2890340 r3122012 72 72 'desc_tip' => true, 73 73 'default' => '', 74 ),75 'api_url' => array(76 'title' => bpost__( 'bpost API URL' ),77 'type' => 'text',78 'description' => bpost__( 'Enter the front-end URL of the API' ),79 'desc_tip' => true,80 // TODO Bpost::API_URL is repeated at three linked position. Is it really needed ?81 'default' => Bpost::API_URL,82 74 ), 83 75 ); -
bpost-shipping/trunk/classes/options/class-wc-bpost-shipping-options-base.php
r2890340 r3122012 71 71 private function migrate_option( $old_key, $new_key ) { 72 72 if ( $this->has_option( $old_key ) ) { 73 $this->options[ $new_key ] = $this->options[ $old_key ]; 73 if ( ! empty( $new_key ) ) { 74 $this->options[ $new_key ] = $this->options[ $old_key ]; 75 } 74 76 unset( $this->options[ $old_key ] ); 75 77 … … 147 149 148 150 /** 149 * TODO Bpost::API_URL is repeated at three linked position. Is it really needed?150 151 * @return string 151 152 */ 152 153 public function get_api_url() { 153 if ( $api_url = $this->get_option( 'api_url' ) ) { 154 // remove spaces to avoid stupid curl errors 155 return str_replace( ' ', '', $api_url ); 156 } 157 158 return \Bpost\BpostApiClient\Bpost::API_URL; 154 // Remove the option "api_url" 155 $this->migrate_option( 'api_url', '' ); // To delete after 2025-06-05 156 157 return 'https://shm-rest.bpost.cloud/services/shm'; 159 158 } 160 159 … … 173 172 WC_BPost_Shipping_Delivery_Methods $delivery_methods 174 173 ) { 175 176 174 if ( $this->is_free_shipping( 177 175 $shipping_address->get_shipping_country(), … … 198 196 */ 199 197 public function is_free_shipping( $country_iso_2, $amount, array $free_shipping_coupons ) { 200 return $this->is_free_country_for_amount( $country_iso_2, $amount ) || $this->has_free_shipping_coupon( $free_shipping_coupons ); 198 return $this->is_free_country_for_amount( $country_iso_2, $amount ) 199 || $this->has_free_shipping_coupon( $free_shipping_coupons ); 201 200 } 202 201 -
bpost-shipping/trunk/languages/bpost_shipping.pot
r3119293 r3122012 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: bpost shipping 3.1. 7\n"5 "Project-Id-Version: bpost shipping 3.1.8\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/package\n" 7 "POT-Creation-Date: 2024-07-1 6 14:14:10+00:00\n"7 "POT-Creation-Date: 2024-07-19 11:47:38+00:00\n" 8 8 "MIME-Version: 1.0\n" 9 9 "Content-Type: text/plain; charset=UTF-8\n" … … 197 197 msgstr "" 198 198 199 #. #-#-#-#-# bpost_shipping.pot (bpost shipping 3.1. 7) #-#-#-#-#199 #. #-#-#-#-# bpost_shipping.pot (bpost shipping 3.1.8) #-#-#-#-# 200 200 #. Author of the plugin/theme 201 201 #: classes/class-wc-bpost-shipping-method.php:264 … … 259 259 msgstr "" 260 260 261 #: classes/factory/class-wc-bpost-shipping-factory-form.php:76 262 msgid "bpost API URL" 263 msgstr "" 264 265 #: classes/factory/class-wc-bpost-shipping-factory-form.php:78 266 msgid "Enter the front-end URL of the API" 267 msgstr "" 268 269 #: classes/factory/class-wc-bpost-shipping-factory-form.php:93 261 #: classes/factory/class-wc-bpost-shipping-factory-form.php:85 270 262 msgid "Free shipping" 271 263 msgstr "" 272 264 273 #: classes/factory/class-wc-bpost-shipping-factory-form.php: 96265 #: classes/factory/class-wc-bpost-shipping-factory-form.php:88 274 266 msgid "" 275 267 "This plugin supports the free shipping options. Setup them %s here %s\n" … … 282 274 msgstr "" 283 275 284 #: classes/factory/class-wc-bpost-shipping-factory-form.php: 101276 #: classes/factory/class-wc-bpost-shipping-factory-form.php:93 285 277 msgid "Go to the coupons management page" 286 278 msgstr "" 287 279 288 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 10280 #: classes/factory/class-wc-bpost-shipping-factory-form.php:102 289 281 msgid "Free shipping settings" 290 282 msgstr "" 291 283 292 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 24284 #: classes/factory/class-wc-bpost-shipping-factory-form.php:116 293 285 msgid "bpost labels settings" 294 286 msgstr "" 295 287 296 #: classes/factory/class-wc-bpost-shipping-factory-form.php:12 9288 #: classes/factory/class-wc-bpost-shipping-factory-form.php:121 297 289 msgid "bpost labels size" 298 290 msgstr "" 299 291 300 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 33292 #: classes/factory/class-wc-bpost-shipping-factory-form.php:125 301 293 msgid "A4" 302 294 msgstr "" 303 295 304 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 34296 #: classes/factory/class-wc-bpost-shipping-factory-form.php:126 305 297 msgid "A6" 306 298 msgstr "" 307 299 308 #: classes/factory/class-wc-bpost-shipping-factory-form.php:13 9300 #: classes/factory/class-wc-bpost-shipping-factory-form.php:131 309 301 msgid "Enable return labels" 310 302 msgstr "" 311 303 304 #: classes/factory/class-wc-bpost-shipping-factory-form.php:138 305 msgid "Cache duration" 306 msgstr "" 307 308 #: classes/factory/class-wc-bpost-shipping-factory-form.php:141 309 msgid "No cache (could be slower)" 310 msgstr "" 311 312 #: classes/factory/class-wc-bpost-shipping-factory-form.php:142 313 msgid "1 week" 314 msgstr "" 315 316 #: classes/factory/class-wc-bpost-shipping-factory-form.php:143 317 msgid "2 weeks" 318 msgstr "" 319 320 #: classes/factory/class-wc-bpost-shipping-factory-form.php:144 321 msgid "3 weeks" 322 msgstr "" 323 324 #: classes/factory/class-wc-bpost-shipping-factory-form.php:145 325 msgid "1 month" 326 msgstr "" 327 312 328 #: classes/factory/class-wc-bpost-shipping-factory-form.php:146 313 msgid "Cache duration" 329 msgid "2 month" 330 msgstr "" 331 332 #: classes/factory/class-wc-bpost-shipping-factory-form.php:147 333 msgid "6 months" 334 msgstr "" 335 336 #: classes/factory/class-wc-bpost-shipping-factory-form.php:148 337 msgid "1 year" 314 338 msgstr "" 315 339 316 340 #: classes/factory/class-wc-bpost-shipping-factory-form.php:149 317 msgid "No cache (could be slower)"318 msgstr ""319 320 #: classes/factory/class-wc-bpost-shipping-factory-form.php:150321 msgid "1 week"322 msgstr ""323 324 #: classes/factory/class-wc-bpost-shipping-factory-form.php:151325 msgid "2 weeks"326 msgstr ""327 328 #: classes/factory/class-wc-bpost-shipping-factory-form.php:152329 msgid "3 weeks"330 msgstr ""331 332 #: classes/factory/class-wc-bpost-shipping-factory-form.php:153333 msgid "1 month"334 msgstr ""335 336 #: classes/factory/class-wc-bpost-shipping-factory-form.php:154337 msgid "2 month"338 msgstr ""339 340 #: classes/factory/class-wc-bpost-shipping-factory-form.php:155341 msgid "6 months"342 msgstr ""343 344 #: classes/factory/class-wc-bpost-shipping-factory-form.php:156345 msgid "1 year"346 msgstr ""347 348 #: classes/factory/class-wc-bpost-shipping-factory-form.php:157349 341 msgid "Infinity (never clear cache)" 350 342 msgstr "" 351 343 352 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 72344 #: classes/factory/class-wc-bpost-shipping-factory-form.php:164 353 345 msgid "bpost labels local storage location (advanced setting)" 354 346 msgstr "" 355 347 356 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 74348 #: classes/factory/class-wc-bpost-shipping-factory-form.php:166 357 349 msgid "" 358 350 "\n" … … 375 367 msgstr "" 376 368 377 #: classes/factory/class-wc-bpost-shipping-factory-form.php:18 8369 #: classes/factory/class-wc-bpost-shipping-factory-form.php:180 378 370 msgid "Store bpost labels as simple files" 379 371 msgstr "" 380 372 381 #: classes/factory/class-wc-bpost-shipping-factory-form.php:1 94373 #: classes/factory/class-wc-bpost-shipping-factory-form.php:186 382 374 msgid "Labels stored as simple files: root folder path" 383 375 msgstr "" 384 376 385 #: classes/factory/class-wc-bpost-shipping-factory-form.php: 207377 #: classes/factory/class-wc-bpost-shipping-factory-form.php:199 386 378 msgid "Labels website API" 387 379 msgstr "" 388 380 389 #: classes/factory/class-wc-bpost-shipping-factory-form.php:20 9381 #: classes/factory/class-wc-bpost-shipping-factory-form.php:201 390 382 msgid "" 391 383 "\n" … … 400 392 msgstr "" 401 393 402 #: classes/factory/class-wc-bpost-shipping-factory-form.php:21 8394 #: classes/factory/class-wc-bpost-shipping-factory-form.php:210 403 395 msgid "Website API key" 404 396 msgstr "" 405 397 406 #: classes/factory/class-wc-bpost-shipping-factory-form.php:2 30398 #: classes/factory/class-wc-bpost-shipping-factory-form.php:222 407 399 msgid "Google" 408 400 msgstr "" 409 401 410 #: classes/factory/class-wc-bpost-shipping-factory-form.php:2 35402 #: classes/factory/class-wc-bpost-shipping-factory-form.php:227 411 403 msgid "API key for maps" 412 404 msgstr "" 413 405 414 #: classes/factory/class-wc-bpost-shipping-factory-form.php:24 8406 #: classes/factory/class-wc-bpost-shipping-factory-form.php:240 415 407 msgid "bpost transactions logs" 416 408 msgstr "" 417 409 418 #: classes/factory/class-wc-bpost-shipping-factory-form.php:2 51410 #: classes/factory/class-wc-bpost-shipping-factory-form.php:243 419 411 msgid "" 420 412 "<p>When errors occur, the plugin write logs in an file. You can see the file " … … 426 418 msgstr "" 427 419 420 #: classes/factory/class-wc-bpost-shipping-factory-form.php:248 421 msgid "Go to the logs page" 422 msgstr "" 423 424 #: classes/factory/class-wc-bpost-shipping-factory-form.php:253 425 msgid "Debug mode" 426 msgstr "" 427 428 428 #: classes/factory/class-wc-bpost-shipping-factory-form.php:256 429 msgid "Go to the logs page" 429 msgid "" 430 "Log interactions between plugin and bpost services (API/Shipping Manager)" 431 msgstr "" 432 433 #: classes/factory/class-wc-bpost-shipping-factory-form.php:259 434 msgid "Clean" 430 435 msgstr "" 431 436 432 437 #: classes/factory/class-wc-bpost-shipping-factory-form.php:261 433 msgid "Debug mode"434 msgstr ""435 436 #: classes/factory/class-wc-bpost-shipping-factory-form.php:264437 msgid ""438 "Log interactions between plugin and bpost services (API/Shipping Manager)"439 msgstr ""440 441 #: classes/factory/class-wc-bpost-shipping-factory-form.php:267442 msgid "Clean"443 msgstr ""444 445 #: classes/factory/class-wc-bpost-shipping-factory-form.php:269446 438 msgid "Clear the log file" 447 439 msgstr "" -
bpost-shipping/trunk/readme.txt
r3119293 r3122012 8 8 Tested up to: 6.5 9 9 Requires PHP: 7.4 10 Stable tag: 3.1. 710 Stable tag: 3.1.8 11 11 License: GPLv2 or later 12 12 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 120 120 5. Configure your bpost shipping settings under the Woocommerce shipping > bpost shipping tab 121 121 == Changelog == 122 123 #### 3.1.8 124 125 *Release date: 2024-07-19* 126 127 * bpost API URL is now https://shm-rest.bpost.cloud/services/shm 122 128 123 129 #### 3.1.7
Note: See TracChangeset
for help on using the changeset viewer.