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 #24147 from woocommerce/revert-23705-fix/23696 

Revert "Prevent negative prices on products"
This commit is contained in:
Peter Fabian 2019-07-15 11:28:25 +02:00 committed by GitHub
parent 043fd478bc 52f1eb4060
commit cb9d94ed9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/abstracts/abstract-wc-product.php
View File

@ -828,7 +828,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param string $price Price.
*/
public function set_price( $price ) {
$this->set_prop( 'price', wc_format_decimal( $price, false, false, true ) );
$this->set_prop( 'price', wc_format_decimal( $price ) );
}
/**
@ -838,7 +838,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param string $price Regular price.
*/
public function set_regular_price( $price ) {
$this->set_prop( 'regular_price', wc_format_decimal( $price, false, false, true ) );
$this->set_prop( 'regular_price', wc_format_decimal( $price ) );
}
/**
@ -848,7 +848,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param string $price sale price.
*/
public function set_sale_price( $price ) {
$this->set_prop( 'sale_price', wc_format_decimal( $price, false, false, true ) );
$this->set_prop( 'sale_price', wc_format_decimal( $price ) );
}
/**

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

@ -281,12 +281,11 @@ function wc_format_refund_total( $amount ) {
* This function does not remove thousands - this should be done before passing a value to the function.
*
* @param float|string $number Expects either a float or a string with a decimal separator only (no thousands).
* @param bool|integer $dp Number of decimal points to use, blank to use woocommerce_price_num_decimals, or false to avoid all rounding.
* @param mixed $dp number Number of decimal points to use, blank to use woocommerce_price_num_decimals, or false to avoid all rounding.
* @param bool $trim_zeros From end of string.
* @param bool $abs Converts to absolute value of a number. See PHP abs().
* @return string
*/
function wc_format_decimal( $number, $dp = false, $trim_zeros = false, $abs = false ) {
function wc_format_decimal( $number, $dp = false, $trim_zeros = false ) {
$locale = localeconv();
$decimals = array( wc_get_price_decimal_separator(), $locale['decimal_point'], $locale['mon_decimal_point'] );
@ -296,11 +295,6 @@ function wc_format_decimal( $number, $dp = false, $trim_zeros = false, $abs = fa
$number = preg_replace( '/[^0-9\.,-]/', '', wc_clean( $number ) );
}
// Convert to absolute number. Avoid empty values to not convert to 0.
if ( '' !== $number && $abs ) {
$number = abs( $number );
}
if ( false !== $dp ) {
$dp = intval( '' === $dp ? wc_get_price_decimals() : $dp );
$number = number_format( floatval( $number ), $dp, '.', '' );

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

@ -311,15 +311,6 @@ class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
// Trim zeros and round.
$this->assertEquals( '10', wc_format_decimal( 9.9999, '', true ) );
// Negative values.
$this->assertEquals( '-9.9999', wc_format_decimal( -9.9999 ) );
$this->assertEquals( '-10.00', wc_format_decimal( -9.9999, '' ) );
$this->assertEquals( '-9.991', wc_format_decimal( -9.9912, 3 ) );
$this->assertEquals( '-9', wc_format_decimal( -9.00, false, true ) );
// Convert nevative to absolute value.
$this->assertEquals( '9.9999', wc_format_decimal( -9.9999, false, false, true ) );
// Given string with thousands in german format.
update_option( 'woocommerce_price_decimal_sep', ',' );
update_option( 'woocommerce_price_thousand_sep', '.' );