Changeset 1485122
- Timestamp:
- 08/28/2016 03:35:20 PM (10 years ago)
- Location:
- shipping-by-rules-for-woocommerce
- Files:
-
- 4 edited
- 13 copied
-
tags/1.2.5 (copied) (copied from shipping-by-rules-for-woocommerce/trunk)
-
tags/1.2.5/LICENSE.txt (copied) (copied from shipping-by-rules-for-woocommerce/trunk/LICENSE.txt)
-
tags/1.2.5/assets (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets)
-
tags/1.2.5/assets/js/opentools-updatecheck.js (copied) (copied from shipping-by-rules-for-woocommerce/trunk/assets/js/opentools-updatecheck.js)
-
tags/1.2.5/includes (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes)
-
tags/1.2.5/includes/rules-shipping-method.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules-shipping-method.php)
-
tags/1.2.5/includes/rules-shipping-post-type.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules-shipping-post-type.php)
-
tags/1.2.5/includes/rules_shipping_framework_woocommerce.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce.php) (1 diff)
-
tags/1.2.5/includes/rules_shipping_framework_woocommerce_advanced.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce_advanced.php)
-
tags/1.2.5/library (copied) (copied from shipping-by-rules-for-woocommerce/trunk/library)
-
tags/1.2.5/library/rules_shipping_framework.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/library/rules_shipping_framework.php) (1 diff)
-
tags/1.2.5/readme.txt (copied) (copied from shipping-by-rules-for-woocommerce/trunk/readme.txt) (2 diffs)
-
tags/1.2.5/woocommerce-shipping-by-rules.php (copied) (copied from shipping-by-rules-for-woocommerce/trunk/woocommerce-shipping-by-rules.php) (2 diffs)
-
trunk/includes/rules_shipping_framework_woocommerce.php (modified) (1 diff)
-
trunk/library/rules_shipping_framework.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/woocommerce-shipping-by-rules.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shipping-by-rules-for-woocommerce/tags/1.2.5/includes/rules_shipping_framework_woocommerce.php
r1470312 r1485122 307 307 /* Get the user from the package information and extract further information about the buyer */ 308 308 $user = $cart['user']; 309 // TODO: Extract user! 310 /** $data['company'] = isset($address['company'])?$address['company']:''; 309 $data['userid'] = $user['ID']; 310 $data['userroles'] = array(); 311 $data['username'] = ''; 312 $data['first_name'] = ''; 313 $data['last_name'] = ''; 314 $data['email'] = ''; 315 if ($user['ID']>0) { 316 $userinfo = get_userdata($user['ID']); 317 $data['userroles'] = $userinfo->roles; 318 $data['username'] = $userinfo->user_login; 319 320 $data['first_name'] = $userinfo->first_name; 321 $data['last_name'] = $userinfo->last_name; 322 323 $data['email'] = isset($address['email'])?$address['email']:''; 324 // TODO: Extract more user fields! 325 /** 326 $data['company'] = isset($address['company'])?$address['company']:''; 311 327 $data['title'] = isset($address['title'])?$address['title']:''; 312 $data['first_name'] = isset($address['title'])?$address['title']:'';313 328 $data['middle_name'] = isset($address['middle_name'])?$address['middle_name']:''; 314 $data['last_name'] = isset($address['last_name'])?$address['last_name']:'';315 329 $data['phone1'] = isset($address['phone_1'])?$address['phone_1']:''; 316 330 $data['phone2'] = isset($address['phone_2'])?$address['phone_2']:''; 317 331 $data['fax'] = isset($address['fax'])?$address['fax']:''; 318 $data['email'] = isset($address['email'])?$address['email']:'';319 332 */ 333 } 320 334 // The country check needs the countryid variable, so duplicate from country: 321 335 $data['countryid'] = $data['country']; 336 322 337 return $data; 323 338 } -
shipping-by-rules-for-woocommerce/tags/1.2.5/library/rules_shipping_framework.php
r1453033 r1485122 917 917 } elseif ($varname=='values') { 918 918 return $vals; 919 } elseif ($varname=='values_debug' || $varname= 'debug_values') {919 } elseif ($varname=='values_debug' || $varname=='debug_values') { 920 920 $tmpvals = $vals; 921 921 unset($tmpvals['debug_cart']); -
shipping-by-rules-for-woocommerce/tags/1.2.5/readme.txt
r1470312 r1485122 4 4 Requires at least: 4.0 5 5 Tested up to: 4.5 6 Stable tag: 1.2. 46 Stable tag: 1.2.5 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/gpl.html … … 70 70 == Changelog == 71 71 72 = 1.2.5 = 73 * Add variables username, first_name, last_name, email 74 * Add list variable userroles (advanced version only) 75 * Fix issue with debug_variables 76 72 77 = 1.2.4 = 73 78 * Fix incompatibility with Cash on Delivery (returned id should be prefixed with the method ID) -
shipping-by-rules-for-woocommerce/tags/1.2.5/woocommerce-shipping-by-rules.php
r1470312 r1485122 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: 1.2. 46 * Version: 1.2.5 7 7 * Author: Open Tools, Reinhold Kainhofer 8 8 * Author URI: http://open-tools.net … … 49 49 * @var string $version Plugin version number. 50 50 */ 51 public $version = '1.2. 4';51 public $version = '1.2.5'; 52 52 53 53 -
shipping-by-rules-for-woocommerce/trunk/includes/rules_shipping_framework_woocommerce.php
r1470312 r1485122 307 307 /* Get the user from the package information and extract further information about the buyer */ 308 308 $user = $cart['user']; 309 // TODO: Extract user! 310 /** $data['company'] = isset($address['company'])?$address['company']:''; 309 $data['userid'] = $user['ID']; 310 $data['userroles'] = array(); 311 $data['username'] = ''; 312 $data['first_name'] = ''; 313 $data['last_name'] = ''; 314 $data['email'] = ''; 315 if ($user['ID']>0) { 316 $userinfo = get_userdata($user['ID']); 317 $data['userroles'] = $userinfo->roles; 318 $data['username'] = $userinfo->user_login; 319 320 $data['first_name'] = $userinfo->first_name; 321 $data['last_name'] = $userinfo->last_name; 322 323 $data['email'] = isset($address['email'])?$address['email']:''; 324 // TODO: Extract more user fields! 325 /** 326 $data['company'] = isset($address['company'])?$address['company']:''; 311 327 $data['title'] = isset($address['title'])?$address['title']:''; 312 $data['first_name'] = isset($address['title'])?$address['title']:'';313 328 $data['middle_name'] = isset($address['middle_name'])?$address['middle_name']:''; 314 $data['last_name'] = isset($address['last_name'])?$address['last_name']:'';315 329 $data['phone1'] = isset($address['phone_1'])?$address['phone_1']:''; 316 330 $data['phone2'] = isset($address['phone_2'])?$address['phone_2']:''; 317 331 $data['fax'] = isset($address['fax'])?$address['fax']:''; 318 $data['email'] = isset($address['email'])?$address['email']:'';319 332 */ 333 } 320 334 // The country check needs the countryid variable, so duplicate from country: 321 335 $data['countryid'] = $data['country']; 336 322 337 return $data; 323 338 } -
shipping-by-rules-for-woocommerce/trunk/library/rules_shipping_framework.php
r1453033 r1485122 917 917 } elseif ($varname=='values') { 918 918 return $vals; 919 } elseif ($varname=='values_debug' || $varname= 'debug_values') {919 } elseif ($varname=='values_debug' || $varname=='debug_values') { 920 920 $tmpvals = $vals; 921 921 unset($tmpvals['debug_cart']); -
shipping-by-rules-for-woocommerce/trunk/readme.txt
r1470312 r1485122 4 4 Requires at least: 4.0 5 5 Tested up to: 4.5 6 Stable tag: 1.2. 46 Stable tag: 1.2.5 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/gpl.html … … 70 70 == Changelog == 71 71 72 = 1.2.5 = 73 * Add variables username, first_name, last_name, email 74 * Add list variable userroles (advanced version only) 75 * Fix issue with debug_variables 76 72 77 = 1.2.4 = 73 78 * Fix incompatibility with Cash on Delivery (returned id should be prefixed with the method ID) -
shipping-by-rules-for-woocommerce/trunk/woocommerce-shipping-by-rules.php
r1470312 r1485122 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: 1.2. 46 * Version: 1.2.5 7 7 * Author: Open Tools, Reinhold Kainhofer 8 8 * Author URI: http://open-tools.net … … 49 49 * @var string $version Plugin version number. 50 50 */ 51 public $version = '1.2. 4';51 public $version = '1.2.5'; 52 52 53 53
Note: See TracChangeset
for help on using the changeset viewer.