Changeset 2826503

Timestamp:

11/30/2022 01:21:15 PM (3 years ago)

Author:

posturinn

Message:

Tagging version 1.1.3

Location:

posturinn

Files:

• tags/1.1.3 (copied) (copied from posturinn/trunk)
• tags/1.1.3/css/postis-admin-order.css (copied) (copied from posturinn/trunk/css/postis-admin-order.css)
• tags/1.1.3/css/remodal-default-theme.css (copied) (copied from posturinn/trunk/css/remodal-default-theme.css)
• tags/1.1.3/css/remodal.css (copied) (copied from posturinn/trunk/css/remodal.css)
• tags/1.1.3/inc/admin.class.php (copied) (copied from posturinn/trunk/inc/admin.class.php)
• tags/1.1.3/inc/api.class.php (copied) (copied from posturinn/trunk/inc/api.class.php) (2 diffs)
• tags/1.1.3/inc/callbacks.php (deleted)
• tags/1.1.3/inc/checkout-fields.class.php (copied) (copied from posturinn/trunk/inc/checkout-fields.class.php)
• tags/1.1.3/inc/functions.php (copied) (copied from posturinn/trunk/inc/functions.php) (4 diffs)
• tags/1.1.3/inc/hooks.php (copied) (copied from posturinn/trunk/inc/hooks.php)
• tags/1.1.3/inc/postis.class.php (copied) (copied from posturinn/trunk/inc/postis.class.php) (2 diffs)
• tags/1.1.3/js/postis-admin-order.js (copied) (copied from posturinn/trunk/js/postis-admin-order.js)
• tags/1.1.3/js/postis-googlemap.js (copied) (copied from posturinn/trunk/js/postis-googlemap.js)
• tags/1.1.3/js/remodal.js (copied) (copied from posturinn/trunk/js/remodal.js)
• tags/1.1.3/languages/postis-is_IS.mo (copied) (copied from posturinn/trunk/languages/postis-is_IS.mo)
• tags/1.1.3/languages/postis-is_IS.po (copied) (copied from posturinn/trunk/languages/postis-is_IS.po)
• tags/1.1.3/languages/postis.pot (copied) (copied from posturinn/trunk/languages/postis.pot)
• tags/1.1.3/readme.txt (copied) (copied from posturinn/trunk/readme.txt) (2 diffs)
• tags/1.1.3/templates/shipment-options.php (copied) (copied from posturinn/trunk/templates/shipment-options.php)
• tags/1.1.3/wc-posturinn-shipping-api.php (copied) (copied from posturinn/trunk/wc-posturinn-shipping-api.php) (1 diff)
• trunk/inc/api.class.php (modified) (2 diffs)
• trunk/inc/functions.php (modified) (4 diffs)
• trunk/inc/postis.class.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/wc-posturinn-shipping-api.php (modified) (1 diff)

posturinn/tags/1.1.3/inc/api.class.php

@@ -128 +128 @@
         
         $valid_phonenumber     = isset($postmeta['phonenumber']) && $postmeta['phonenumber'] != '' ? wc_sanitize_phone_number( $postmeta['phonenumber'] ): $customer_phone;
-        
+        $valid_phonenumber = str_replace('+354','',$valid_phonenumber);
         if ( isset($dynamic_opt_control['cod']) && $dynamic_opt_control['cod'] ) {
             $order_total = $order->get_total();
@@ -201 +201 @@
         }else{
             if ($shipping_service == 'DPP' OR $shipping_service == 'DPH') {
-                if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
+                if (substr($valid_phonenumber, 0, 1) === '6' || substr($valid_phonenumber, 0, 1) === '7' || substr($valid_phonenumber, 0, 1) === '8') {
                     // phoneNumber is valid
                 } else {

posturinn/tags/1.1.3/inc/functions.php

@@ -44 +44 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> weight;
+        return (float)$product -> weight;
     } else {
-        return $product -> get_weight();
+        return (float)$product -> get_weight();
     }
 }
@@ -56 +56 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> width;
+        return (int)$product -> width;
     } else {
-        return $product -> get_width();
+        return (int)$product -> get_width();
     }
 }
@@ -68 +68 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> height;
+        return (int)$product -> height;
     } else {
-        return $product -> get_height();
+        return (int)$product -> get_height();
     }
 }
@@ -80 +80 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> length;
+        return (int)$product -> length;
     } else {
-        return $product -> get_length();
+        return (int)$product -> get_length();
     }
 }

posturinn/tags/1.1.3/inc/postis.class.php

@@ -161 +161 @@
                         'desc_tip'      => true,
                     ),
