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 #2987 from justinstern/master 

Minor Update
This commit is contained in:
Mike Jolley 2013-04-23 04:02:26 -07:00
parent bf40fab8af 7e982352f3
commit b18daf05a8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/post-types/writepanels/writepanel-order_data.php
View File

@ -346,7 +346,7 @@ function woocommerce_order_items_meta_box( $post ) {
<th class="quantity"><?php _e( 'Qty', 'woocommerce' ); ?></th>
<th class="line_cost"><?php _e( 'Cost', 'woocommerce' ); ?>&nbsp;<a class="tips" data-tip="<?php _e( 'Line subtotals are before pre-tax discounts, totals are after.', 'woocommerce' ); ?>" href="#">[?]</a></th>
<th class="line_cost"><?php _e( 'Totals', 'woocommerce' ); ?>&nbsp;<a class="tips" data-tip="<?php _e( 'Line subtotals are before pre-tax discounts, totals are after.', 'woocommerce' ); ?>" href="#">[?]</a></th>
<?php if ( get_option( 'woocommerce_calc_taxes' ) == 'yes' ) : ?>
<th class="line_tax"><?php _e( 'Tax', 'woocommerce' ); ?></th>
@ -949,4 +949,4 @@ function woocommerce_process_shop_order_meta( $post_id, $post ) {
delete_transient( 'woocommerce_processing_order_count' );
}
add_action( 'woocommerce_process_shop_order_meta', 'woocommerce_process_shop_order_meta', 10, 2 );
add_action( 'woocommerce_process_shop_order_meta', 'woocommerce_process_shop_order_meta', 10, 2 );

2
assets/js/admin/write-panels.js
View File

@ -228,6 +228,8 @@ jQuery( function($){
$row.find('input.line_total').val( total );
$row.find('input.line_subtotal_tax').val( tax );
$row.find('input.line_tax').val( total_tax );
$(this).trigger('quantity_changed');
});
// When subtotal is changed, update the unit costs