Merge branch 'master' of github.com:woothemes/woocommerce
This commit is contained in:
commit
5d9a1ad908
File diff suppressed because one or more lines are too long
|
@ -2664,6 +2664,16 @@ img.help_tip {
|
|||
padding: 5px 20px 5px 162px !important; /** Padding for aligning labels left - 12px + 150 label width **/
|
||||
}
|
||||
|
||||
.sale_price_dates_fields {
|
||||
.short:first-of-type {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.short:nth-of-type(2) {
|
||||
clear: left;
|
||||
}
|
||||
}
|
||||
|
||||
label,
|
||||
legend {
|
||||
float: left;
|
||||
|
|
|
@ -83,7 +83,7 @@ jQuery( function( $ ) {
|
|||
url: wc_checkout_params.ajax_url,
|
||||
data: data,
|
||||
success: function( data ) {
|
||||
console.log( data );
|
||||
// console.log( data );
|
||||
if ( data && data.fragments ) {
|
||||
|
||||
$.each( data.fragments, function( key, value ) {
|
||||
|
|
|
@ -154,8 +154,8 @@ class WC_Report_Taxes_By_Code extends WC_Admin_Report {
|
|||
$rate = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %d;", $rate_id ) );
|
||||
?>
|
||||
<tr>
|
||||
<th scope="row"><?php echo $tax_row->tax_rate; ?></th>
|
||||
<td><?php echo $rate; ?>%</td>
|
||||
<th scope="row"><?php echo apply_filters( 'woocommerce_reports_taxes_tax_rate', $tax_row->tax_rate, $rate_id, $tax_row ); ?></th>
|
||||
<td><?php echo apply_filters( 'woocommerce_reports_taxes_rate', $rate, $rate_id, $tax_row ); ?>%</td>
|
||||
<td class="total_row"><?php echo $tax_row->total_orders; ?></td>
|
||||
<td class="total_row"><?php echo wc_price( $tax_row->tax_amount ); ?></td>
|
||||
<td class="total_row"><?php echo wc_price( $tax_row->shipping_tax_amount ); ?></td>
|
||||
|
|
Loading…
Reference in New Issue