WordPress.org
Get WordPress

Plugin Directory

Changeset 1453033


Ignore:
Timestamp:
07/12/2016 12:05:40 AM (10 years ago)
Author:
opentools
Message:

V1.2.3:

  • Fix update credentials input
  • Fix PHP error when both versions of the plugin are enabled
  • Fix fatal error: Call to a member function isNoShipping() on a non-object...
Location:
shipping-by-rules-for-woocommerce
Files:
6 edited
12 copied

Legend:

Unmodified
Added
Removed

  • shipping-by-rules-for-woocommerce/tags/1.2.3/assets/js/opentools-updatecheck.js

    r1326718 r1453033  
    1010        url: ajaxurl,
    1111        data: {
    12             action: 'getUpdateCredentialsRow',
     12            action: 'getUpdateCredentialsRow_'+slug,
    1313            slug: slug,
    1414            _ajax_nonce: nonce
    … …  
    3333    var tr = jQuery(btn).closest('tr');
    3434    var data = {
    35             action: 'submitUpdateCredentials',
     35            action: 'submitUpdateCredentials_'+slug,
    3636            slug: slug,
    3737            _ajax_nonce: nonce,

  • shipping-by-rules-for-woocommerce/tags/1.2.3/includes/rules_shipping_framework_woocommerce_advanced.php

    r1446091 r1453033  
    1010    die( 'Direct Access to ' . basename( __FILE__ ) . ' is not allowed.' );
    1111}
    12 require_once( plugin_dir_path( __FILE__ ) . '/rules_shipping_framework_woocommerce.php');
     12if (!class_exists('RulesShippingFrameworkWooCommerce')) {
     13    require_once( plugin_dir_path( __FILE__ ) . '/rules_shipping_framework_woocommerce.php');
     14}
    1315
    1416class RulesShippingFrameworkWooCommerceAdvanced extends RulesShippingFrameworkWooCommerce {

  • shipping-by-rules-for-woocommerce/tags/1.2.3/library/rules_shipping_framework.php

    r1370301 r1453033  
    426426        }
    427427        // None of the rules matched, so return NULL, but keep the evaluated results;
    428         $this->match[$id] = $result;
     428        $this->match[$id] = NULL;
    429429        return NULL;
    430430    }
    … …  
    454454        // TODO: This needs to be redone sooner or later!
    455455        $match = $this->evaluateMethodRules ($cart, $method);
    456         if ($match && !is_null ($match['rule'])) {
     456        if ($match && isset($match['rule']) && !is_null ($match['rule'])) {
    457457            $this->setMethodCosts($method, $match, null);
    458458            // If NoShipping is set, this method should NOT offer any shipping at all, so return FALSE, otherwise TRUE
    … …  
    485485            $this->parseMethodRules($method);
    486486        $match = $this->evaluateMethodRules ($cart, $method);
    487         if ($match) {
     487        if ($match && isset($match['rule']) && !is_null ($match['rule'])) {
    488488            if ($this->handleNoShipping($match, $method)) {
    489489                return $results;

  • shipping-by-rules-for-woocommerce/tags/1.2.3/readme.txt

    r1446091 r1453033  
    44Requires at least: 4.0
    55Tested up to: 4.5
    6 Stable tag: 1.2.2
     6Stable tag: 1.2.3
    77License: GPLv3 or later
    88License URI: http://www.gnu.org/licenses/gpl.html
    … …  
    7070== Changelog ==
    7171
     72= 1.2.3 =
     73* Fix update credentials input
     74* Fix PHP error when both versions of the plugin are enabled
     75* Fix fatal error:  Call to a member function isNoShipping() on a non-object...
     76
    7277= 1.2.2 =
    7378* Fix warning about function signature mismatch

  • shipping-by-rules-for-woocommerce/tags/1.2.3/woocommerce-shipping-by-rules.php

    r1446091 r1453033  
    44 * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
    55 * Description: Define Shipping cost by very general and flexible (text-based) rules.
    6  * Version: 1.2.2
     6 * Version: 1.2.3
    77 * Author: Open Tools, Reinhold Kainhofer
    88 * Author URI: http://open-tools.net
    … …  
    4949     * @var string $version Plugin version number.
    5050     */
    51     public $version = '1.2.2';
     51    public $version = '1.2.3';
    5252
    5353

  • shipping-by-rules-for-woocommerce/trunk/assets/js/opentools-updatecheck.js

    r1326718 r1453033  
    1010        url: ajaxurl,
    1111        data: {
    12             action: 'getUpdateCredentialsRow',
     12            action: 'getUpdateCredentialsRow_'+slug,
    1313            slug: slug,
    1414            _ajax_nonce: nonce
    … …  
    3333    var tr = jQuery(btn).closest('tr');
    3434    var data = {
    35             action: 'submitUpdateCredentials',
     35            action: 'submitUpdateCredentials_'+slug,
    3636            slug: slug,
    3737            _ajax_nonce: nonce,

  • shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce_advanced.php

    r1446091 r1453033  
    1010    die( 'Direct Access to ' . basename( __FILE__ ) . ' is not allowed.' );
    1111}
    12 require_once( plugin_dir_path( __FILE__ ) . '/rules_shipping_framework_woocommerce.php');
     12if (!class_exists('RulesShippingFrameworkWooCommerce')) {
     13    require_once( plugin_dir_path( __FILE__ ) . '/rules_shipping_framework_woocommerce.php');
     14}
    1315
    1416class RulesShippingFrameworkWooCommerceAdvanced extends RulesShippingFrameworkWooCommerce {

  • shipping-by-rules-for-woocommerce/trunk/library/rules_shipping_framework.php

    r1370301 r1453033  
    426426        }
    427427        // None of the rules matched, so return NULL, but keep the evaluated results;
    428         $this->match[$id] = $result;
     428        $this->match[$id] = NULL;
    429429        return NULL;
    430430    }
    … …  
    454454        // TODO: This needs to be redone sooner or later!
    455455        $match = $this->evaluateMethodRules ($cart, $method);
    456         if ($match && !is_null ($match['rule'])) {
     456        if ($match && isset($match['rule']) && !is_null ($match['rule'])) {
    457457            $this->setMethodCosts($method, $match, null);
    458458            // If NoShipping is set, this method should NOT offer any shipping at all, so return FALSE, otherwise TRUE
    … …  
    485485            $this->parseMethodRules($method);
    486486        $match = $this->evaluateMethodRules ($cart, $method);
    487         if ($match) {
     487        if ($match && isset($match['rule']) && !is_null ($match['rule'])) {
    488488            if ($this->handleNoShipping($match, $method)) {
    489489                return $results;

  • shipping-by-rules-for-woocommerce/trunk/readme.txt

    r1446091 r1453033  
    44Requires at least: 4.0
    55Tested up to: 4.5
    6 Stable tag: 1.2.2
     6Stable tag: 1.2.3
    77License: GPLv3 or later
    88License URI: http://www.gnu.org/licenses/gpl.html
    … …  
    7070== Changelog ==
    7171
     72= 1.2.3 =
     73* Fix update credentials input
     74* Fix PHP error when both versions of the plugin are enabled
     75* Fix fatal error:  Call to a member function isNoShipping() on a non-object...
     76
    7277= 1.2.2 =
    7378* Fix warning about function signature mismatch

  • shipping-by-rules-for-woocommerce/trunk/woocommerce-shipping-by-rules.php

    r1446091 r1453033  
    44 * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html
    55 * Description: Define Shipping cost by very general and flexible (text-based) rules.
    6  * Version: 1.2.2
     6 * Version: 1.2.3
    77 * Author: Open Tools, Reinhold Kainhofer
    88 * Author URI: http://open-tools.net
    … …  
    4949     * @var string $version Plugin version number.
    5050     */
    51     public $version = '1.2.2';
     51    public $version = '1.2.3';
    5252
    5353
Note: See TracChangeset for help on using the changeset viewer.