WordPress.org
Get WordPress

Plugin Directory

Changeset 2711454


Ignore:
Timestamp:
04/19/2022 08:56:44 AM (4 years ago)
Author:
invisibledragonltd
Message:

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

Location:
deliveryplus-by-invisible-dragon
Files:
4 added
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • deliveryplus-by-invisible-dragon/tags/1.5/class.DeliveryPlus_Filters.php

    r2572959 r2711454  
    7979        require_once "class.DeliveryPlus_Filter_SubTotal.php";
    8080        require_once "class.DeliveryPlus_Filter_Count.php";
     81        require_once "class.DeliveryPlus_Filter_Override.php";
     82        require_once "class.DeliveryPlus_Filter_ShippingClass.php";
    8183
    8284        DeliveryPlus_Filter_Category::activate();
    … …  
    8486        DeliveryPlus_Filter_Weight::activate();
    8587        DeliveryPlus_Filter_Count::activate();
     88        DeliveryPlus_Filter_Override::activate();
     89        DeliveryPlus_Filter_ShippingClass::activate();
    8690    }
    8791
    … …  
    158162
    159163    public static function filter_package( $filters, $package ) {
    160 
     164       
    161165        if(empty($filters)) {
    162166            return true;
    163167        }
    164 
     168       
    165169        foreach($filters as $block) {
    166170

  • deliveryplus-by-invisible-dragon/tags/1.5/class.DeliveryPlus_Shipping_Method.php

    r2572959 r2711454  
    2323                'type'          => 'checkbox',
    2424                'label'         => __( 'Enable this shipping method' ),
    25                 'default'       => 'yes',
     25                'default'       => 'no',
    2626            ),
    2727            'title' => array(
    … …  
    115115        $this->title         = $this->get_option( 'title' );
    116116        $this->internal_name = $this->get_option( 'internal_name' );
    117         $this->rate          = $this->get_option('rate');
     117        $this->rate          = $this->get_option( 'rate' );
     118        $this->tax_status    = $this->get_option( 'tax_status' );
    118119
    119120        if($this->internal_name) {
    … …  
    445446                if(is_array($skip)) {
    446447                    if (in_array($this->instance_id, $skip)) {
    447                         unset($package['contents'][$item_id]);
     448                        if(!apply_filters('idd_override_apply_filters', false)) {
     449                            unset($package['contents'][$item_id]);
     450                        }
    448451                    } else {
    449452                        return;

  • deliveryplus-by-invisible-dragon/tags/1.5/id-delivery.php

    r2465699 r2711454  
    77Author URI: https://invisibledragonltd.com/
    88License: Private
    9 Version: 1.3
     9Version: 1.6
    1010Requires PHP: 5.6
    1111
    … …  
    1414*/
    1515
    16 define('ID_DELIVERY_VERSION', '1.3');
     16define('ID_DELIVERY_VERSION', '1.6');
    1717
    1818add_action( 'plugins_loaded', array( 'DeliveryPlusPlugin', 'get_instance' ) );
    … …  
    365365    }
    366366
    367 
    368 
    369367    public function acf_location_rule_values($rules) {
    370368        return [ 1 => "DeliveryPlus" ];

  • deliveryplus-by-invisible-dragon/tags/1.5/readme.txt

    r2465699 r2711454  
    6969* Actually works without Advanced Custom Fields
    7070* Rate per each shipping class
    71  
     71
     72= 1.4 =
     73* Change which options apply to a product to override filters
     74
     75= 1.5 =
     76* Allow overrides to be a filter
     77
    7278== Upgrade Notice ==
    7379 

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

    r2572959 r2711454  
    7979        require_once "class.DeliveryPlus_Filter_SubTotal.php";
    8080        require_once "class.DeliveryPlus_Filter_Count.php";
     81        require_once "class.DeliveryPlus_Filter_Override.php";
     82        require_once "class.DeliveryPlus_Filter_ShippingClass.php";
    8183
    8284        DeliveryPlus_Filter_Category::activate();
    … …  
    8486        DeliveryPlus_Filter_Weight::activate();
    8587        DeliveryPlus_Filter_Count::activate();
     88        DeliveryPlus_Filter_Override::activate();
     89        DeliveryPlus_Filter_ShippingClass::activate();
    8690    }
    8791
    … …  
    158162
    159163    public static function filter_package( $filters, $package ) {
    160 
     164       
    161165        if(empty($filters)) {
    162166            return true;
    163167        }
    164 
     168       
    165169        foreach($filters as $block) {
    166170

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

    r2572959 r2711454  
    2323                'type'          => 'checkbox',
    2424                'label'         => __( 'Enable this shipping method' ),
    25                 'default'       => 'yes',
     25                'default'       => 'no',
    2626            ),
    2727            'title' => array(
    … …  
    115115        $this->title         = $this->get_option( 'title' );
    116116        $this->internal_name = $this->get_option( 'internal_name' );
    117         $this->rate          = $this->get_option('rate');
     117        $this->rate          = $this->get_option( 'rate' );
     118        $this->tax_status    = $this->get_option( 'tax_status' );
    118119
    119120        if($this->internal_name) {
    … …  
    445446                if(is_array($skip)) {
    446447                    if (in_array($this->instance_id, $skip)) {
    447                         unset($package['contents'][$item_id]);
     448                        if(!apply_filters('idd_override_apply_filters', false)) {
     449                            unset($package['contents'][$item_id]);
     450                        }
    448451                    } else {
    449452                        return;

  • deliveryplus-by-invisible-dragon/trunk/id-delivery.php

    r2465699 r2711454  
    77Author URI: https://invisibledragonltd.com/
    88License: Private
    9 Version: 1.3
     9Version: 1.6
    1010Requires PHP: 5.6
    1111
    … …  
    1414*/
    1515
    16 define('ID_DELIVERY_VERSION', '1.3');
     16define('ID_DELIVERY_VERSION', '1.6');
    1717
    1818add_action( 'plugins_loaded', array( 'DeliveryPlusPlugin', 'get_instance' ) );
    … …  
    365365    }
    366366
    367 
    368 
    369367    public function acf_location_rule_values($rules) {
    370368        return [ 1 => "DeliveryPlus" ];

  • deliveryplus-by-invisible-dragon/trunk/readme.txt

    r2465699 r2711454  
    6969* Actually works without Advanced Custom Fields
    7070* Rate per each shipping class
    71  
     71
     72= 1.4 =
     73* Change which options apply to a product to override filters
     74
     75= 1.5 =
     76* Allow overrides to be a filter
     77
    7278== Upgrade Notice ==
    7379 
Note: See TracChangeset for help on using the changeset viewer.