Changeset 3013223

Timestamp:

12/22/2023 08:29:20 AM (2 years ago)

Author:

makecommerce

Message:

Release 3.4.1

Location:

makecommerce/trunk

Files:

• README.txt (modified) (2 diffs)
• makecommerce.php (modified) (2 diffs)
• payment/gateway/gateway.php (modified) (2 diffs)
• payment/gateway/woocommerce/woocommerce.php (modified) (1 diff)
• shipping/method/common/dpd.php (modified) (1 diff)
• shipping/method/common/lpexpress.php (modified) (1 diff)
• shipping/method/common/omniva.php (modified) (1 diff)
• shipping/method/common/smartpost.php (modified) (1 diff)
• shipping/method/courier/courier.php (modified) (2 diffs)
• shipping/method/parcelmachine/parcelmachine.php (modified) (2 diffs)

makecommerce/trunk/README.txt

@@ -4 +4 @@
 Requires at least: 5.6.1
 Tested up to: 6.3.2
-Stable tag: 3.4.0
+Stable tag: 3.4.1
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -80 +80 @@
 
 == Changelog ==
+
+= 3.4.1 2023-12-22 =
+* Fix - Correct hook for payment method title filter
+* Fix - Parcel machine translation
 
 = 3.4.0 2023-12-20 =

makecommerce/trunk/makecommerce.php

@@ -10 +10 @@
  * Plugin URI:            https://makecommerce.net/
  * Description:           Adds MakeCommerce payment gateway and Itella/Omniva/DPD parcel machine shipping methods to WooCommerce checkout
- * Version:               3.4.0
+ * Version:               3.4.1
  * Author:                Maksekeskus AS
  * Author URI:            https://makecommerce.net/
@@ -32 +32 @@
  * Start at version 3.0.0 and use SemVer - https://semver.org
  */
-define( 'MAKECOMMERCE_VERSION', '3.4.0' );
+define( 'MAKECOMMERCE_VERSION', '3.4.1' );
 define( 'MAKECOMMERCE_PLUGIN_ID', 'makecommerce' );
 

makecommerce/trunk/payment/gateway/gateway.php

@@ -142 +142 @@
 
         global $woocommerce;
-        
+
         // Woocommerce Multilingual overrides
         if ( \MakeCommerce\i18n::using_language_plugins() ) {
-            add_filter( 'get_post_metadata', array( $this, 'override_payment_method_string' ), 5, 4 );
+            add_filter( 'woocommerce_gateway_title', array( $this, 'override_payment_method_string' ), 25, 2 );
         }
 
@@ -163 +163 @@
      * @since 3.0.0
      */
-    public function override_payment_method_string( $check, $object_id, $meta_key, $single ) {
-        
-        if ( $meta_key == '_payment_method_title' ) {
-
-            $order = wc_get_order( $object_id );
-            $payment_method = $order->get_meta( '_payment_method', true );
-
-            if ( $payment_method == 'makecommerce' ) {
-
-                $language_code = \MakeCommerce\i18n::get_two_char_locale();
-
-                $title = "";
-                //default (no language)
-                if ( !empty( $this->settings['ui_widget_title'] ) ) {
-                    $title = $this->settings['ui_widget_title'];
-                }
-
-                //if method name setting has been set with current language code
-                if ( !empty( $this->settings['ui_widget_title_' . $language_code] ) ) {
-                    $title = $this->settings['ui_widget_title_' . $language_code];
-                }
-
-                if ( $title != "" ) {
-                    return $title;
-                }
-            }
-        }
-
-        return $check;
+    public function override_payment_method_string( $title, $gateway_id ) {
+
+        if ($gateway_id === 'makecommerce') {
+
+            $language_code = \MakeCommerce\i18n::get_two_char_locale();
+
+            //default (no language)
+            if ( !empty( $this->settings['ui_widget_title'] ) ) {
+                $title = $this->settings['ui_widget_title'];
+            }
+
+            //if method name setting has been set with current language code
+            if ( !empty( $this->settings['ui_widget_title_' . $language_code] ) ) {
+                $title = $this->settings['ui_widget_title_' . $language_code];
+            }
+        }
+
+        return $title;
     }
 

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

@@ -14 +14 @@
 
     public $id = MAKECOMMERCE_PLUGIN_ID;
-    public $version = '3.4.0';
+    public $version = '3.4.1';
     
     public $payment_return_url;

makecommerce/trunk/shipping/method/common/dpd.php

@@ -35 +35 @@
      */
     public function phone_number_validation_error() {
-        return '<strong>' . $this->carrier_title . ' ' . $this->identifier . '</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' );
+        return '<strong>' . $this->carrier_title . ' ' . $this->identifierString . '</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' );
     }
 

makecommerce/trunk/shipping/method/common/lpexpress.php

@@ -29 +29 @@
      */
     public function phone_number_validation_error() {
-        return '<strong>' . $this->carrier_title . ' ' . $this->identifier . '</strong> ' . __(' can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)', 'wc_makecommerce_domain' );
+        return '<strong>' . $this->carrier_title . ' ' . $this->identifierString . '</strong> ' . __(' can be used with a Lithuanian phone number only. Please specify your phone number with Lithuanian country code (e.g. +370xxxxxxxx)', 'wc_makecommerce_domain' );
     }
 }

makecommerce/trunk/shipping/method/common/omniva.php

@@ -54 +54 @@
      */
     public function phone_number_validation_error() {
-        return '<strong>' . $this->carrier_title . ' ' . $this->identifier . '</strong> ' . __(' can only be used with Estonian, Latvian and Lithuanian numbers that are able to receive SMS (mobile phone).', 'wc_makecommerce_domain' );
+        return '<strong>' . $this->carrier_title . ' ' . $this->identifierString . '</strong> ' . __(' can only be used with Estonian, Latvian and Lithuanian numbers that are able to receive SMS (mobile phone).', 'wc_makecommerce_domain' );
     }
 }

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

@@ -34 +34 @@
      */
     public function phone_number_validation_error() {
-        return '<strong>' . $this->carrier_title . ' ' . $this->identifier . '</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' );
+        return '<strong>' . $this->carrier_title . ' ' . $this->identifierString . '</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' );
     }
 

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

@@ -14 +14 @@
     public $type = "cou";
     public $identifier = "courier";
+    public $identifierString;
+
 
     /**
@@ -26 +28 @@
 
         //needed for identifier translation
-        $courierString = __( "courier", 'wc_makecommerce_domain' );
+        $this->identifierString = __( "courier", 'wc_makecommerce_domain' );
     }
 

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

@@ -18 +18 @@
     public $type = "apt";
     public $identifier = "parcelmachine";
+    public $identifierString;
+
 
     /**
@@ -63 +65 @@
 
         //needed for identifier translation
-        $parcelmachineString = __( "parcelmachine", 'wc_makecommerce_domain' );
+        $this->identifierString = __( "parcelmachine", 'wc_makecommerce_domain' );
     }