+                    'lang_switcher' => array(
+                        'title'       => __( 'Shipping method language', 'postis' ),
+                        'type'        => 'select',
+                        'options' => array( 'default' => 'System default',
+                                            'is' => 'Icelandic',
+                                            'en' => 'English'
+                                        ),
+                        'default'     => 'default',
+                        'description' =>  __( 'Select language for shipping method titles in cart and checkout. If system default is chosen then it will show user locale.', 'postis' ),
+                        'desc_tip'      => true,
+                    ),
                     'postis_services_table' => array(
                         'type'              => 'postis_services_table'
@@ -399 +410 @@
             } else {
                 $locale_api_lang = 'en';
+            }
+            $lang_switcher = postis_get_settings( 'lang_switcher' );
+            if (isset($lang_switcher) && $lang_switcher !== '' && $lang_switcher !== 'default') {
+                $locale_api_lang = $lang_switcher;
             }
 

posturinn/tags/1.1.3/readme.txt

@@ -3 +3 @@
 Tags: shipping, posturinn, icelandic post shipping, shipping rates, woocommerce
 Requires at least: 4.3
-Tested up to: 6.0.2
+Tested up to: 6.1.1
 Requires PHP: 5.6
 Stable tag: trunk
@@ -26 +26 @@
 
 == Changelog ==
+= 1.1.3 =
+fixed country code on receipient phone number
+fixed int and floats in weight and size
+added language switcher
+
 = 1.1.2 =
 add option to remove tariff line item in international shipping

posturinn/tags/1.1.3/wc-posturinn-shipping-api.php

@@ -3 +3 @@
  * Plugin Name: Pósturinn's Shipping with WooCommerce
  * Description: This plugin is an WooCommerce extension to extend shipping method with Pósturinn's - Iceland
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Pósturinn
  * Author URI: https://postur.is

posturinn/trunk/inc/api.class.php

@@ -128 +128 @@
         
         $valid_phonenumber     = isset($postmeta['phonenumber']) && $postmeta['phonenumber'] != '' ? wc_sanitize_phone_number( $postmeta['phonenumber'] ): $customer_phone;
-        
+        $valid_phonenumber = str_replace('+354','',$valid_phonenumber);
         if ( isset($dynamic_opt_control['cod']) && $dynamic_opt_control['cod'] ) {
             $order_total = $order->get_total();
@@ -201 +201 @@
         }else{
             if ($shipping_service == 'DPP' OR $shipping_service == 'DPH') {
-                if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
+                if (substr($valid_phonenumber, 0, 1) === '6' || substr($valid_phonenumber, 0, 1) === '7' || substr($valid_phonenumber, 0, 1) === '8') {
                     // phoneNumber is valid
                 } else {

posturinn/trunk/inc/functions.php

@@ -44 +44 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> weight;
+        return (float)$product -> weight;
     } else {
-        return $product -> get_weight();
+        return (float)$product -> get_weight();
     }
 }
@@ -56 +56 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> width;
+        return (int)$product -> width;
     } else {
-        return $product -> get_width();
+        return (int)$product -> get_width();
     }
 }
@@ -68 +68 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> height;
+        return (int)$product -> height;
     } else {
-        return $product -> get_height();
+        return (int)$product -> get_height();
     }
 }
@@ -80 +80 @@
     if ( version_compare( WC_VERSION, '2.7', '<' ) ) {  
         // vesion less then 2.7
-        return $product -> length;
+        return (int)$product -> length;
     } else {
-        return $product -> get_length();
+        return (int)$product -> get_length();
     }
 }

posturinn/trunk/inc/postis.class.php

@@ -161 +161 @@
                         'desc_tip'      => true,
                     ),
+                    'lang_switcher' => array(
+                        'title'       => __( 'Shipping method language', 'postis' ),
+                        'type'        => 'select',
+                        'options' => array( 'default' => 'System default',
+                                            'is' => 'Icelandic',
+                                            'en' => 'English'
+                                        ),
+                        'default'     => 'default',
+                        'description' =>  __( 'Select language for shipping method titles in cart and checkout. If system default is chosen then it will show user locale.', 'postis' ),
+                        'desc_tip'      => true,
+                    ),
                     'postis_services_table' => array(
                         'type'              => 'postis_services_table'
@@ -399 +410 @@
             } else {
                 $locale_api_lang = 'en';
+            }
+            $lang_switcher = postis_get_settings( 'lang_switcher' );
+            if (isset($lang_switcher) && $lang_switcher !== '' && $lang_switcher !== 'default') {
+                $locale_api_lang = $lang_switcher;
             }
 

posturinn/trunk/readme.txt

@@ -3 +3 @@
 Tags: shipping, posturinn, icelandic post shipping, shipping rates, woocommerce
 Requires at least: 4.3
-Tested up to: 6.0.2
+Tested up to: 6.1.1
 Requires PHP: 5.6
 Stable tag: trunk
@@ -26 +26 @@
 
 == Changelog ==
+= 1.1.3 =
+fixed country code on receipient phone number
+fixed int and floats in weight and size
+added language switcher
+
 = 1.1.2 =
 add option to remove tariff line item in international shipping

posturinn/trunk/wc-posturinn-shipping-api.php

@@ -3 +3 @@
  * Plugin Name: Pósturinn's Shipping with WooCommerce
  * Description: This plugin is an WooCommerce extension to extend shipping method with Pósturinn's - Iceland
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Pósturinn
  * Author URI: https://postur.is