WordPress.org
Get WordPress

Plugin Directory

Changeset 3107349


Ignore:
Timestamp:
06/25/2024 10:10:22 AM (20 months ago)
Author:
makecommerce
Message:

Release 3.5.2

Location:
makecommerce/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • makecommerce/trunk/README.txt

    r3093808 r3107349  
    44Requires at least: 5.6.1
    55Tested up to: 6.5.3
    6 Stable tag: 3.5.1
     6Stable tag: 3.5.2
    77Requires PHP: 7.4
    88License: GPLv2 or later
    … …  
    8080
    8181== Changelog ==
     82
     83= 3.5.2 2024-06-25 =
     84* Tweak - Payment method preselection support in iframe
     85* Tweak - PHP 8.3 support
     86* Tweak - Ordering of card payment methods
     87* Fix - Incorrect WPML endpoint when redirecting from payment
     88* Fix - XSS vulnerability
    8289
    8390= 3.5.1 2024-05-28 =

  • makecommerce/trunk/includes/vendor/nategood/httpful/src/Httpful/Response/Headers.php

    r1453456 r3107349  
    3535     * @return bool
    3636     */
     37    #[\ReturnTypeWillChange]
    3738    public function offsetExists($offset)
    3839    {
    … …  
    4445     * @return mixed
    4546     */
     47    #[\ReturnTypeWillChange]
    4648    public function offsetGet($offset)
    4749    {
    … …  
    5658     * @throws \Exception
    5759     */
     60    #[\ReturnTypeWillChange]
    5861    public function offsetSet($offset, $value)
    5962    {
    … …  
    6568     * @throws \Exception
    6669     */
     70    #[\ReturnTypeWillChange]
    6771    public function offsetUnset($offset)
    6872    {
    … …  
    7377     * @return int
    7478     */
     79    #[\ReturnTypeWillChange]
    7580    public function count()
    7681    {

  • makecommerce/trunk/languages/wc_makecommerce_domain.pot

    r3090713 r3107349  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: MakeCommerce 3.4.2\n"
     5"Project-Id-Version: MakeCommerce 3.5.2\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/makecommerce\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-03-20T21:48:07+00:00\n"
     12"POT-Creation-Date: 2024-06-25T07:12:51+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.9.0\n"
     14"X-Generator: WP-CLI 2.10.0\n"
    1515"X-Domain: wc_makecommerce_domain\n"
    1616
    1717#. Plugin Name of the plugin
     18#: makecommerce.php
    1819msgid "MakeCommerce"
    1920msgstr ""
    … …  
    2122#. Plugin URI of the plugin
    2223#. Author URI of the plugin
     24#: makecommerce.php
    2325msgid "https://makecommerce.net/"
    2426msgstr ""
    2527
    2628#. Description of the plugin
     29#: makecommerce.php
    2730msgid "Adds MakeCommerce payment gateway and Itella/Omniva/DPD parcel machine shipping methods to WooCommerce checkout"
    2831msgstr ""
    2932
    3033#. Author of the plugin
     34#: makecommerce.php
    3135msgid "Maksekeskus AS"
    3236msgstr ""
    … …  
    281285msgstr ""
    282286
    283 #: makecommerce.php:96
     287#: makecommerce.php:99
    284288msgid "Cannot initiate MakeCommerce, a class and/or namespace called \"MakeCommerce\" is already in use somewhere else..."
    285289msgstr ""
    286290
    287 #: makecommerce.php:142
     291#: makecommerce.php:145
    288292msgid "Cannot initiate MakeCommerce, there seems to be no WooCommerce present or active..."
    289293msgstr ""
    … …  
    310314
    311315#: payment/gateway/subscription.php:82
    312 #: payment/payment.php:311
     316#: payment/payment.php:319
    313317msgid "Transaction ID"
    314318msgstr ""
    315319
    316320#: payment/gateway/subscription.php:83
    317 #: payment/payment.php:312
     321#: payment/payment.php:320
    318322msgid "Payment option"
    319323msgstr ""
    … …  
    332336msgstr ""
    333337
     338#: payment/gateway/woocommerce/blocks/woocommerceblocks.php:112
     339#: payment/gateway/woocommerce/woocommerce.php:181
     340msgid "Pay with bank-links or credit card"
     341msgstr ""
     342
     343#: payment/gateway/woocommerce/blocks/woocommerceblocks.php:115
     344#: payment/gateway/woocommerce/woocommerce.php:411
     345msgid "Please select suitable payment option!"
     346msgstr ""
     347
    334348#: payment/gateway/woocommerce/creditcard.php:17
    335349msgid "The order is still awaiting your payment"
    336350msgstr ""
    337351
    338 #: payment/gateway/woocommerce/creditcard.php:54
     352#: payment/gateway/woocommerce/creditcard.php:64
    339353msgid "Pay for subscription"
    340354msgstr ""
    341355
    342 #: payment/gateway/woocommerce/creditcard.php:55
     356#: payment/gateway/woocommerce/creditcard.php:65
    343357msgid "This order contains subscriptions"
    344358msgstr ""
    345359
    346 #: payment/gateway/woocommerce/creditcard.php:56
     360#: payment/gateway/woocommerce/creditcard.php:66
    347361msgid "I agree that my card will be recurringly billed by this store"
    348362msgstr ""
    349363
    350 #: payment/gateway/woocommerce/creditcard.php:83
     364#: payment/gateway/woocommerce/creditcard.php:93
    351365msgid "Pay with credit card"
    352366msgstr ""
    353367
    354 #: payment/gateway/woocommerce/creditcard.php:84
     368#: payment/gateway/woocommerce/creditcard.php:94
    355369msgid "Please wait, processing payment..."
    356370msgstr ""
    357371
    358 #: payment/gateway/woocommerce/methods.php:161
     372#: payment/gateway/woocommerce/methods.php:172
    359373msgid "The payment methods list for MakeCommerce payment module is empty."
    360374msgstr ""
    361375
    362 #: payment/gateway/woocommerce/methods.php:162
    363 #: payment/gateway/woocommerce/methods.php:178
     376#: payment/gateway/woocommerce/methods.php:173
     377#: payment/gateway/woocommerce/methods.php:189
    364378msgid "Go to the settings to update them"
    365379msgstr ""
    366380
    367 #: payment/gateway/woocommerce/methods.php:177
     381#: payment/gateway/woocommerce/methods.php:188
    368382msgid "You have changed the environment for MakeCommerce payment module. The payment methods list has been loaded for a different environment."
    369383msgstr ""
    370384
    371 #: payment/gateway/woocommerce/methods.php:493
    372 #: payment/gateway/woocommerce/methods.php:521
     385#: payment/gateway/woocommerce/methods.php:504
     386#: payment/gateway/woocommerce/methods.php:532
    373387msgid "No payment methods for selected country"
    374388msgstr ""
    375389
    376 #: payment/gateway/woocommerce/woocommerce.php:124
     390#: payment/gateway/woocommerce/woocommerce.php:131
    377391msgid "Enable/Disable"
    378392msgstr ""
    379393
    380 #: payment/gateway/woocommerce/woocommerce.php:126
     394#: payment/gateway/woocommerce/woocommerce.php:133
    381395msgid "Enable MakeCommerce payments"
    382396msgstr ""
    383397
    384 #: payment/gateway/woocommerce/woocommerce.php:136
     398#: payment/gateway/woocommerce/woocommerce.php:143
    385399msgid "MakeCommerce API"
    386400msgstr ""
    387401
    388 #: payment/gateway/woocommerce/woocommerce.php:137
     402#: payment/gateway/woocommerce/woocommerce.php:144
    389403msgid "Go to <a href=\"%s\">API settings</a> to fill in the credentials"
    390404msgstr ""
    391405
    392 #: payment/gateway/woocommerce/woocommerce.php:142
     406#: payment/gateway/woocommerce/woocommerce.php:149
    393407msgid "User Interface"
    394408msgstr ""
    395409
    396 #: payment/gateway/woocommerce/woocommerce.php:148
     410#: payment/gateway/woocommerce/woocommerce.php:155
    397411msgid "Set as default selection"
    398412msgstr ""
    399413
    400 #: payment/gateway/woocommerce/woocommerce.php:149
     414#: payment/gateway/woocommerce/woocommerce.php:156
    401415msgid "MakeCommerce payments widget will be selected by default"
    402416msgstr ""
    403417
    404 #: payment/gateway/woocommerce/woocommerce.php:156
     418#: payment/gateway/woocommerce/woocommerce.php:163
    405419msgid "Display MC payment channels as"
    406420msgstr ""
    407421
    408 #: payment/gateway/woocommerce/woocommerce.php:160
     422#: payment/gateway/woocommerce/woocommerce.php:167
    409423msgid "List"
    410424msgstr ""
    411425
    412 #: payment/gateway/woocommerce/woocommerce.php:161
     426#: payment/gateway/woocommerce/woocommerce.php:168
    413427msgid "Grouped to widget"
    414428msgstr ""
    415429
    416 #: payment/gateway/woocommerce/woocommerce.php:171
    417 #: payment/gateway/woocommerce/woocommerce.php:181
     430#: payment/gateway/woocommerce/woocommerce.php:178
     431#: payment/gateway/woocommerce/woocommerce.php:188
    418432msgid "Payments widget title"
    419433msgstr ""
    420434
    421 #: payment/gateway/woocommerce/woocommerce.php:173
    422 #: payment/gateway/woocommerce/woocommerce.php:183
     435#: payment/gateway/woocommerce/woocommerce.php:180
     436#: payment/gateway/woocommerce/woocommerce.php:190
    423437msgid "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'"
    424438msgstr ""
    425439
    426 #: payment/gateway/woocommerce/woocommerce.php:174
    427 msgid "Pay with bank-links or credit card"
    428 msgstr ""
    429 
    430 #: payment/gateway/woocommerce/woocommerce.php:191
     440#: payment/gateway/woocommerce/woocommerce.php:198
    431441msgid "MC payment channels display style"
    432442msgstr ""
    433443
    434 #: payment/gateway/woocommerce/woocommerce.php:195
     444#: payment/gateway/woocommerce/woocommerce.php:202
    435445msgid "Logo"
    436446msgstr ""
    437447
    438 #: payment/gateway/woocommerce/woocommerce.php:196
     448#: payment/gateway/woocommerce/woocommerce.php:203
    439449msgid "Text & logo"
    440450msgstr ""
    441451
    442 #: payment/gateway/woocommerce/woocommerce.php:197
     452#: payment/gateway/woocommerce/woocommerce.php:204
    443453msgid "Text"
    444454msgstr ""
    445455
    446 #: payment/gateway/woocommerce/woocommerce.php:203
     456#: payment/gateway/woocommerce/woocommerce.php:210
    447457msgid "Size of payment channel logos"
    448458msgstr ""
    449459
    450 #: payment/gateway/woocommerce/woocommerce.php:207
     460#: payment/gateway/woocommerce/woocommerce.php:214
    451461msgid "Small"
    452462msgstr ""
    453463
    454 #: payment/gateway/woocommerce/woocommerce.php:208
     464#: payment/gateway/woocommerce/woocommerce.php:215
    455465msgid "Medium"
    456466msgstr ""
    457467
    458 #: payment/gateway/woocommerce/woocommerce.php:209
     468#: payment/gateway/woocommerce/woocommerce.php:216
    459469msgid "Large"
    460470msgstr ""
    461471
    462 #: payment/gateway/woocommerce/woocommerce.php:215
     472#: payment/gateway/woocommerce/woocommerce.php:222
    463473msgid "Group bank-links by countries"
    464474msgstr ""
    465475
    466 #: payment/gateway/woocommerce/woocommerce.php:222
     476#: payment/gateway/woocommerce/woocommerce.php:229
    467477msgid "Hide country selector"
    468478msgstr ""
    469479
    470 #: payment/gateway/woocommerce/woocommerce.php:223
     480#: payment/gateway/woocommerce/woocommerce.php:230
    471481msgid "Do not display country selector (flags) at payment methods"
    472482msgstr ""
    473483
    474 #: payment/gateway/woocommerce/woocommerce.php:229
     484#: payment/gateway/woocommerce/woocommerce.php:236
    475485msgid "Country selector style"
    476486msgstr ""
    477487
    478 #: payment/gateway/woocommerce/woocommerce.php:233
     488#: payment/gateway/woocommerce/woocommerce.php:240
    479489msgid "Flag"
    480490msgstr ""
    481491
    482 #: payment/gateway/woocommerce/woocommerce.php:234
     492#: payment/gateway/woocommerce/woocommerce.php:241
    483493msgid "Dropdown"
    484494msgstr ""
    485495
    486 #: payment/gateway/woocommerce/woocommerce.php:240
     496#: payment/gateway/woocommerce/woocommerce.php:247
    487497msgid "Define custom order of payment countries"
    488498msgstr ""
    489499
    490 #: payment/gateway/woocommerce/woocommerce.php:242
     500#: payment/gateway/woocommerce/woocommerce.php:249
    491501msgid "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)"
    492502msgstr ""
    493503
    494 #: payment/gateway/woocommerce/woocommerce.php:247
     504#: payment/gateway/woocommerce/woocommerce.php:254
    495505msgid "Define custom order of payment channels"
    496506msgstr ""
    497507
    498 #: payment/gateway/woocommerce/woocommerce.php:249
     508#: payment/gateway/woocommerce/woocommerce.php:256
    499509msgid "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)"
    500510msgstr ""
    501511
    502 #: payment/gateway/woocommerce/woocommerce.php:258
     512#: payment/gateway/woocommerce/woocommerce.php:265
    503513msgid "Credit Card Settings"
    504514msgstr ""
    505515
    506 #: payment/gateway/woocommerce/woocommerce.php:263
     516#: payment/gateway/woocommerce/woocommerce.php:270
    507517msgid "Prefill Credit Card form with customer data"
    508518msgstr ""
    509519
    510 #: payment/gateway/woocommerce/woocommerce.php:266
     520#: payment/gateway/woocommerce/woocommerce.php:273
    511521msgid "It will pass user Name and e-mail address to the Credit Card dialog to make the form filling easier"
    512522msgstr ""
    513523
    514 #: payment/gateway/woocommerce/woocommerce.php:270
     524#: payment/gateway/woocommerce/woocommerce.php:277
    515525msgid "Advanced Settings"
    516526msgstr ""
    517527
    518 #: payment/gateway/woocommerce/woocommerce.php:275
     528#: payment/gateway/woocommerce/woocommerce.php:282
    519529msgid "Disable automatic cancelled payment status update"
    520530msgstr ""
    521531
    522 #: payment/gateway/woocommerce/woocommerce.php:276
     532#: payment/gateway/woocommerce/woocommerce.php:283
    523533msgid "Disable automatic order status updates for cancelled payments by MakeCommerce"
    524534msgstr ""
    525535
    526 #: payment/gateway/woocommerce/woocommerce.php:279
     536#: payment/gateway/woocommerce/woocommerce.php:286
    527537msgid "Disable MakeCommerce from updating order statuses for cancelled payments and let WooCommerce handle the status change"
    528538msgstr ""
    529539
    530 #: payment/gateway/woocommerce/woocommerce.php:283
     540#: payment/gateway/woocommerce/woocommerce.php:290
    531541msgid "Disable automatic expired payment status update"
    532542msgstr ""
    533543
    534 #: payment/gateway/woocommerce/woocommerce.php:284
     544#: payment/gateway/woocommerce/woocommerce.php:291
    535545msgid "Disable automatic order status updates for expired payments by MakeCommerce"
    536546msgstr ""
    537547
    538 #: payment/gateway/woocommerce/woocommerce.php:287
     548#: payment/gateway/woocommerce/woocommerce.php:294
    539549msgid "Disable MakeCommerce from updating order statuses for expired payments and let WooCommerce handle the status change"
    540550msgstr ""
    541551
    542 #: payment/gateway/woocommerce/woocommerce.php:292
     552#: payment/gateway/woocommerce/woocommerce.php:299
    543553msgid "Update payment methods"
    544554msgstr ""
    545555
    546 #: payment/gateway/woocommerce/woocommerce.php:293
     556#: payment/gateway/woocommerce/woocommerce.php:300
    547557msgid "Update"
    548558msgstr ""
    549559
    550 #: payment/gateway/woocommerce/woocommerce.php:294
     560#: payment/gateway/woocommerce/woocommerce.php:301
    551561msgid "This will update shop configuration from MakeCommerce servers."
    552562msgstr ""
    553563
    554 #: payment/gateway/woocommerce/woocommerce.php:393
    555 msgid "Please select suitable payment option!"
    556 msgstr ""
    557 
    558 #: payment/gateway/woocommerce/woocommerce.php:476
     564#: payment/gateway/woocommerce/woocommerce.php:500
    559565msgid "An error occured when trying to process payment!"
    560566msgstr ""
    … …  
    572578msgstr ""
    573579
    574 #: payment/payment.php:231
     580#: payment/payment.php:234
    575581msgid "Order total and transaction amount did not match! Please contact us at"
    576582msgstr ""
    577583
    578 #: payment/payment.php:232
     584#: payment/payment.php:235
    579585msgid "[email protected]"
    580586msgstr ""
    581587
    582 #: payment/payment.php:235
     588#: payment/payment.php:238
    583589msgid "Transaction ID that was assigned to this order"
    584590msgstr ""
    585591
    586 #: payment/payment.php:239
     592#: payment/payment.php:242
    587593msgid "Amount that was paid"
    588594msgstr ""
    … …  
    689695msgstr ""
    690696
    691 #: shipping/method/courier/smartpost.php:65
     697#: shipping/method/courier/smartpost.php:71
     698#: shipping/method/courier/smartpost.php:84
    692699msgid "Pick courier arrival time window"
    693700msgstr ""
    694701
    695 #: shipping/method/courier/smartpost.php:69
     702#: shipping/method/courier/smartpost.php:74
     703#: shipping/method/courier/smartpost.php:88
    696704#: shipping/order.php:192
    697705#: shipping/order.php:428
    … …  
    699707msgstr ""
    700708
    701 #: shipping/method/courier/smartpost.php:70
     709#: shipping/method/courier/smartpost.php:75
     710#: shipping/method/courier/smartpost.php:89
    702711msgid "Worktime (09:00..17:00)"
    703712msgstr ""
    704713
    705 #: shipping/method/courier/smartpost.php:71
     714#: shipping/method/courier/smartpost.php:76
     715#: shipping/method/courier/smartpost.php:90
    706716msgid "After worktime (17:00..21:00)"
    707717msgstr ""
    708718
    709 #: shipping/method/method.php:138
     719#: shipping/method/method.php:148
    710720msgid "Update here"
    711721msgstr ""
    712722
    713 #: shipping/method/method.php:139
     723#: shipping/method/method.php:149
    714724#: shipping/shipping.php:1079
    715725msgid "Dismiss"
    716726msgstr ""
    717727
    718 #: shipping/method/method.php:164
     728#: shipping/method/method.php:174
    719729msgid "<strong>Parcel machine</strong> is a required field."
    720730msgstr ""
    721731
    722 #: shipping/method/method.php:482
     732#: shipping/method/method.php:492
    723733msgid "Generic and pricing options"
    724734msgstr ""
    725735
    726 #: shipping/method/method.php:486
     736#: shipping/method/method.php:496
    727737msgid "Enable"
    728738msgstr ""
    729739
    730 #: shipping/method/method.php:488
     740#: shipping/method/method.php:498
    731741msgid "enabled"
    732742msgstr ""
    733743
    734 #: shipping/method/method.php:493
     744#: shipping/method/method.php:503
    735745msgid "Maximum weight allowed for shipping (%s)"
    736746msgstr ""
    737747
    738 #: shipping/method/method.php:500
     748#: shipping/method/method.php:510
    739749msgid "Look and feel options"
    740750msgstr ""
    741751
    742 #: shipping/method/method.php:501
     752#: shipping/method/method.php:511
    743753msgid "Options for presentation on check-out page"
    744754msgstr ""
    745755
    746 #: shipping/method/method.php:510
    747 #: shipping/method/method.php:517
     756#: shipping/method/method.php:520
     757#: shipping/method/method.php:527
    748758msgid "Shipping Method Title"
    749759msgstr ""
    750760
    751 #: shipping/method/method.php:534
     761#: shipping/method/method.php:544
    752762msgid "API access for"
    753763msgstr ""
    754764
    755 #: shipping/method/method.php:535
     765#: shipping/method/method.php:545
    756766msgid "You can automatically create shipments into %s system and print the out the package labels right here, at the shop orders view. <br> Please set your %s web services account credentials below here. <br>(see more on <a href=\"https://makecommerce.net/en/integration-modules/makecommerce-woocommerce-payment-plugin/#carriers-integration\">MakeCommerce plugin page</a>. Don't forget to enable also <a href=\"%s\">MC API keys</a>!)"
    757767msgstr ""
    758768
    759 #: shipping/method/method.php:555
     769#: shipping/method/method.php:565
    760770msgid "Shipping price"
    761771msgstr ""
    762772
    763 #: shipping/method/method.php:561
     773#: shipping/method/method.php:571
    764774msgid "Free shipping amount"
    765775msgstr ""
    766776
    767 #: shipping/method/method.php:564
     777#: shipping/method/method.php:574
    768778msgid "(0 means no free shipping)"
    769779msgstr ""
    770780
    771 #: shipping/method/method.php:568
     781#: shipping/method/method.php:578
    772782msgid "Free shipping coupons"
    773783msgstr ""
    774784
    775 #: shipping/method/method.php:571
     785#: shipping/method/method.php:581
    776786msgid "Allow using free shipping coupons to be used with this method"
    777787msgstr ""
    778788
    779 #: shipping/method/method.php:587
     789#: shipping/method/method.php:597
    780790msgid "Return address"
    781791msgstr ""
    782792
    783 #: shipping/method/method.php:588
     793#: shipping/method/method.php:598
    784794msgid "Please define return address for %s shipments.<br><b>All fields are required.</b>"
    785795msgstr ""
    786796
    787 #: shipping/method/method.php:593
     797#: shipping/method/method.php:603
    788798msgid "Shop name"
    789799msgstr ""
    790800
    791 #: shipping/method/method.php:599
     801#: shipping/method/method.php:609
    792802msgid "Shop phone (mobile)"
    793803msgstr ""
    794804
    795 #: shipping/method/method.php:605
     805#: shipping/method/method.php:615
    796806msgid "Shop email"
    797807msgstr ""
    798808
    799 #: shipping/method/method.php:611
     809#: shipping/method/method.php:621
    800810#: shipping/method/parcelmachine/lpexpress.php:64
    801811msgid "Shop address country"
    802812msgstr ""
    803813
    804 #: shipping/method/method.php:622
     814#: shipping/method/method.php:632
    805815msgid "Shop address city"
    806816msgstr ""
    807817
    808 #: shipping/method/method.php:628
     818#: shipping/method/method.php:638
    809819msgid "Shop postal code"
    810820msgstr ""
    811821
    812 #: shipping/method/method.php:634
     822#: shipping/method/method.php:644
    813823msgid "Shop address street"
    814824msgstr ""
    815825
    816 #: shipping/method/method.php:651
     826#: shipping/method/method.php:661
    817827msgid "%s web services username"
    818828msgstr ""
    819829
    820 #: shipping/method/method.php:657
     830#: shipping/method/method.php:667
    821831msgid "%s web services password"
    822832msgstr ""
    … …  
    936946msgstr ""
    937947
    938 #: shipping/method/parcelmachine/parcelmachine.php:144
     948#: shipping/method/parcelmachine/parcelmachine.php:159
    939949#: shipping/shipping.php:789
    940950msgid "-- select parcel machine --"
    941951msgstr ""
    942952
    943 #: shipping/method/parcelmachine/parcelmachine.php:169
     953#: shipping/method/parcelmachine/parcelmachine.php:191
    944954msgid "Choose machine from map"
    945955msgstr ""
    946956
    947 #: shipping/method/parcelmachine/parcelmachine.php:451
     957#: shipping/method/parcelmachine/parcelmachine.php:475
    948958msgid "The transport mediation service is already enabled for your shop. You are good to go!"
    949959msgstr ""
    950960
    951 #: shipping/method/parcelmachine/parcelmachine.php:452
     961#: shipping/method/parcelmachine/parcelmachine.php:476
    952962msgid "The transport mediation service is NOT ENABLED enabled for your shop. Please go to merchant portal to activate it!"
    953963msgstr ""
    954964
    955 #: shipping/method/parcelmachine/parcelmachine.php:453
     965#: shipping/method/parcelmachine/parcelmachine.php:477
    956966msgid "There was an error with your request. Please try again."
    957967msgstr ""

  • makecommerce/trunk/makecommerce.php

    r3093808 r3107349  
    1010 * Plugin URI:            https://makecommerce.net/
    1111 * Description:           Adds MakeCommerce payment gateway and Itella/Omniva/DPD parcel machine shipping methods to WooCommerce checkout
    12  * Version:               3.5.1
     12 * Version:               3.5.2
    1313 * Author:                Maksekeskus AS
    1414 * Author URI:            https://makecommerce.net/
    … …  
    3232 * Start at version 3.0.0 and use SemVer - https://semver.org
    3333 */
    34 define( 'MAKECOMMERCE_VERSION', '3.5.1' );
     34define( 'MAKECOMMERCE_VERSION', '3.5.2' );
    3535define( 'MAKECOMMERCE_PLUGIN_ID', 'makecommerce' );
    3636

  • makecommerce/trunk/payment/gateway/woocommerce/creditcard.php

    r3012381 r3107349  
    3434        $idReference = $order->get_order_number();
    3535
     36        $selectedMethod = $order->get_meta( '_makecommerce_preselected_method');
     37        $preselect = 'CC';
     38
     39        if ( stristr( $selectedMethod, 'apple_pay' ) ) {
     40            $preselect = 'AP';
     41        } elseif ( stristr( $selectedMethod, 'google_pay' ) ) {
     42            $preselect = 'GP';
     43        }
     44
    3645        $jsParams = array(
    3746            'key' => $this->MK->getPublishableKey(),
    … …  
    4756            'currency' => method_exists( $order, 'get_currency' ) ? $order->get_currency() : $order->currency,
    4857            'backdropclose' => 'false',
     58            'preselect' => $preselect
    4959        );
    5060

  • makecommerce/trunk/payment/gateway/woocommerce/js/mc_cc_init.js

    r2684982 r3107349  
    1414        'openOnLoad': MC_CC_INIT.openonload,
    1515        'currency': MC_CC_INIT.currency,
    16         'backdropClose': MC_CC_INIT.backdropclose
     16        'backdropClose': MC_CC_INIT.backdropclose,
     17        'preselect': MC_CC_INIT.preselect
    1718    }
    1819

  • makecommerce/trunk/payment/gateway/woocommerce/methods.php

    r3090713 r3107349  
    121121
    122122            if ( isset( $cards ) ) {
    123                 $this->cards = array_reverse( $cards );
     123                $this->cards = $cards;
    124124            }
    125125

  • makecommerce/trunk/payment/gateway/woocommerce/woocommerce.php

    r3093808 r3107349  
    1212
    1313    public $id = MAKECOMMERCE_PLUGIN_ID;
    14     public $version = '3.5.1';
     14    public $version = '3.5.2';
    1515   
    1616    public $payment_return_url;
    … …  
    316316        add_action( 'woocommerce_scheduled_subscription_payment_' . $this->id, array( $this, 'process_subscription_payment_start' ), 10, 2 );
    317317        add_action( 'scheduled_subscription_payment_' . $this->id, array( $this, 'process_subscription_payment_start' ), 10, 2 );
     318
     319        add_action( 'woocommerce_checkout_update_order_meta', [$this, 'set_received_order_url'] );
    318320       
    319321        if ( $this->init == false ) {
    … …  
    625627    }
    626628
    627     public function woocommerce_blocks_support() {
    628         if ( class_exists( \Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType::class ) ) {
    629             require_once plugin_dir_path(__FILE__) . 'blocks/woocommerceblocks.php';
    630             add_action(
    631                 'woocommerce_blocks_payment_method_type_registration',
    632                 function( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
    633                     $payment_method_registry->register( new WooCommerceBlocks );
    634                 }
    635             );
    636         }
    637     }
     629    /**
     630     * Adds correct order received url to an order based on wpml language
     631     *
     632     * @since 3.5.0
     633     */
     634    public function set_received_order_url( $order_id ) {
     635        $order = wc_get_order( $order_id );
     636        if ( !$order ) {
     637            return;
     638        }
     639        $order->update_meta_data( '_makecommerce_order_received_url', $order->get_checkout_order_received_url() );
     640        $order->save();
     641    }
     642
     643    public function woocommerce_blocks_support() {
     644        if ( class_exists( \Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType::class ) ) {
     645            require_once plugin_dir_path(__FILE__) . 'blocks/woocommerceblocks.php';
     646            add_action(
     647                'woocommerce_blocks_payment_method_type_registration',
     648                function( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
     649                    $payment_method_registry->register( new WooCommerceBlocks );
     650                }
     651            );
     652        }
     653    }
    638654}

  • makecommerce/trunk/payment/payment.php

    r3093808 r3107349  
    221221        }
    222222
    223         $returnUrl = $order->get_checkout_order_received_url();
     223        $returnUrl = $order->get_meta( '_makecommerce_order_received_url', true );
     224        if ( !$returnUrl ) {
     225            $returnUrl = $order->get_checkout_order_received_url();
     226        }
    224227
    225228        // Only check sums if $totalAmount is set

  • makecommerce/trunk/shipping/method/method.php

    r3093808 r3107349  
    1717    public $id;
    1818    public $instance_id;
     19    public $availability;
     20    public $countries;
     21
     22    protected $ext;
     23    protected $order_country;
     24   
     25    private $enable;
     26    private $free_shipping_min_amount;
     27    private $maximum_weight;
     28    private $name_ext;
    1929
    2030    public $supports = array(

  • makecommerce/trunk/shipping/method/parcelmachine/parcelmachine.php

    r3090713 r3107349  
    2020    public $identifierString;
    2121
     22    private $mk_lpexpress_template;
     23    private $prioritization;
     24    private $searchable_parcelmachines;
     25    private $short_office_names;
     26    private $use_white_apts;
    2227
    2328    /**
    … …  
    3439
    3540        //set parcelmachine specific properties
    36         $this->prioritization = null;
    3741        if ( isset( $this->settings['prioritization'] ) ) {
    3842            $this->prioritization = $this->settings['prioritization'];
    3943        }
    4044
    41         $this->short_office_names = null;
    4245        if ( isset( $this->settings['short_office_names'] ) ) {
    4346            $this->short_office_names = $this->settings['short_office_names'];
    4447        }
    4548
    46         $this->use_white_apts = null;
    4749        if ( isset( $this->settings['use_white_apts'] ) ) {
    4850            $this->use_white_apts = $this->settings['use_white_apts'];
    4951        }
    5052
    51         $this->searchable_parcelmachines = null;
    5253        if ( isset( $this->settings['searchable_parcelmachines'] ) ) {
    5354            $this->searchable_parcelmachines = $this->settings['searchable_parcelmachines'];
    5455        }
    5556
    56         $this->mk_lpexpress_template = null;
    5757        if ( isset( $this->settings['mk_lpexpress_template'] ) ) {
    5858            $this->mk_lpexpress_template = $this->settings['mk_lpexpress_template'];

  • makecommerce/trunk/shipping/shipping.php

    r3090713 r3107349  
    10711071        $_GET['dismiss_mc_invalid_google_api_key'] = '1';
    10721072
    1073         $dismiss_href = add_query_arg( $_GET );
     1073        $dismiss_href = esc_url( add_query_arg( $_GET ) );
    10741074
    10751075        // Display error
Note: See TracChangeset for help on using the changeset viewer.