Changeset 2816584

Timestamp:

11/11/2022 11:25:39 AM (3 years ago)

Author:

shiptimizeplugins

Message:

v3.1.60 fallback in case plugin is not loaded when shipping method loads

Location:

shiptimize-for-woocommerce/trunk

Files:

• constants.php (modified) (1 diff)
• includes/admin/class-shiptimize-shipping.php (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• shiptimize.php (modified) (1 diff)

shiptimize-for-woocommerce/trunk/constants.php

@@ -4 +4 @@
 define( 'SHIPTIMIZE_API_URL', 'https://api.pakketmail.nl/v3' );
 define( 'SHIPTIMIZE_BRAND', 'Shiptimize' );
-define( 'SHIPTIMIZE_VERSION', '3.1.59' );
+define( 'SHIPTIMIZE_VERSION', '3.1.60' );
 define( 'SHIPTIMIZE_CREATE_ACCOUNT', 'https://www.shiptimize.me/quote/' );
 define( 'SHIPTIMIZE_CHECKOUT', 0);

shiptimize-for-woocommerce/trunk/includes/admin/class-shiptimize-shipping.php

@@ -589 +589 @@
   public  function get_option_string($type,$class,$optionname,$defaultvalue='',$options=''){
       $str= "\$this->instance_form_fields['$optionname'] = array(
-                'title'             => \$shiptimize->translate('$optionname'),
+                'title'             => \$translate('$optionname'),
                 'type'              => '$type',
                 'class'       => '$class',
@@ -748 +748 @@
           );
 
+          // Default to returning the string passed by param 
+          \$translate = function (\$str){ return \$str;}; 
+
           // how it's possible that someone declares this method before there's an instance of the plugin is a mistery to solve later 
           // possible they copied the code and did their own  rendition of the thing? 
-          if(!\$shiptimize) {
+          if(!\$shiptimize && class_exists('WooShiptimize')) {
             \$shiptimize = WooShiptimize::getInstance();
+          }
+
+          # If we have an instance of shiptimize, then use that translate function 
+          if(\$shiptimize) {
+            \$translate = function (\$str) { global \$shiptimize; return \$shiptimize->translate(\$str); };
           }
 
@@ -997 +1005 @@
 
           \$this->init();
-          
+
+          // Default to returning the string passed by param 
+          \$translate = function (\$str){ return \$str;}; 
+
+          // how it's possible that someone declares this method before there's an instance of the plugin is a mistery to solve later 
+          // possible they copied the code and did their own  rendition of the thing? 
+          if(!\$shiptimize && class_exists('WooShiptimize')) {
+            \$shiptimize = WooShiptimize::getInstance();
+          }
+
+          # If we have an instance of shiptimize, then use that translate function 
+          if(\$shiptimize) {
+            \$translate = function (\$str) { global \$shiptimize; return \$shiptimize->translate(\$str); };
+          }
+
           /*Service Level*/
           %s
@@ -1194 +1216 @@
         public function get_admin_options_html()
         {
-            global \$shiptimize; 
             \$shiptimize_options = json_encode(get_option('wbs_'.\$this->instance_id.'_shiptimize'));
             $pickup_behaviour_label;

shiptimize-for-woocommerce/trunk/readme.txt

@@ -59 +59 @@
 == Changelog ==
 
+= 3.1.60 - 2022-11-01 = 
+* Fix - Some shops seem to load shipping methods before the plugin is loaded, triggering an error in trying to use a method in the plugin. We've written a fallback
+
 = 3.1.59 - 2022-11-01 = 
 * Fix - when sending item weight to the api, send the individual item weight not qty * item_weight

shiptimize-for-woocommerce/trunk/shiptimize.php

@@ -3 +3 @@
  * Plugin Name: Shiptimize for WooCommerce
  * Description: Shiptimize for WooCommerce  
- * Version: 3.1.59
+ * Version: 3.1.60
  * Author: Shiptimize
  * Author URI: https://shiptimize.me