Changeset 2572959

Timestamp:

07/27/2021 10:11:30 AM (4 years ago)

Author:

invisibledragonltd

Message:

Update to version 1.4 from GitLab (​https://gitlab.com/invisibledragon/id-delivery; ​https://gitlab.com/invisibledragon/id-delivery/-/jobs/1455048977)

Location:

deliveryplus-by-invisible-dragon

Files:

• tags/1.4 (copied) (copied from deliveryplus-by-invisible-dragon/trunk)
• tags/1.4/class.DeliveryPlus_Filters.php (modified) (1 diff)
• tags/1.4/class.DeliveryPlus_Shipping_Method.php (modified) (2 diffs)
• trunk/class.DeliveryPlus_Filters.php (modified) (1 diff)
• trunk/class.DeliveryPlus_Shipping_Method.php (modified) (2 diffs)

deliveryplus-by-invisible-dragon/tags/1.4/class.DeliveryPlus_Filters.php

@@ -46 +46 @@
         $conditions = static::get_conditions(array());
         foreach($conditions as $key => $val) {
-            add_filter( 'deliveryplus_filter_' . static::$category . '_' . $key, array( static::class, 'do_' . $key ), 10, 3 );
+            if( method_exists(static::class, 'do_' . $key) ) {
+                add_filter('deliveryplus_filter_' . static::$category . '_' . $key, array(static::class, 'do_' . $key), 10, 3);
+            }
         }
 

deliveryplus-by-invisible-dragon/tags/1.4/class.DeliveryPlus_Shipping_Method.php

@@ -414 +414 @@
             if(method_exists($prod, 'get_meta')) {
                 $skip = $prod->get_meta('idd_options');
-                if(is_array($skip) && !in_array($this->instance_id, $skip)) {
-                    return false;
-                }
+                if(is_array($skip) && in_array($this->instance_id, $skip)) {
+                    continue;
+                }
             }
+
+            return false;
+
         }
         return true;
@@ -435 +438 @@
         );
 
-        if(!$this->filter_package($package)) {
-            return;
-        }
+        foreach ( $package['contents'] as $item_id => $values ) {
+            $prod = $values['data'];
+
+            if(method_exists($prod, 'get_meta')) {
+                $skip = $prod->get_meta('idd_options');
+                if(is_array($skip)) {
+                    if (in_array($this->instance_id, $skip)) {
+                        unset($package['contents'][$item_id]);
+                    } else {
+                        return;
+                    }
+                }
+            }
+
+        }
 
         $filters = json_decode($this->get_option('filter'), true);
-        if(!empty($filters)) {
+        if(!empty($filters) && count($package['contents']) > 0) {
             if(!DeliveryPlus_Filters::filter_package($filters, $package)) {
-                return; // Do not add rate
+                return;
             }
         }

deliveryplus-by-invisible-dragon/trunk/class.DeliveryPlus_Filters.php

@@ -46 +46 @@
         $conditions = static::get_conditions(array());
         foreach($conditions as $key => $val) {
-            add_filter( 'deliveryplus_filter_' . static::$category . '_' . $key, array( static::class, 'do_' . $key ), 10, 3 );
+            if( method_exists(static::class, 'do_' . $key) ) {
+                add_filter('deliveryplus_filter_' . static::$category . '_' . $key, array(static::class, 'do_' . $key), 10, 3);
+            }
         }
 

deliveryplus-by-invisible-dragon/trunk/class.DeliveryPlus_Shipping_Method.php

@@ -414 +414 @@
             if(method_exists($prod, 'get_meta')) {
                 $skip = $prod->get_meta('idd_options');
-                if(is_array($skip) && !in_array($this->instance_id, $skip)) {
-                    return false;
-                }
+                if(is_array($skip) && in_array($this->instance_id, $skip)) {
+                    continue;
+                }
             }
+
+            return false;
+
         }
         return true;
@@ -435 +438 @@
         );
 
-        if(!$this->filter_package($package)) {
-            return;
-        }
+        foreach ( $package['contents'] as $item_id => $values ) {
+            $prod = $values['data'];
+
+            if(method_exists($prod, 'get_meta')) {
+                $skip = $prod->get_meta('idd_options');
+                if(is_array($skip)) {
+                    if (in_array($this->instance_id, $skip)) {
+                        unset($package['contents'][$item_id]);
+                    } else {
+                        return;
+                    }
+                }
+            }
+
+        }
 
         $filters = json_decode($this->get_option('filter'), true);
-        if(!empty($filters)) {
+        if(!empty($filters) && count($package['contents']) > 0) {
             if(!DeliveryPlus_Filters::filter_package($filters, $package)) {
-                return; // Do not add rate
+                return;
             }
         }