Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow 8 number of decimal position for bitcoin #3602 #3681

Merged
merged 8 commits into from
Sep 14, 2018
Merged

fix: allow 8 number of decimal position for bitcoin #3602 #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9da20c8
fix: allow to set 8 number decimal for bitcoin currency
ravinderk Sep 13, 2018
ba69467
fix: sanitize bitcoin amount by ten number decimal when store in db
ravinderk Sep 13, 2018
f92bec3
fix: check or 6 and 10 number of decimal place when sanitize amount
ravinderk Sep 13, 2018
70f56bf
Merge branch 'release/2.3.0' into issue/3602
ravinderk Sep 14, 2018
34e1de5
fix: improve condition logic when set number of decimal setting value
ravinderk Sep 14, 2018
c293a92
refactor: accept donation_id for correct currency formatting
ravinderk Sep 14, 2018
d6e98f0
fix: get currency number of decimal when sanitize amount
ravinderk Sep 14, 2018
cc2b032
fix: pass array argument to give_form_decimal when render total donat…
ravinderk Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions includes/admin/admin-filters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,19 @@ function __give_sanitize_number_decimals_setting_field( $value ) {
Give_Admin_Settings::add_error( 'give-number-decimal', __( 'The \'Number of Decimals\' option has been automatically set to zero because the \'Decimal Separator\' is not set.', 'give' ) );
}

$value = absint( $value );

if ( 8 <= $value ) {
$value = 8;
Give_Admin_Settings::add_error( 'give-number-decimal', __( 'The \'Number of Decimals\' option has been automatically set to 8 because you entered a number higher than the maximum allowed.', 'give' ) );
$value = absint( $value );
$is_currency_set_to_bitcoin = ( 'BTC' === give_get_option( 'currency' ) && ! isset( $_POST['currency'] ) ) || 'BTC' === $_POST['currency'];
$number_decimals = $is_currency_set_to_bitcoin ? 8 : 6;

if ( $number_decimals <= $value ) {
$value = $number_decimals;
Give_Admin_Settings::add_error(
'give-number-decimal',
sprintf(
__( 'The \'Number of Decimals\' option has been automatically set to %s because you entered a number higher than the maximum allowed.', 'give' ),
$number_decimals
)
);
}

return absint( $value );
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/payments/view-payment-details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<p>
<label for="give-payment-total" class="strong"><?php _e( 'Total Donation:', 'give' ); ?></label>&nbsp;
<?php echo give_currency_symbol( $payment->currency ); ?>
&nbsp;<input id="give-payment-total" name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_decimal( give_donation_amount( $payment_id ), false, false ) ); ?>"/>
&nbsp;<input id="give-payment-total" name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_decimal( array( 'donation_id' => $payment_id ) ) ); ?>"/>
</p>
</div>

