Changeset 1828586
- Timestamp:
- 02/24/2018 10:24:15 PM (8 years ago)
- Location:
- shipping-by-rules-for-woocommerce
- Files:
-
- 3 edited
- 22 copied
-
tags/2.0.6 (copied) (copied from shipping-by-rules-for-woocommerce/trunk)
-
tags/2.0.6/LICENSE.txt (copied) (copied from shipping-by-rules-for-woocommerce/trunk/LICENSE.txt)
-
tags/2.0.6/assets (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets)
-
tags/2.0.6/assets/css/admin-styles.css (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/css/admin-styles.css)
-
tags/2.0.6/assets/css/legacy-admin-styles.css (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/css/legacy-admin-styles.css)
-
tags/2.0.6/assets/js/legacy-shipping-by-rules-config.js (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/js/legacy-shipping-by-rules-config.js)
-
tags/2.0.6/assets/js/opentools-updatecheck.js (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/js/opentools-updatecheck.js)
-
tags/2.0.6/assets/js/shipping-by-rules-config.js (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/js/shipping-by-rules-config.js)
-
tags/2.0.6/includes (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes)
-
tags/2.0.6/includes/admin/html/html-rulesyntax-help.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/admin/html/html-rulesyntax-help.php)
-
tags/2.0.6/includes/admin/html/html-shipping-methods.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/admin/html/html-shipping-methods.php)
-
tags/2.0.6/includes/admin/html/html-upgrade-nag.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/admin/html/html-upgrade-nag.php)
-
tags/2.0.6/includes/rules-shipping-method.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules-shipping-method.php)
-
tags/2.0.6/includes/rules-shipping-post-type.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules-shipping-post-type.php)
-
tags/2.0.6/includes/rules_shipping_framework_woocommerce.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce.php) (3 diffs)
-
tags/2.0.6/includes/rules_shipping_framework_woocommerce_advanced.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce_advanced.php)
-
tags/2.0.6/legacy-includes (copied) (copied from shipping-by-rules-for-woocommerce/trunk/legacy-includes)
-
tags/2.0.6/legacy-woocommerce-shipping-by-rules.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/legacy-woocommerce-shipping-by-rules.php)
-
tags/2.0.6/library (copied) (copied from shipping-by-rules-for-woocommerce/trunk/library)
-
tags/2.0.6/library/rules_shipping_framework.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/library/rules_shipping_framework.php)
-
tags/2.0.6/readme.txt (copied) (copied from shipping-by-rules-for-woocommerce/trunk/readme.txt) (2 diffs)
-
tags/2.0.6/woocommerce-shipping-by-rules.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/woocommerce-shipping-by-rules.php) (1 diff)
-
trunk/includes/rules_shipping_framework_woocommerce.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/woocommerce-shipping-by-rules.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
shipping-by-rules-for-woocommerce/tags/2.0.6/includes/rules_shipping_framework_woocommerce.php
r1828573 r1828586 24 24 "skus" => 'products', 25 25 "vendors" => 'vendors', 26 "shippingclasses" => 'shippingclasses', 26 27 )); 27 28 } … … 474 475 continue; 475 476 477 if (!empty($filter_conditions['shippingclasses'])) { 478 $shipclass = $p['data']->get_shipping_class(); 479 if ($shipclass) { 480 if (!in_array($shipclass, $filter_conditions['shippingclasses'] )) 481 continue; 482 } else { 483 // No shipping class set for product, but scoping has a valid shipping clase => filter out product 484 continue; 485 } 486 } 487 476 488 if (!empty($filter_conditions['vendors'])) { 477 489 // Collect all vendors (ids and slug/login_name - PLUGIN-specific!) … … 481 493 482 494 // THIRD-PARTY SUPPORT 483 // "WC Vendors" support (vendors stored as post author)484 if (class_exists("WC_Vendors") ) {495 // "WC Vendors" and "Dokan Marketplace" support (vendors stored as post author) 496 if (class_exists("WC_Vendors") || class_exists("WeDevs_Dokan")) { 485 497 $vendor = $p['data']->post->post_author; 486 498 $vnd = get_user_by('id', $vendor); // Get user name by user id -
shipping-by-rules-for-woocommerce/tags/2.0.6/readme.txt
r1828573 r1828586 4 4 Requires at least: 4.0 5 5 Tested up to: 4.9.4 6 Stable tag: 2.0. 56 Stable tag: 2.0.6 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/gpl.html … … 69 69 70 70 == Changelog == 71 72 = 2.0.6 = 73 * Add function evaluate_for_shippingclasses 71 74 72 75 = 2.0.5 = -
shipping-by-rules-for-woocommerce/tags/2.0.6/woocommerce-shipping-by-rules.php
r1828573 r1828586 4 4 * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html 5 5 * Description: Define Shipping cost by very general and flexible (text-based) rules. 6 * Version: 2.0. 56 * Version: 2.0.6 7 7 * Author: Open Tools, Reinhold Kainhofer 8 8 * Author URI: http://open-tools.net -
shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce.php
r1828573 r1828586 24 24 "skus" => 'products', 25 25 "vendors" => 'vendors', 26 "shippingclasses" => 'shippingclasses', 26 27 )); 27 28 } … … 474 475 continue; 475 476 477 if (!empty($filter_conditions['shippingclasses'])) { 478 $shipclass = $p['data']->get_shipping_class(); 479 if ($shipclass) { 480 if (!in_array($shipclass, $filter_conditions['shippingclasses'] )) 481 continue; 482 } else { 483 // No shipping class set for product, but scoping has a valid shipping clase => filter out product 484 continue; 485 } 486 } 487 476 488 if (!empty($filter_conditions['vendors'])) { 477 489 // Collect all vendors (ids and slug/login_name - PLUGIN-specific!) … … 481 493 482 494 // THIRD-PARTY SUPPORT 483 // "WC Vendors" support (vendors stored as post author)484 if (class_exists("WC_Vendors") ) {495 // "WC Vendors" and "Dokan Marketplace" support (vendors stored as post author) 496 if (class_exists("WC_Vendors") || class_exists("WeDevs_Dokan")) { 485 497 $vendor = $p['data']->post->post_author; 486 498 $vnd = get_user_by('id', $vendor); // Get user name by user id -
shipping-by-rules-for-woocommerce/trunk/readme.txt
r1828573 r1828586 4 4 Requires at least: 4.0 5 5 Tested up to: 4.9.4 6 Stable tag: 2.0. 56 Stable tag: 2.0.6 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/gpl.html … … 69 69 70 70 == Changelog == 71 72 = 2.0.6 = 73 * Add function evaluate_for_shippingclasses 71 74 72 75 = 2.0.5 = -
shipping-by-rules-for-woocommerce/trunk/woocommerce-shipping-by-rules.php
r1828573 r1828586 4 4 * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html 5 5 * Description: Define Shipping cost by very general and flexible (text-based) rules. 6 * Version: 2.0. 56 * Version: 2.0.6 7 7 * Author: Open Tools, Reinhold Kainhofer 8 8 * Author URI: http://open-tools.net
Note: See TracChangeset
for help on using the changeset viewer.