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

Correct discount calculation in admin when fees are involved. Closes #5103

This commit is contained in:
Mike Jolley 2014-03-14 13:20:59 +00:00
parent ad5f510979
commit abfafa7ce3
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
includes/admin/post-types/meta-boxes/class-wc-meta-box-order-items.php
View File

@ -137,29 +137,21 @@ class WC_Meta_Box_Order_Items {
if ( isset( $order_item_tax_class[ $item_id ] ) ) if ( isset( $order_item_tax_class[ $item_id ] ) )
wc_update_order_item_meta( $item_id, '_tax_class', wc_clean( $order_item_tax_class[ $item_id ] ) ); wc_update_order_item_meta( $item_id, '_tax_class', wc_clean( $order_item_tax_class[ $item_id ] ) );
if ( isset( $line_subtotal[ $item_id ] ) ) { // Get values. Subtotals might not exist, in which case copy value from total field
wc_update_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( $line_subtotal[ $item_id ] ) ); $line_total[ $item_id ] = isset( $line_total[ $item_id ] ) ? $line_total[ $item_id ] : 0;
$line_tax[ $item_id ] = isset( $line_tax[ $item_id ] ) ? $line_tax[ $item_id ] : 0;
$line_subtotal[ $item_id ] = isset( $line_subtotal[ $item_id ] ) ? $line_subtotal[ $item_id ] : $line_total[ $item_id ];
$line_subtotal_tax[ $item_id ] = isset( $line_subtotal_tax[ $item_id ] ) ? $line_subtotal_tax[ $item_id ] : $line_tax[ $item_id ];
$subtotal += wc_format_decimal( $line_subtotal[ $item_id ] ); // Update values
} wc_update_order_item_meta( $item_id, '_line_subtotal', wc_format_decimal( $line_subtotal[ $item_id ] ) );
wc_update_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( $line_subtotal_tax[ $item_id ] ) );
wc_update_order_item_meta( $item_id, '_line_total', wc_format_decimal( $line_total[ $item_id ] ) );
wc_update_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $line_tax[ $item_id ] ) );
if ( isset( $line_subtotal_tax[ $item_id ] ) ) { // Total up
wc_update_order_item_meta( $item_id, '_line_subtotal_tax', wc_format_decimal( $line_subtotal_tax[ $item_id ] ) ); $subtotal += wc_format_decimal( $line_subtotal[ $item_id ] ) + wc_format_decimal( $line_subtotal_tax[ $item_id ] );
$total += wc_format_decimal( $line_total[ $item_id ] ) + wc_format_decimal( $line_tax[ $item_id ] );
$subtotal += wc_format_decimal( $line_subtotal_tax[ $item_id ] );
}
if ( isset( $line_total[ $item_id ] ) ) {
wc_update_order_item_meta( $item_id, '_line_total', wc_format_decimal( $line_total[ $item_id ] ) );
$total += wc_format_decimal( $line_total[ $item_id ] );
}
if ( isset( $line_tax[ $item_id ] ) ) {
wc_update_order_item_meta( $item_id, '_line_tax', wc_format_decimal( $line_tax[ $item_id ] ) );
$total += wc_format_decimal( $line_tax[ $item_id ] );
}
// Clear meta cache // Clear meta cache
wp_cache_delete( $item_id, 'order_item_meta' ); wp_cache_delete( $item_id, 'order_item_meta' );
@ -176,7 +168,7 @@ class WC_Meta_Box_Order_Items {
$wpdb->update( $wpdb->update(
$wpdb->prefix . "woocommerce_order_itemmeta", $wpdb->prefix . "woocommerce_order_itemmeta",
array( array(
'meta_key' => $meta_key, 'meta_key' => $meta_key,
'meta_value' => $meta_value 'meta_value' => $meta_value
), ),
array( 'meta_id' => $id ), array( 'meta_id' => $id ),