Changeset 3139025
- Timestamp:
- 08/21/2024 11:44:13 AM (18 months ago)
- Location:
- makecommerce/trunk
- Files:
-
- 18 edited
-
README.txt (modified) (2 diffs)
-
languages/wc_makecommerce_domain-et.mo (modified) (previous)
-
languages/wc_makecommerce_domain-et.po (modified) (1 diff)
-
languages/wc_makecommerce_domain-lt.po (modified) (1 diff)
-
languages/wc_makecommerce_domain-lt_LT.mo (modified) (previous)
-
languages/wc_makecommerce_domain-lv.mo (modified) (previous)
-
languages/wc_makecommerce_domain-lv.po (modified) (1 diff)
-
languages/wc_makecommerce_domain-lv_LV.mo (modified) (previous)
-
languages/wc_makecommerce_domain-ru.po (modified) (1 diff)
-
languages/wc_makecommerce_domain-ru_RU.mo (modified) (previous)
-
languages/wc_makecommerce_domain.pot (modified) (4 diffs)
-
makecommerce.php (modified) (2 diffs)
-
payment/gateway/woocommerce/blocks/js/mc_blocks_payment_block.js (modified) (2 diffs)
-
payment/gateway/woocommerce/blocks/woocommerceblocks.php (modified) (2 diffs)
-
payment/gateway/woocommerce/methods.php (modified) (1 diff)
-
payment/gateway/woocommerce/woocommerce.php (modified) (3 diffs)
-
shipping/js/parcelmachine.js (modified) (3 diffs)
-
shipping/method/parcelmachine/parcelmachine.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
makecommerce/trunk/README.txt
r3107349 r3139025 3 3 Tags: woocommerce, payment, maksekeskus, shipping, banklink, creditcard, estonia, latvia, lithuania, pangalink, kaardimaksed, omniva, smartPOST, WPML , eesti, swedbank, seb, lhv, citadele, nordea, pocopay 4 4 Requires at least: 5.6.1 5 Tested up to: 6. 5.36 Stable tag: 3.5. 25 Tested up to: 6.6.1 6 Stable tag: 3.5.3 7 7 Requires PHP: 7.4 8 8 License: GPLv2 or later … … 80 80 81 81 == Changelog == 82 83 = 3.5.3 2024-08-21 = 84 * Tweak - Additional settings support for Blocks checkout 85 * Tweak - WordPress 6.6.1 support 86 * Tweak - Wording improvement in settings 87 * Tweak - Simplified the parcel machine selectbox size in checkout 88 * Fix - Fixed undefined array key warning 82 89 83 90 = 3.5.2 2024-06-25 = -
makecommerce/trunk/languages/wc_makecommerce_domain-et.po
r3090713 r3139025 965 965 msgid "Request failed: invalid sender or destination data" 966 966 msgstr "Päring ebaõnnestus: saatja või sihtkoha andmed on valed" 967 968 msgid "Remove country selection and display all methods" 969 msgstr "Eemalda riigi valik ja kuva kõik meetodid" -
makecommerce/trunk/languages/wc_makecommerce_domain-lt.po
r3090713 r3139025 965 965 msgid "Request failed: invalid sender or destination data" 966 966 msgstr "Užklausa nepavyko: neteisingi siuntėjo arba paskirties duomenys" 967 968 msgid "Remove country selection and display all methods" 969 msgstr "Pašalinkite šalies pasirinkimą ir rodykite visus mokėjimo būdus" -
makecommerce/trunk/languages/wc_makecommerce_domain-lv.po
r3090713 r3139025 965 965 msgid "Request failed: invalid sender or destination data" 966 966 msgstr "Pieprasījums neizdevās: nederīgi sūtītāja vai galamērķa dati" 967 968 msgid "Remove country selection and display all methods" 969 msgstr "Noņemiet valsts izvēlni un parādiet visas metodes" -
makecommerce/trunk/languages/wc_makecommerce_domain-ru.po
r3090713 r3139025 967 967 msgid "Request failed: invalid sender or destination data" 968 968 msgstr "Запрос не выполнен: неверные данные отправителя или места назначения." 969 970 msgid "Remove country selection and display all methods" 971 msgstr "Удалить выбор страны и отобразить все методы" -
makecommerce/trunk/languages/wc_makecommerce_domain.pot
r3107349 r3139025 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2024-0 6-25T07:12:51+00:00\n"12 "POT-Creation-Date: 2024-08-13T09:32:02+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 "X-Generator: WP-CLI 2. 10.0\n"14 "X-Generator: WP-CLI 2.9.0\n" 15 15 "X-Domain: wc_makecommerce_domain\n" 16 16 17 17 #. Plugin Name of the plugin 18 #: makecommerce.php19 18 msgid "MakeCommerce" 20 19 msgstr "" … … 22 21 #. Plugin URI of the plugin 23 22 #. Author URI of the plugin 24 #: makecommerce.php25 23 msgid "https://makecommerce.net/" 26 24 msgstr "" 27 25 28 26 #. Description of the plugin 29 #: makecommerce.php30 27 msgid "Adds MakeCommerce payment gateway and Itella/Omniva/DPD parcel machine shipping methods to WooCommerce checkout" 31 28 msgstr "" 32 29 33 30 #. Author of the plugin 34 #: makecommerce.php35 31 msgid "Maksekeskus AS" 36 32 msgstr "" … … 336 332 msgstr "" 337 333 338 #: payment/gateway/woocommerce/blocks/woocommerceblocks.php:112339 #: payment/gateway/woocommerce/woocommerce.php:181340 msgid "Pay with bank-links or credit card"341 msgstr ""342 343 334 #: payment/gateway/woocommerce/blocks/woocommerceblocks.php:115 344 #: payment/gateway/woocommerce/woocommerce.php:41 1335 #: payment/gateway/woocommerce/woocommerce.php:412 345 336 msgid "Please select suitable payment option!" 346 337 msgstr "" … … 388 379 msgstr "" 389 380 390 #: payment/gateway/woocommerce/woocommerce.php:13 1381 #: payment/gateway/woocommerce/woocommerce.php:132 391 382 msgid "Enable/Disable" 392 383 msgstr "" 393 384 394 #: payment/gateway/woocommerce/woocommerce.php:13 3385 #: payment/gateway/woocommerce/woocommerce.php:134 395 386 msgid "Enable MakeCommerce payments" 396 387 msgstr "" 397 388 398 #: payment/gateway/woocommerce/woocommerce.php:14 3389 #: payment/gateway/woocommerce/woocommerce.php:144 399 390 msgid "MakeCommerce API" 400 391 msgstr "" 401 392 402 #: payment/gateway/woocommerce/woocommerce.php:14 4393 #: payment/gateway/woocommerce/woocommerce.php:145 403 394 msgid "Go to <a href=\"%s\">API settings</a> to fill in the credentials" 404 395 msgstr "" 405 396 406 #: payment/gateway/woocommerce/woocommerce.php:1 49397 #: payment/gateway/woocommerce/woocommerce.php:150 407 398 msgid "User Interface" 408 399 msgstr "" 409 400 410 #: payment/gateway/woocommerce/woocommerce.php:15 5401 #: payment/gateway/woocommerce/woocommerce.php:156 411 402 msgid "Set as default selection" 412 403 msgstr "" 413 404 414 #: payment/gateway/woocommerce/woocommerce.php:15 6405 #: payment/gateway/woocommerce/woocommerce.php:157 415 406 msgid "MakeCommerce payments widget will be selected by default" 416 407 msgstr "" 417 408 418 #: payment/gateway/woocommerce/woocommerce.php:16 3409 #: payment/gateway/woocommerce/woocommerce.php:164 419 410 msgid "Display MC payment channels as" 420 411 msgstr "" 421 412 422 #: payment/gateway/woocommerce/woocommerce.php:16 7413 #: payment/gateway/woocommerce/woocommerce.php:168 423 414 msgid "List" 424 415 msgstr "" 425 416 426 #: payment/gateway/woocommerce/woocommerce.php:16 8417 #: payment/gateway/woocommerce/woocommerce.php:169 427 418 msgid "Grouped to widget" 428 419 msgstr "" 429 420 430 #: payment/gateway/woocommerce/woocommerce.php:17 8431 #: payment/gateway/woocommerce/woocommerce.php:18 8421 #: payment/gateway/woocommerce/woocommerce.php:179 422 #: payment/gateway/woocommerce/woocommerce.php:189 432 423 msgid "Payments widget title" 433 424 msgstr "" 434 425 435 #: payment/gateway/woocommerce/woocommerce.php:18 0436 #: payment/gateway/woocommerce/woocommerce.php:19 0426 #: payment/gateway/woocommerce/woocommerce.php:181 427 #: payment/gateway/woocommerce/woocommerce.php:191 437 428 msgid "Appropriate title may depend on the configuration you have made, i.e. 'pay with bank-link or credit card', 'pay with bank-links' or 'payment methods'" 438 429 msgstr "" 439 430 440 #: payment/gateway/woocommerce/woocommerce.php:198 431 #: payment/gateway/woocommerce/woocommerce.php:182 432 msgid "Pay with bank-links or credit card" 433 msgstr "" 434 435 #: payment/gateway/woocommerce/woocommerce.php:199 441 436 msgid "MC payment channels display style" 442 437 msgstr "" 443 438 444 #: payment/gateway/woocommerce/woocommerce.php:20 2439 #: payment/gateway/woocommerce/woocommerce.php:203 445 440 msgid "Logo" 446 441 msgstr "" 447 442 448 #: payment/gateway/woocommerce/woocommerce.php:20 3443 #: payment/gateway/woocommerce/woocommerce.php:204 449 444 msgid "Text & logo" 450 445 msgstr "" 451 446 452 #: payment/gateway/woocommerce/woocommerce.php:20 4447 #: payment/gateway/woocommerce/woocommerce.php:205 453 448 msgid "Text" 454 449 msgstr "" 455 450 456 #: payment/gateway/woocommerce/woocommerce.php:21 0451 #: payment/gateway/woocommerce/woocommerce.php:211 457 452 msgid "Size of payment channel logos" 458 453 msgstr "" 459 454 460 #: payment/gateway/woocommerce/woocommerce.php:21 4455 #: payment/gateway/woocommerce/woocommerce.php:215 461 456 msgid "Small" 462 457 msgstr "" 463 458 464 #: payment/gateway/woocommerce/woocommerce.php:21 5459 #: payment/gateway/woocommerce/woocommerce.php:216 465 460 msgid "Medium" 466 461 msgstr "" 467 462 468 #: payment/gateway/woocommerce/woocommerce.php:21 6463 #: payment/gateway/woocommerce/woocommerce.php:217 469 464 msgid "Large" 470 465 msgstr "" 471 466 472 #: payment/gateway/woocommerce/woocommerce.php:22 2473 msgid " Group bank-links by countries"474 msgstr "" 475 476 #: payment/gateway/woocommerce/woocommerce.php:2 29467 #: payment/gateway/woocommerce/woocommerce.php:223 468 msgid "Remove country selection and display all methods" 469 msgstr "" 470 471 #: payment/gateway/woocommerce/woocommerce.php:230 477 472 msgid "Hide country selector" 478 473 msgstr "" 479 474 480 #: payment/gateway/woocommerce/woocommerce.php:23 0475 #: payment/gateway/woocommerce/woocommerce.php:231 481 476 msgid "Do not display country selector (flags) at payment methods" 482 477 msgstr "" 483 478 484 #: payment/gateway/woocommerce/woocommerce.php:23 6479 #: payment/gateway/woocommerce/woocommerce.php:237 485 480 msgid "Country selector style" 486 481 msgstr "" 487 482 488 #: payment/gateway/woocommerce/woocommerce.php:24 0483 #: payment/gateway/woocommerce/woocommerce.php:241 489 484 msgid "Flag" 490 485 msgstr "" 491 486 492 #: payment/gateway/woocommerce/woocommerce.php:24 1487 #: payment/gateway/woocommerce/woocommerce.php:242 493 488 msgid "Dropdown" 494 489 msgstr "" 495 490 496 #: payment/gateway/woocommerce/woocommerce.php:24 7491 #: payment/gateway/woocommerce/woocommerce.php:248 497 492 msgid "Define custom order of payment countries" 498 493 msgstr "" 499 494 500 #: payment/gateway/woocommerce/woocommerce.php:2 49495 #: payment/gateway/woocommerce/woocommerce.php:250 501 496 msgid "If you want to change default order, insert a comma separated list of 2 char country codes. i.e. - ee, lv, lt, fi (international = other)" 502 497 msgstr "" 503 498 504 #: payment/gateway/woocommerce/woocommerce.php:25 4499 #: payment/gateway/woocommerce/woocommerce.php:255 505 500 msgid "Define custom order of payment channels" 506 501 msgstr "" 507 502 508 #: payment/gateway/woocommerce/woocommerce.php:25 6503 #: payment/gateway/woocommerce/woocommerce.php:257 509 504 msgid "If you want to change default order, put here comma separated list of channels. i,e, - seb,lhv,swedbank. see more on the module home page (link above)" 510 505 msgstr "" 511 506 512 #: payment/gateway/woocommerce/woocommerce.php:26 5507 #: payment/gateway/woocommerce/woocommerce.php:266 513 508 msgid "Credit Card Settings" 514 509 msgstr "" 515 510 516 #: payment/gateway/woocommerce/woocommerce.php:27 0511 #: payment/gateway/woocommerce/woocommerce.php:271 517 512 msgid "Prefill Credit Card form with customer data" 518 513 msgstr "" 519 514 520 #: payment/gateway/woocommerce/woocommerce.php:27 3515 #: payment/gateway/woocommerce/woocommerce.php:274 521 516 msgid "It will pass user Name and e-mail address to the Credit Card dialog to make the form filling easier" 522 517 msgstr "" 523 518 524 #: payment/gateway/woocommerce/woocommerce.php:27 7519 #: payment/gateway/woocommerce/woocommerce.php:278 525 520 msgid "Advanced Settings" 526 521 msgstr "" 527 522 528 #: payment/gateway/woocommerce/woocommerce.php:28 2523 #: payment/gateway/woocommerce/woocommerce.php:283 529 524 msgid "Disable automatic cancelled payment status update" 530 525 msgstr "" 531 526 532 #: payment/gateway/woocommerce/woocommerce.php:28 3527 #: payment/gateway/woocommerce/woocommerce.php:284 533 528 msgid "Disable automatic order status updates for cancelled payments by MakeCommerce" 534 529 msgstr "" 535 530 536 #: payment/gateway/woocommerce/woocommerce.php:28 6531 #: payment/gateway/woocommerce/woocommerce.php:287 537 532 msgid "Disable MakeCommerce from updating order statuses for cancelled payments and let WooCommerce handle the status change" 538 533 msgstr "" 539 534 540 #: payment/gateway/woocommerce/woocommerce.php:29 0535 #: payment/gateway/woocommerce/woocommerce.php:291 541 536 msgid "Disable automatic expired payment status update" 542 537 msgstr "" 543 538 544 #: payment/gateway/woocommerce/woocommerce.php:29 1539 #: payment/gateway/woocommerce/woocommerce.php:292 545 540 msgid "Disable automatic order status updates for expired payments by MakeCommerce" 546 541 msgstr "" 547 542 548 #: payment/gateway/woocommerce/woocommerce.php:29 4543 #: payment/gateway/woocommerce/woocommerce.php:295 549 544 msgid "Disable MakeCommerce from updating order statuses for expired payments and let WooCommerce handle the status change" 550 545 msgstr "" 551 546 552 #: payment/gateway/woocommerce/woocommerce.php: 299547 #: payment/gateway/woocommerce/woocommerce.php:300 553 548 msgid "Update payment methods" 554 549 msgstr "" 555 550 556 #: payment/gateway/woocommerce/woocommerce.php:30 0551 #: payment/gateway/woocommerce/woocommerce.php:301 557 552 msgid "Update" 558 553 msgstr "" 559 554 560 #: payment/gateway/woocommerce/woocommerce.php:30 1555 #: payment/gateway/woocommerce/woocommerce.php:302 561 556 msgid "This will update shop configuration from MakeCommerce servers." 562 557 msgstr "" 563 558 564 #: payment/gateway/woocommerce/woocommerce.php:50 0559 #: payment/gateway/woocommerce/woocommerce.php:501 565 560 msgid "An error occured when trying to process payment!" 566 561 msgstr "" -
makecommerce/trunk/makecommerce.php
r3107349 r3139025 10 10 * Plugin URI: https://makecommerce.net/ 11 11 * Description: Adds MakeCommerce payment gateway and Itella/Omniva/DPD parcel machine shipping methods to WooCommerce checkout 12 * Version: 3.5. 212 * Version: 3.5.3 13 13 * Author: Maksekeskus AS 14 14 * Author URI: https://makecommerce.net/ … … 32 32 * Start at version 3.0.0 and use SemVer - https://semver.org 33 33 */ 34 define( 'MAKECOMMERCE_VERSION', '3.5. 2' );34 define( 'MAKECOMMERCE_VERSION', '3.5.3' ); 35 35 define( 'MAKECOMMERCE_PLUGIN_ID', 'makecommerce' ); 36 36 -
makecommerce/trunk/payment/gateway/woocommerce/blocks/js/mc_blocks_payment_block.js
r3090713 r3139025 8 8 const methods = settings.methods || []; 9 9 const manualRenewals = settings.manualRenewals || false; 10 const showSelector = settings.showSelector; 10 11 11 12 const wpElement = window.wp.element; … … 173 174 'div', 174 175 { 175 className: 'makecommerce_selector_widget' 176 className: 'makecommerce_selector_widget', 177 style: { 178 display: showSelector ? 'block' : 'none' 179 } 176 180 }, 177 181 countrySelector -
makecommerce/trunk/payment/gateway/woocommerce/blocks/woocommerceblocks.php
r3090713 r3139025 110 110 return [ 111 111 'name' => $this->name, 112 'label' => __( 'Pay with bank-links or credit card', 'wc_makecommerce_domain' ),112 'label' => $this->gateway->title, 113 113 'methods' => $this->gateway->get_methods(), 114 114 'path' => plugins_url( '../images/', __FILE__ ), 115 115 'paymentError' => __( 'Please select suitable payment option!', 'wc_makecommerce_domain' ), 116 'manualRenewals' => $manual_renewals 116 'manualRenewals' => $manual_renewals, 117 'showSelector' => $this->show_country_selector() 117 118 ]; 118 119 } … … 202 203 wp_send_json( [ 'html' => '' ] ); 203 204 } 205 206 private function show_country_selector() { 207 return !isset( $this->settings['ui_widget_countries_hidden'] ) || $this->settings['ui_widget_countries_hidden'] === 'no'; 208 } 204 209 } -
makecommerce/trunk/payment/gateway/woocommerce/methods.php
r3107349 r3139025 277 277 * @since 3.0.6 278 278 */ 279 p rivatefunction sort_countries_list() {279 public function sort_countries_list() { 280 280 281 281 if ( isset( $this->settings['ui_payment_country_order'] ) ) { -
makecommerce/trunk/payment/gateway/woocommerce/woocommerce.php
r3107349 r3139025 12 12 13 13 public $id = MAKECOMMERCE_PLUGIN_ID; 14 public $version = '3.5. 2';14 public $version = '3.5.3'; 15 15 16 16 public $payment_return_url; … … 30 30 31 31 public function get_methods() { 32 $this->methods->sort_countries_list(); 32 33 return $this->methods; 33 34 } … … 220 221 221 222 $this->form_fields['ui_widget_groupcountries'] = array( 222 'title' => __( ' Group bank-links by countries', 'wc_makecommerce_domain' ),223 'title' => __( 'Remove country selection and display all methods', 'wc_makecommerce_domain' ), 223 224 'type' => 'checkbox', 224 225 'default' => 'no', -
makecommerce/trunk/shipping/js/parcelmachine.js
r2701810 r3139025 1 1 jQuery(function(){ 2 2 3 3 jQuery(document).on('updated_checkout', function() { 4 4 … … 21 21 adjust_select_box_width(); 22 22 }); 23 23 24 24 function adjust_select_box_width() { 25 25 // Get widths of the content, parcel_machine_checkout row … … 43 43 jQuery('.parcel_machine_checkout > td').css('max-width', (content_width - 20) +'px'); 44 44 } 45 // If the size of the selectbox is bigger than X pixels and less than 2 times as small as the content, add a cell before it46 if (select_box_width > 500 && content_width / select_box_width < 2) {47 // Unless there already exist 2 cells, add an empty one before select_box48 if (parcel_row.find('.padding_cell').length < 1) {49 parcel_row.prepend('<td class="padding_cell"></td>');50 }51 52 // Loop through children and change colspan of select_box cell to 153 parcel_row.children().each(function() {54 if (typeof(jQuery(this).attr('colspan')) !== 'undefined') {55 jQuery(this).attr('colspan', 1);56 }57 });58 } else if (content_width <= 500 && parcel_row.find('.padding_cell').length > 0) {59 // If the row is smaller than the min amount and there's a padding cell, remove it60 parcel_row.children().each(function() {61 // Change colspan back to 262 if (typeof(jQuery(this).attr('colspan')) !== 'undefined') {63 jQuery(this).attr('colspan', 2);64 } else {65 jQuery(this).remove();66 }67 });68 }69 45 } 70 46 } -
makecommerce/trunk/shipping/method/parcelmachine/parcelmachine.php
r3107349 r3139025 159 159 $placeholder = __( '-- select parcel machine --', 'wc_makecommerce_domain' ); 160 160 $searchable_class = ''; 161 if ( $options['searchable_parcelmachines'] === 'yes' ) {161 if ( isset( $options['searchable_parcelmachines'] ) && $options['searchable_parcelmachines'] === 'yes' ) { 162 162 $searchable_class = ' parcel-machine-select-box-searchable'; 163 163 $placeholder = '';
Note: See TracChangeset
for help on using the changeset viewer.