Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10063 from woothemes/update/normalization-functions-from-unit 

Weight/dimension conversions
This commit is contained in:
Mike Jolley 2016-01-14 08:24:21 +00:00
parent 3e85a61e96 ece376bac1
commit 8237ed288d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/wc-formatting-functions.php
View File

@ -46,11 +46,14 @@ function wc_get_filename_from_url( $file_url ) {
* *
* @param mixed $dim * @param mixed $dim
* @param mixed $to_unit 'in', 'm', 'cm', 'm' * @param mixed $to_unit 'in', 'm', 'cm', 'm'
* @param mixed $from_unit (optional) 'in', 'm', 'cm', 'm'
* @return float * @return float
*/ */
function wc_get_dimension( $dim, $to_unit ) { function wc_get_dimension( $dim, $to_unit, $from_unit = null ) {
$from_unit = strtolower( get_option( 'woocommerce_dimension_unit' ) ); if ( empty( $from_unit ) ) {
$from_unit = strtolower( get_option( 'woocommerce_dimension_unit' ) );
}
$to_unit = strtolower( $to_unit ); $to_unit = strtolower( $to_unit );
// Unify all units to cm first // Unify all units to cm first
@ -97,11 +100,14 @@ function wc_get_dimension( $dim, $to_unit ) {
* *
* @param mixed $weight * @param mixed $weight
* @param mixed $to_unit 'g', 'kg', 'lbs' * @param mixed $to_unit 'g', 'kg', 'lbs'
* @param mixed $from_unit (optional) 'g', 'kg', 'lbs'
* @return float * @return float
*/ */
function wc_get_weight( $weight, $to_unit ) { function wc_get_weight( $weight, $to_unit, $from_unit = null ) {
$from_unit = strtolower( get_option('woocommerce_weight_unit') ); if ( empty( $from_unit ) ) {
$from_unit = strtolower( get_option( 'woocommerce_weight_unit' ) );
}
$to_unit = strtolower( $to_unit ); $to_unit = strtolower( $to_unit );
//Unify all units to kg first //Unify all units to kg first

15
tests/unit-tests/formatting/functions.php
View File

@ -95,10 +95,17 @@ class Functions extends \WC_Unit_Test_Case {
array( 0, wc_get_dimension( -10, 'mm' ) ), array( 0, wc_get_dimension( -10, 'mm' ) ),
); );
$custom = array(
array( 25.4, wc_get_dimension( 10, 'cm', 'in' ) ),
array( 914.4, wc_get_dimension( 10, 'cm', 'yd' ) ),
array( 393.7, wc_get_dimension( 10, 'in', 'm' ) ),
array( 0.010936133, wc_get_dimension( 10, 'yd', 'mm' ) )
);
// restore default // restore default
update_option( 'woocommerce_dimension_unit', $default_unit ); update_option( 'woocommerce_dimension_unit', $default_unit );
return array_merge( $cm, $in, $m, $mm, $yd, $n ); return array_merge( $cm, $in, $m, $mm, $yd, $n, $custom );
} }
@ -152,6 +159,12 @@ class Functions extends \WC_Unit_Test_Case {
$this->assertEquals( 0.6249987469, wc_get_weight( 10, 'lbs' ) ); $this->assertEquals( 0.6249987469, wc_get_weight( 10, 'lbs' ) );
$this->assertEquals( 10, wc_get_weight( 10, 'oz' ) ); $this->assertEquals( 10, wc_get_weight( 10, 'oz' ) );
// custom from unit
$this->assertEquals( 0.283495, wc_get_weight( 10, 'kg', 'oz' ) );
$this->assertEquals( 0.01, wc_get_weight( 10, 'kg', 'g' ) );
$this->assertEquals( 4.53592, wc_get_weight( 10, 'kg', 'lbs' ) );
$this->assertEquals( 10, wc_get_weight( 10, 'kg', 'kg' ) );
// negative // negative
$this->assertEquals( 0, wc_get_weight( -10, 'g' ) ); $this->assertEquals( 0, wc_get_weight( -10, 'g' ) );