WordPress.org
Get WordPress

Plugin Directory

Changeset 2884268


Ignore:
Timestamp:
03/21/2023 01:07:04 PM (3 years ago)
Author:
makecommerce
Message:

Release 3.2.1

Location:
makecommerce/trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • makecommerce/trunk/README.txt

    r2830541 r2884268  
    44Requires at least: 5.6.1
    55Tested up to: 6.1
    6 Stable tag: 3.2.0
     6Stable tag: 3.2.1
    77Requires PHP: 7.4
    88License: GPLv2 or later
    … …  
    7171
    7272== Changelog ==
     73
     74= 3.2.1 2023-03-21 =
     75* Feature - Added API key field for Smartpost
     76* Tweak - Updated Indivy description
     77* Fix - Wrong function call for shipping method titles
     78* Fix - Resetting API cache when switching environments
     79* Fix - Displaying payment methods for Polylang Russian checkout
    7380
    7481= 3.2.0 2022-12-08 =

  • makecommerce/trunk/api/api.php

    r2830541 r2884268  
    356356
    357357    /**
     358     * Function for resetting machines and payment methods when API type is changed
     359     *
     360     * @since 3.2.1
     361     */
     362    public function mk_delete_api_cache() {
     363
     364        global $wpdb;
     365        $tableName = $wpdb->prefix . MAKECOMMERCE_TABLENAME;
     366
     367        // Delete machines' cache and timer
     368        delete_option( 'mk_machines_expires' );
     369        delete_option( 'mk_machines_cache' );
     370
     371        // Delete payment methods
     372        $wpdb->query( 'TRUNCATE TABLE `'.$tableName.'`' );
     373    }
     374
     375    /**
    358376     * Notice for missing API information
    359377     *

  • makecommerce/trunk/includes/makecommerce.php

    r2830541 r2884268  
    152152            $this->loader->add_action( 'admin_notices', $api, 'api_info_missing' );
    153153        }
     154
     155        //if API type is updated then refresh the cache
     156        $this->loader->add_action( 'update_option_mk_api_type', $api, 'mk_delete_api_cache' );
    154157       
    155158        //add API access menu in woocommerce->settings->advanced (_api version is for WC <= 3.4.0)

  • makecommerce/trunk/languages/wc_makecommerce_domain-et.po

    r2830541 r2884268  
    6363msgstr "Erinevate seadete korral sobib vast kasutada erinevat pealkirja, nt. 'Maksa panaglingi või kaardiga' või 'maksa pangalingiga' või 'makseviisid'"
    6464
    65 #, fuzzy
    6665msgid "Estonia"
    6766msgstr "Eesti"
    6867
    69 #, fuzzy
    7068msgid "Latvia"
    7169msgstr "Läti"
    7270
    73 #, fuzzy
    7471msgid "Lithuania"
    7572msgstr "Leedu"
    7673
    77 #, fuzzy
    7874msgid "Finland"
    7975msgstr "Soome"
    8076
    81 #, fuzzy
    8277msgid "Logo"
    8378msgstr "Logo"
    … …  
    791786msgstr "Kui see on märgitud, on pakiautomaat selle toote jaoks tasuta"
    792787
    793 #, fuzzy
    794788msgid "This is a test"
    795789msgstr "See on test"
    … …  
    836830msgid "LP Express template"
    837831msgstr "LP Expressi mall"
     832
     833msgid " can be used with an international phone number only. Please specify your phone number with international country code (e.g. +372xxxxxxx)"
     834msgstr "tuleb sisestada rahvusvaheline telefoninumber. Palun sisesta see koos riigi koodiga (näiteks +372xxxxxxx)"
     835
     836msgid " can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)"
     837msgstr "Saab kasutada ainult Leedu telefoninumbriga. Sisesta koos riigi koodiga (+370xxxxxxxx)"
     838
     839msgid "Please define return address for %s shipments.<br><b>All fields are required.</b>"
     840msgstr "Palun määra tagastusaadress %s saadetisele.<br><b>Kõik väljad on nõutud.</b>"
     841
     842msgid "To further configure the Payment methods please go to <a href=\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
     843msgstr "Makseviiside täiendavaks seadistamiseks palun mine  <a href=\"%s\">MakeCommerce Checkout valikutesse</a>. Viited tarneviiside osas on loetletud all."
     844
     845msgid "Buy now, <b>pay on the 25th of the next month</b>"
     846msgstr "Osta kohe, <b>maksa järgmise kuu 25ndal</b>"
     847
     848msgid "SmartPost API Key"
     849msgstr "SmartPost API võti"

  • makecommerce/trunk/languages/wc_makecommerce_domain-lt.po

    r2830541 r2884268  
    830830msgid "LP Express template"
    831831msgstr "LP Express šablonas"
     832
     833msgid " can be used with an international phone number only. Please specify your phone number with international country code (e.g. +372xxxxxxx)"
     834msgstr "galima naudoti tik su tarptautiniu telefono numeriu. Nurodykite savo telefono numerį su tarptautiniu šalies kodu (pvz., +372xxxxxxxx)"
     835
     836msgid " can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)"
     837msgstr "galima naudoti tik su Lietuvišku telefono numeriu. Nurodykite savo telefono numerį su Lietuvos šalies kodu (pvz., +370xxxxxxxxx)"
     838
     839msgid "Please define return address for %s shipments.<br><b>All fields are required.</b>"
     840msgstr "Nurodykite %s siuntų grąžinimo adresą.<br><b>Visi laukeliai yra privalomi.</b>"
     841
     842msgid "To further configure the Payment methods please go to <a href=\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
     843msgstr "Norėdami toliau konfigūruoti mokėjimo būdus, eikite į <a href=\"%s\">MakeCommerce</a> nustatymus. Pristatymo būdų parinkčių nustatymai pateikiami žemiau"
     844
     845msgid "Buy now, <b>pay on the 25th of the next month</b>"
     846msgstr "Pirkite dabar, <b>mokėkite kito mėnesio 25 dieną</b>"
     847
     848msgid "SmartPost API Key"
     849msgstr "SmartPost API raktas"

  • makecommerce/trunk/languages/wc_makecommerce_domain-lv.po

    r2830541 r2884268  
    830830msgid "LP Express template"
    831831msgstr "LP Express veidne"
     832
     833msgid " can be used with an international phone number only. Please specify your phone number with international country code (e.g. +372xxxxxxx)"
     834msgstr "var izmantot tikai ar starptautisku tālruņa numuru. Lūdzu, norādiet savu tālruņa numuru ar starptautisko valsts kodu (piem., +371xxxxxxxx)"
     835
     836msgid " can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)"
     837msgstr "var izmantot tikai ar Latvijas tālruņa numuru. Lūdzu, norādiet savu tālruņa numuru ar Latvijas valsts kodu (piem., +371xxxxxxxxx)"
     838
     839msgid "Please define return address for %s shipments.<br><b>All fields are required.</b>"
     840msgstr "Lūdzu, norādiet atgriešanas adresi %s sūtījumam.<br><b>Visi lauki ir obligāti.</b>"
     841
     842msgid "To further configure the Payment methods please go to <a href=\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
     843msgstr "Lai tālāk pārvaldītu maksājumu veidus, lūdzu, dodieties uz <a href=\"%s\">MakeCommerce maksājumu konfigurāciju</a>, bet saites uz mūsu piegādes metožu iestatījumiem ir norādītas zemāk"
     844
     845msgid "Buy now, <b>pay on the 25th of the next month</b>"
     846msgstr "Pērc tagad, <b>maksā nākamā mēneša 25. datumā</b>"
     847
     848msgid "SmartPost API Key"
     849msgstr "SmartPost API pieeja"

  • makecommerce/trunk/languages/wc_makecommerce_domain-ru.po

    r2830541 r2884268  
    788788msgstr "Когда это отмечено, транспортировка этого продукта в посылочном автомате бесплатна"
    789789
    790 #, fuzzy
    791790msgid "This is a test"
    792791msgstr "Это тест"
    … …  
    833832msgid "LP Express template"
    834833msgstr "Шаблон LP Express"
     834
     835msgid " can be used with an international phone number only. Please specify your phone number with international country code (e.g. +372xxxxxxx)"
     836msgstr "можно использовать только с международным номером телефона. Укажите свой номер телефона с международным кодом страны (например, +372xxxxxxx)"
     837
     838msgid " can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)"
     839msgstr "можно использовать только с Литовским номером телефона. Пожалуйста, укажите свой номер телефона с кодом страны Литвы (например, +370xxxxxxxxx)"
     840
     841msgid "Please define return address for %s shipments.<br><b>All fields are required.</b>"
     842msgstr "Пожалуйста, укажите обратный адрес для %s посылок.<br><b>Все поля обязательны для заполнения.</b>"
     843
     844msgid "To further configure the Payment methods please go to <a href=\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
     845msgstr "Для дальнейшей настройки способов оплаты перейдите в раздел <a href=\"%s\">Параметры оплаты MakeCommerce</a>, ссылки на настройки наших способов доставки указаны ниже"
     846
     847msgid "Buy now, <b>pay on the 25th of the next month</b>"
     848msgstr "Купите сейчас, <b>оплатите 25-го числа следующего месяца</b>"
     849
     850msgid "SmartPost API Key"
     851msgstr "SmartPost API ключ"

  • makecommerce/trunk/languages/wc_makecommerce_domain.pot

    r2830541 r2884268  
    1 # Copyright (C) 2022 Maksekeskus AS
     1# Copyright (C) 2023 Maksekeskus AS
    22# This file is distributed under the GPL-2.0+.
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: MakeCommerce 3.2.0\n"
     5"Project-Id-Version: MakeCommerce 3.2.1\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: 2022-12-01T12:34:07+00:00\n"
     12"POT-Creation-Date: 2023-03-20T16:56:05+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1414"X-Generator: WP-CLI 2.7.1\n"
    … …  
    4949
    5050#: api/api.php:226
    51 msgid "To further configure the Payment methods please go to <a href=.\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
     51msgid "To further configure the Payment methods please go to <a href=\"%s\">MakeCommerce Checkout Options</a>, links to settings of our Shipment methods are listed below"
    5252msgstr ""
    5353
    … …  
    178178msgstr ""
    179179
    180 #: api/api.php:367
     180#: api/api.php:385
    181181msgid "You have not entered the Shop ID and keys for the MakeCommerce payment module. The module will not work without them."
    182182msgstr ""
    183183
    184 #: api/api.php:369
    185 #: api/api.php:371
     184#: api/api.php:387
     185#: api/api.php:389
    186186msgid "Click here to enter them"
    187187msgstr ""
    … …  
    217217msgstr ""
    218218
    219 #: includes/makecommerce.php:312
     219#: includes/makecommerce.php:315
    220220msgid "Please check that you have configured correctly MakeCommerce API accesses"
    221221msgstr ""
    … …  
    327327
    328328#: payment/gateway/woocommerce/paylater.php:45
    329 msgid "Buy now, <b>pay on the 15th of the next month</b>"
     329msgid "Buy now, <b>pay on the 25th of the next month</b>"
    330330msgstr ""
    331331
    … …  
    548548msgstr ""
    549549
    550 #: payment/gateway/woocommerce/woocommerce.php:120
     550#: payment/gateway/woocommerce/woocommerce.php:123
    551551msgid "Enable/Disable"
    552552msgstr ""
    553553
    554 #: payment/gateway/woocommerce/woocommerce.php:122
     554#: payment/gateway/woocommerce/woocommerce.php:125
    555555msgid "Enable MakeCommerce payments"
    556556msgstr ""
    557557
    558 #: payment/gateway/woocommerce/woocommerce.php:132
     558#: payment/gateway/woocommerce/woocommerce.php:135
    559559msgid "MakeCommerce API"
    560560msgstr ""
    561561
    562 #: payment/gateway/woocommerce/woocommerce.php:133
     562#: payment/gateway/woocommerce/woocommerce.php:136
    563563msgid "Go to <a href=\"%s\">API settings</a> to fill in the credentials"
    564564msgstr ""
    565565
    566 #: payment/gateway/woocommerce/woocommerce.php:138
     566#: payment/gateway/woocommerce/woocommerce.php:141
    567567msgid "User Interface"
    568568msgstr ""
    569569
    570 #: payment/gateway/woocommerce/woocommerce.php:144
     570#: payment/gateway/woocommerce/woocommerce.php:147
    571571msgid "Set as default selection"
    572572msgstr ""
    573573
    574 #: payment/gateway/woocommerce/woocommerce.php:145
     574#: payment/gateway/woocommerce/woocommerce.php:148
    575575msgid "MakeCommerce payments widget will be selected by default"
    576576msgstr ""
    577577
    578 #: payment/gateway/woocommerce/woocommerce.php:152
     578#: payment/gateway/woocommerce/woocommerce.php:155
    579579msgid "Display MC payment channels as"
    580580msgstr ""
    581581
    582 #: payment/gateway/woocommerce/woocommerce.php:156
     582#: payment/gateway/woocommerce/woocommerce.php:159
    583583msgid "List"
    584584msgstr ""
    585585
    586 #: payment/gateway/woocommerce/woocommerce.php:157
     586#: payment/gateway/woocommerce/woocommerce.php:160
    587587msgid "Grouped to widget"
    588588msgstr ""
    589589
    590 #: payment/gateway/woocommerce/woocommerce.php:167
    591 #: payment/gateway/woocommerce/woocommerce.php:177
     590#: payment/gateway/woocommerce/woocommerce.php:170
     591#: payment/gateway/woocommerce/woocommerce.php:180
    592592msgid "Payments widget title"
    593593msgstr ""
    594594
    595 #: payment/gateway/woocommerce/woocommerce.php:169
    596 #: payment/gateway/woocommerce/woocommerce.php:179
     595#: payment/gateway/woocommerce/woocommerce.php:172
     596#: payment/gateway/woocommerce/woocommerce.php:182
    597597msgid "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'"
    598598msgstr ""
    599599
    600 #: payment/gateway/woocommerce/woocommerce.php:170
     600#: payment/gateway/woocommerce/woocommerce.php:173
    601601msgid "Pay with bank-links or credit card"
    602602msgstr ""
    603603
    604 #: payment/gateway/woocommerce/woocommerce.php:187
     604#: payment/gateway/woocommerce/woocommerce.php:190
    605605msgid "MC payment channels display style"
    606606msgstr ""
    607607
    608 #: payment/gateway/woocommerce/woocommerce.php:191
     608#: payment/gateway/woocommerce/woocommerce.php:194
    609609msgid "Logo"
    610610msgstr ""
    611611
    612 #: payment/gateway/woocommerce/woocommerce.php:192
     612#: payment/gateway/woocommerce/woocommerce.php:195
    613613msgid "Text & logo"
    614614msgstr ""
    615615
    616 #: payment/gateway/woocommerce/woocommerce.php:193
     616#: payment/gateway/woocommerce/woocommerce.php:196
    617617msgid "Text"
    618618msgstr ""
    619619
    620 #: payment/gateway/woocommerce/woocommerce.php:199
     620#: payment/gateway/woocommerce/woocommerce.php:202
    621621msgid "Size of payment channel logos"
    622622msgstr ""
    623623
    624 #: payment/gateway/woocommerce/woocommerce.php:203
     624#: payment/gateway/woocommerce/woocommerce.php:206
    625625msgid "Small"
    626626msgstr ""
    627627
    628 #: payment/gateway/woocommerce/woocommerce.php:204
     628#: payment/gateway/woocommerce/woocommerce.php:207
    629629msgid "Medium"
    630630msgstr ""
    631631
    632 #: payment/gateway/woocommerce/woocommerce.php:205
     632#: payment/gateway/woocommerce/woocommerce.php:208
    633633msgid "Large"
    634634msgstr ""
    635635
    636 #: payment/gateway/woocommerce/woocommerce.php:211
     636#: payment/gateway/woocommerce/woocommerce.php:214
    637637msgid "Group bank-links by countries"
    638638msgstr ""
    639639
    640 #: payment/gateway/woocommerce/woocommerce.php:218
     640#: payment/gateway/woocommerce/woocommerce.php:221
    641641msgid "Hide country selector"
    642642msgstr ""
    643643
    644 #: payment/gateway/woocommerce/woocommerce.php:219
     644#: payment/gateway/woocommerce/woocommerce.php:222
    645645msgid "Do not display country selector (flags) at payment methods"
    646646msgstr ""
    647647
    648 #: payment/gateway/woocommerce/woocommerce.php:225
     648#: payment/gateway/woocommerce/woocommerce.php:228
    649649msgid "Country selector style"
    650650msgstr ""
    651651
    652 #: payment/gateway/woocommerce/woocommerce.php:229
     652#: payment/gateway/woocommerce/woocommerce.php:232
    653653msgid "Flag"
    654654msgstr ""
    655655
    656 #: payment/gateway/woocommerce/woocommerce.php:230
     656#: payment/gateway/woocommerce/woocommerce.php:233
    657657msgid "Dropdown"
    658658msgstr ""
    659659
    660 #: payment/gateway/woocommerce/woocommerce.php:236
     660#: payment/gateway/woocommerce/woocommerce.php:239
    661661msgid "Define custom order of payment countries"
    662662msgstr ""
    663663
    664 #: payment/gateway/woocommerce/woocommerce.php:238
     664#: payment/gateway/woocommerce/woocommerce.php:241
    665665msgid "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)"
    666666msgstr ""
    667667
    668 #: payment/gateway/woocommerce/woocommerce.php:243
     668#: payment/gateway/woocommerce/woocommerce.php:246
    669669msgid "Define custom order of payment channels"
    670670msgstr ""
    671671
    672 #: payment/gateway/woocommerce/woocommerce.php:245
     672#: payment/gateway/woocommerce/woocommerce.php:248
    673673msgid "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)"
    674674msgstr ""
    675675
    676 #: payment/gateway/woocommerce/woocommerce.php:254
     676#: payment/gateway/woocommerce/woocommerce.php:257
    677677msgid "Credit Card Settings"
    678678msgstr ""
    679679
    680 #: payment/gateway/woocommerce/woocommerce.php:259
     680#: payment/gateway/woocommerce/woocommerce.php:262
    681681msgid "Prefill Credit Card form with customer data"
    682682msgstr ""
    683683
    684 #: payment/gateway/woocommerce/woocommerce.php:262
     684#: payment/gateway/woocommerce/woocommerce.php:265
    685685msgid "It will pass user Name and e-mail address to the Credit Card dialog to make the form filling easier"
    686686msgstr ""
    687687
    688 #: payment/gateway/woocommerce/woocommerce.php:268
     688#: payment/gateway/woocommerce/woocommerce.php:271
    689689msgid "Advanced Settings"
    690690msgstr ""
    691691
    692 #: payment/gateway/woocommerce/woocommerce.php:274
     692#: payment/gateway/woocommerce/woocommerce.php:277
    693693msgid "Update payment methods"
    694694msgstr ""
    695695
    696 #: payment/gateway/woocommerce/woocommerce.php:275
     696#: payment/gateway/woocommerce/woocommerce.php:278
    697697msgid "Update"
    698698msgstr ""
    699699
    700 #: payment/gateway/woocommerce/woocommerce.php:276
     700#: payment/gateway/woocommerce/woocommerce.php:279
    701701msgid "This will update shop configuration from MakeCommerce servers."
    702702msgstr ""
    703703
    704 #: payment/gateway/woocommerce/woocommerce.php:385
     704#: payment/gateway/woocommerce/woocommerce.php:388
    705705msgid "Please select suitable payment option!"
    706706msgstr ""
    707707
    708 #: payment/gateway/woocommerce/woocommerce.php:466
     708#: payment/gateway/woocommerce/woocommerce.php:469
    709709msgid "An error occured when trying to process payment!"
    710710msgstr ""
    711711
    712 #: shipping/label.php:245
     712#: shipping/label.php:254
    713713msgid "Orders %s did not have shipment ID attached so no labels was printed! Please register those packages if you think this is an error!"
    714714msgstr ""
    715715
    716 #: shipping/label.php:296
     716#: shipping/label.php:305
    717717msgid "Register parcel machine shipments"
    718718msgstr ""
    719719
    720 #: shipping/label.php:297
     720#: shipping/label.php:306
    721721msgid "Print parcel machine labels"
    722722msgstr ""
    723723
    724 #: shipping/label.php:344
     724#: shipping/label.php:353
    725725msgid "Print parcel label"
    726726msgstr ""
    727727
    728 #: shipping/label.php:353
     728#: shipping/label.php:362
    729729msgid "Something went wrong generating a label for this order. Please try again! Contact us, if the problem persists."
    730730msgstr ""
    … …  
    741741#: shipping/method/common/omniva.php:56
    742742msgid " can only be used with Estonian, Latvian and Lithuanian numbers that are able to receive SMS (mobile phone)."
     743msgstr ""
     744
     745#: shipping/method/common/smartpost.php:47
     746msgid "SmartPost API Key"
    743747msgstr ""
    744748
    … …  
    889893
    890894#: shipping/method/method.php:596
    891 #: shipping/method/method.php:605
     895#: shipping/method/parcelmachine/lpexpress.php:64
    892896msgid "Shop address country"
    893897msgstr ""
    894898
    895 #: shipping/method/method.php:617
     899#: shipping/method/method.php:607
    896900msgid "Shop address city"
    897901msgstr ""
    898902
    899 #: shipping/method/method.php:623
     903#: shipping/method/method.php:613
    900904msgid "Shop postal code"
    901905msgstr ""
    902906
    903 #: shipping/method/method.php:629
     907#: shipping/method/method.php:619
    904908msgid "Shop address street"
    905909msgstr ""
    906910
    907 #: shipping/method/method.php:646
     911#: shipping/method/method.php:636
    908912msgid "%s web services username"
    909913msgstr ""
    910914
    911 #: shipping/method/method.php:652
     915#: shipping/method/method.php:642
    912916msgid "%s web services password"
    913917msgstr ""
    … …  
    921925msgstr ""
    922926
    923 #: shipping/method/parcelmachine/lpexpress.php:63
     927#: shipping/method/parcelmachine/lpexpress.php:73
    924928msgid "Shop building"
    925929msgstr ""
    926930
    927 #: shipping/method/parcelmachine/lpexpress.php:69
     931#: shipping/method/parcelmachine/lpexpress.php:79
    928932msgid "Shop apartment"
    929933msgstr ""
    930934
    931 #: shipping/method/parcelmachine/lpexpress.php:85
     935#: shipping/method/parcelmachine/lpexpress.php:95
    932936msgid "Parcel to Parcel size XL"
    933937msgstr ""
    … …  
    10061010
    10071011#: shipping/method/parcelmachine/parcelmachine.php:134
    1008 #: shipping/shipping.php:848
     1012#: shipping/shipping.php:857
    10091013msgid "-- select parcel machine --"
    10101014msgstr ""
    10111015
    1012 #: shipping/method/parcelmachine/smartpost.php:30
     1016#: shipping/method/parcelmachine/smartpost.php:32
    10131017msgid "Use authenticable APTs"
    10141018msgstr ""
    10151019
    1016 #: shipping/method/parcelmachine/smartpost.php:32
     1020#: shipping/method/parcelmachine/smartpost.php:34
    10171021msgid "use all APTs"
    10181022msgstr ""
    10191023
    1020 #: shipping/method/parcelmachine/smartpost.php:33
     1024#: shipping/method/parcelmachine/smartpost.php:35
    10211025msgid "use only non-white auth-capable APTs"
    10221026msgstr ""

  • makecommerce/trunk/makecommerce.php

    r2830541 r2884268  
    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.2.0
     12 * Version:               3.2.1
    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.2.0' );
     34define( 'MAKECOMMERCE_VERSION', '3.2.1' );
    3535define( 'MAKECOMMERCE_PLUGIN_ID', 'makecommerce' );
    3636

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

    r2549548 r2884268  
    8787        return true;
    8888    }
     89   
    8990}

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

    r2830541 r2884268  
    4343            case 'indivy-go':
    4444
    45                 return __( 'Buy now, <b>pay on the 15th of the next month</b>', 'wc_makecommerce_domain' );
     45                return __( 'Buy now, <b>pay on the 25th of the next month</b>', 'wc_makecommerce_domain' );
    4646            case 'liisi_ee':
    4747

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

    r2830541 r2884268  
    88
    99    public $id = MAKECOMMERCE_PLUGIN_ID;
    10     public $version = '3.2.0';
     10    public $version = '3.2.1';
    1111   
    1212    public $payment_return_url;
    … …  
    4545
    4646        $this->set_title_by_language();
     47
     48        //has_fields enables our methods for WooCommerce
     49        $this->has_fields = true;
    4750
    4851        //add paylater first time notice

  • makecommerce/trunk/shipping/label.php

    r2830541 r2884268  
    145145                        $shipping_request['credentials'][$carrier_uc] = array( 'carrier' => $carrier_uc, 'username' => $api_user, 'password' => $api_password );
    146146                    }
     147
     148                    // Add Smartpost API key to the request
     149                    if ( $carrier_uc === "SMARTPOST" ) {
     150
     151                        // Replace null with empty String
     152                        isset( $transport_class->settings['api_key'] ) ? $api_key = $transport_class->settings['api_key'] : $api_key = "";
     153
     154                        $shipping_request['credentials'][$carrier_uc]['apiKey'] = $api_key;
     155                    }
    147156                }
    148157               

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

    r2830541 r2884268  
    3636        return '<strong>' . $this->carrier_title . '</strong> ' . __(' can be used with an international phone number only. Please specify your phone number with international country code (e.g. +372xxxxxxx)', 'wc_makecommerce_domain' );
    3737    }
     38
     39    /**
     40     * Loads API key field for SmartPost
     41     *
     42     * @since 3.2.1
     43     */
     44    public function initialize_smartpost_api_field() {
     45
     46        $this->form_fields['api_key'] = array(
     47            'title'            =>  __( 'SmartPost API Key', 'wc_makecommerce_domain' ),
     48            'type'             => 'text',
     49            'default'          => ''
     50        );
     51    }
     52
    3853}

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

    r2622774 r2884268  
    2323    public function initialize_method_form_fields() {
    2424
    25         //Nothing to see here, move along
     25        $this->initialize_smartpost_api_field();
    2626    }
    2727

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

    r2701810 r2884268  
    2424
    2525    public function initialize_method_form_fields() {
    26         // nothing here.
     26
     27        $this->initialize_smartpost_api_field();
     28       
    2729        //option to disable white parcel machines, if only machines capable of recipient authentication are required.
    2830        $this->form_fields['use_white_apts'] = array(

  • makecommerce/trunk/shipping/order.php

    r2830541 r2884268  
    284284            foreach ( $methods as $method ) {
    285285
    286                 echo '<option value="'.$method->id.'"'.($selected_method === $method->id ? ' selected="selected"' : '').'>'.$method->title.'</option>';
     286                echo '<option value="'.$method->id.'"'.($selected_method === $method->id ? ' selected="selected"' : '').'>'.$method->get_method_title().'</option>';
    287287            }
    288288

  • makecommerce/trunk/shipping/shipping.php

    r2830541 r2884268  
    474474                        $shipping_request['credentials'][$carrier_uc] = array( 'carrier' => $carrier_uc, 'username' => $api_user, 'password' => $api_password );
    475475                    }
     476
     477                    // Add Smartpost API key to the request
     478                    if ( $carrier_uc === "SMARTPOST" ) {
     479
     480                        // Replace null with empty String
     481                        isset( $transport_class->settings['api_key'] ) ? $api_key = $transport_class->settings['api_key'] : $api_key = "";
     482
     483                        $shipping_request['credentials'][$carrier_uc]['apiKey'] = $api_key;
     484                    }
    476485                }
    477486
Note: See TracChangeset for help on using the changeset viewer.