WordPress.org
Get WordPress

Plugin Directory

Changeset 2993221


Ignore:
Timestamp:
11/09/2023 01:53:39 PM (2 years ago)
Author:
makecommerce
Message:

Release 3.3.1

Location:
makecommerce/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • makecommerce/trunk/README.txt

    r2988356 r2993221  
    44Requires at least: 5.6.1
    55Tested up to: 6.3.2
    6 Stable tag: 3.3.0
     6Stable tag: 3.3.1
    77Requires PHP: 7.4
    88License: GPLv2 or later
    … …  
    7171
    7272== Changelog ==
     73
     74= 3.3.1 2023-11-09 =
     75* Fix - Shipment credentials pickup fix for LV and LT
     76* Fix - Separate credit card payment method identifiers in checkout list view
    7377
    7478= 3.3.0 2023-11-03 =

  • makecommerce/trunk/makecommerce.php

    r2988356 r2993221  
    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.3.0
     12 * Version:               3.3.1
    1313 * Author:                Maksekeskus AS
    1414 * Author URI:            https://makecommerce.net/
    … …  
    2020 * Requires PHP:          7.4
    2121 * WC requires at least:  5.0.0
    22  * WC tested up to:       6.1.1
     22 * WC tested up to:       8.2.1
    2323 */
    2424
    … …  
    3232 * Start at version 3.0.0 and use SemVer - https://semver.org
    3333 */
    34 define( 'MAKECOMMERCE_VERSION', '3.3.0' );
     34define( 'MAKECOMMERCE_VERSION', '3.3.1' );
    3535define( 'MAKECOMMERCE_PLUGIN_ID', 'makecommerce' );
    3636

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

    r2988356 r2993221  
    394394     * @since 3.0.1
    395395     */
    396     private function list_version_item( $method, $card = false ) {
    397 
    398         $banklink_id = $method->country.'_'.$method->name;
     396    private function list_version_item( $method, $card = false, $country = '' ) {
     397
     398        $banklink_value = $banklink_id = $method->country.'_'.$method->name;
    399399        if ( $card ) {
    400             $banklink_id = "card_" . $method->name;
     400            $banklink_value = 'card_' . $method->name;
     401            $banklink_id = 'card_' . $method->name . '_' . $country;
    401402        }
    402403
    … …  
    417418        echo '
    418419        <div class="payment_method_list_item_container">
    419             <input type="radio" id="makecommerce_method_picker_'. $banklink_id .'" name="PRESELECTED_METHOD_'. $this->id .'" value="'. $banklink_id .'"/>
     420            <input type="radio" id="makecommerce_method_picker_'. $banklink_id .'" name="PRESELECTED_METHOD_'. $this->id .'" value="'. $banklink_value .'"/>
    420421           
    421422            <label for="makecommerce_method_picker_' . $banklink_id . '">
    … …  
    511512                if ( $this->is_allowed_method( $method, $cartTotal ) ) {
    512513                    if ( $this->settings['ui_mode'] == 'inline' ) {
    513                         $this->list_version_item( $method, true );
     514                        $this->list_version_item( $method, true, $country );
    514515                    } else {
    515516                        $this->widget_version_item( $method, true );

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

    r2988356 r2993221  
    1414
    1515    public $id = MAKECOMMERCE_PLUGIN_ID;
    16     public $version = '3.3.0';
     16    public $version = '3.3.1';
    1717   
    1818    public $payment_return_url;

  • makecommerce/trunk/shipping/label.php

    r2988356 r2993221  
    103103                $transport_class = new $shipping_classes_map[$shipping_class]($shipping_instance);
    104104                $carrier_uc = mb_strtoupper( $transport_class->carrier_id );
     105
     106                //change carrier_uc if it has been set in the interface.
     107                if ( isset( $transport_class->settings['service_carrier'] ) ) {
     108                    $carrier_uc = $transport_class->settings['service_carrier'];
     109                }
    105110               
    106111                if ( empty( $shipping_request['credentials'][$carrier_uc] ) ) {
    … …  
    108113                    // Move on to next post if the function returned empty values
    109114                    if ( empty( $shipping_request['credentials'][$carrier_uc] ) && empty( $transport_class->settings['use_mk_contract'] ) ) {
    110                         $this->loader->add_action( 'admin_notices', $this, 'mk_admin_error' );
    111115                        continue;
    112116                    }

  • makecommerce/trunk/shipping/shipping.php

    r2988356 r2993221  
    443443                $carrier_uc = mb_strtoupper( $transport_class->carrier_id );
    444444
     445                //change carrier_uc if it has been set in the interface.
     446                if ( isset( $transport_class->settings['service_carrier'] ) ) {
     447                    $carrier_uc = $transport_class->settings['service_carrier'];
     448                }
     449
    445450                if ( empty( $shipping_request['credentials'][$carrier_uc] ) ) {
    446451                    $shipping_request = $this->set_shipping_request_credentials( $carrier_uc, $transport_class, $shipping_request );
    447452                    // Move on to next post if the function returned empty values
    448453                    if ( empty( $shipping_request['credentials'][$carrier_uc] ) && empty( $transport_class->settings['use_mk_contract'] ) ) {
    449                         add_action( 'admin_notices', 'mk_admin_error' );
    450454                        continue;
    451455                    }
    … …  
    814818    public function set_shipping_request_credentials( $carrier_uc, $transport_class, $shipping_request )
    815819    {
    816         //change carrier_uc if it has been set in the interface.
    817         if ( isset( $transport_class->settings['service_carrier'] ) ) {
    818             $carrier_uc = $transport_class->settings['service_carrier'];
    819         }
    820 
    821820        // Carrier is smartpost and the api key is set
    822821        if ( $carrier_uc === "SMARTPOST"
Note: See TracChangeset for help on using the changeset viewer.