Expand Down
76 changes: 61 additions & 15 deletions includes/formatting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,19 @@ function give_get_price_decimal_separator( $id_or_currency_code = null ) {
* @since 1.8.12
*
* @param int|float|string $number Expects either a float or a string with a decimal separator only (no thousands)
* @param array|bool $args It accepts 'number_decimals', 'trim_zeros', 'currency'.
* @param array|bool $args It accepts 'number_decimals', 'trim_zeros', 'currency'.
*
* @return string $amount Newly sanitized amount
*/
function give_sanitize_amount_for_db( $number, $args = array() ) {
$args['number_decimals'] = 8;
$args['number_decimals'] = 6;

if (
( isset( $args['currency'] ) && 'BTC' === $args['currency'] )
|| 'BTC' === give_get_currency()
) {
$args['number_decimals'] = 10;
}

return give_maybe_sanitize_amount( $number, $args );
}
Expand Down Expand Up @@ -207,7 +214,7 @@ function give_maybe_sanitize_amount( $number, $args = array() ) {
$thousand_separator = give_get_price_thousand_separator( $args['currency'] );
$decimal_separator = give_get_price_decimal_separator( $args['currency'] );
$number_decimals = is_bool( $args['number_decimals'] ) ?
give_get_price_decimals() :
give_get_price_decimals( $args['currency'] ) :
$args['number_decimals'];

// Explode number by . decimal separator.
Expand All @@ -233,16 +240,16 @@ function give_maybe_sanitize_amount( $number, $args = array() ) {
&& false === strpos( $number, $decimal_separator )
&& 2 === count( $number_parts )
&& ( $number_decimals >= strlen( $number_parts[1] ) )
){
) {
return number_format( $number, $number_decimals, '.', '' );
}

// Handle thousand separator as '.'
// Handle sanitize database values.
$is_db_sanitize_val = ( 2 === count( $number_parts ) &&
is_numeric( $number_parts[0] ) &&
is_numeric( $number_parts[1] ) &&
( 6 === strlen( $number_parts[1] ) ) );
is_numeric( $number_parts[0] ) &&
is_numeric( $number_parts[1] ) &&
( in_array( strlen( $number_parts[1] ), array( 6, 10 ) ) ) );

if ( $is_db_sanitize_val ) {
// Sanitize database value.
Expand Down Expand Up @@ -526,23 +533,62 @@ function give_human_format_large_amount( $amount, $args = array() ) {
*
* @since 1.0
*
* @param int|float|string $amount Formatted or sanitized price
* @param int|bool $dp number of decimals
* @param bool $sanitize Whether or not sanitize number
* @param array $args {
*
* @type int|float|string $amount Formatted or sanitized price. (optional if donation id set)
* @type int $donation_id donation amount (optional if set amount, but provide it for better result if formatting decimal amount of donation).
* @type string $currency donation amount (optional if set donation id). Provide either amount or donation id
* @type int|bool $dp number of decimals
* @type bool $sanitize Whether or not sanitize number
* }
*
* @return string $amount Newly formatted amount or Price Not Available
*/
function give_format_decimal( $amount, $dp = false, $sanitize = true ) {
function give_format_decimal( $args ) {
// Backward compatibility.
if ( ! is_array( $args ) ) {
$func_args = func_get_args();
$args = array(
'amount' => $func_args[0],
'dp' => isset( $func_args[1] ) ? $func_args[1] : false,
'sanitize' => isset( $func_args[2] ) ? $func_args[2] : false,
);
}

$args = wp_parse_args(
$args,
array(
'amount' => '',
'donation_id' => 0,
'currency' => '',
'dp' => false,
'sanitize' => false,
)
);

if( ! empty( $args['donation_id'] ) ) {

// Set currency if not already done.
if( empty( $args['currency'] ) ) {
$args['currency'] = give_get_payment_currency_code( $args['donation_id'] );
}

// Set amount if not already done.
if( empty( $args['amount'] ) ) {
$args['amount'] = give_donation_amount( $args['donation_id'] );
}
}

$decimal_separator = give_get_price_decimal_separator();
$formatted_amount = $sanitize ?
give_maybe_sanitize_amount( $amount, array( 'number_decimals' => $dp ) ) :
number_format( $amount, ( is_bool( $dp ) ? give_get_price_decimals() : $dp ), '.', '' );
$formatted_amount = $args['sanitize'] ?
give_maybe_sanitize_amount( $args['amount'], array( 'number_decimals' => $args['dp'], 'currency' => $args['currency'] ) ) :
number_format( $args['amount'], ( is_bool( $args['dp'] ) ? give_get_price_decimals( $args['currency'] ) : $args['dp'] ), '.', '' );

if ( false !== strpos( $formatted_amount, '.' ) ) {
$formatted_amount = str_replace( '.', $decimal_separator, $formatted_amount );
}

return apply_filters( 'give_format_decimal', $formatted_amount, $amount, $decimal_separator );
return apply_filters( 'give_format_decimal', $formatted_amount, $args['amount'], $decimal_separator, $args );
}

/**
Expand Down