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

Merge branch 'master' of github.com:woothemes/woocommerce

This commit is contained in:
claudiosmweb 2014-12-01 21:56:45 -02:00
parent 3ce620e4f3 af57cd0e30
commit 5d9a1ad908
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/admin.css
View File

File diff suppressed because one or more lines are too long

10
assets/css/admin.scss
View File

@ -2664,6 +2664,16 @@ img.help_tip {
padding: 5px 20px 5px 162px !important; /** Padding for aligning labels left - 12px + 150 label width **/ 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, label,
legend { legend {
float: left; float: left;

2
assets/js/frontend/checkout.js
View File

@ -83,7 +83,7 @@ jQuery( function( $ ) {
url: wc_checkout_params.ajax_url, url: wc_checkout_params.ajax_url,
data: data, data: data,
success: function( data ) { success: function( data ) {
console.log( data ); // console.log( data );
if ( data && data.fragments ) { if ( data && data.fragments ) {
$.each( data.fragments, function( key, value ) { $.each( data.fragments, function( key, value ) {

4
includes/admin/reports/class-wc-report-taxes-by-code.php
View File

@ -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 ) ); $rate = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate FROM {$wpdb->prefix}woocommerce_tax_rates WHERE tax_rate_id = %d;", $rate_id ) );
?> ?>
<tr> <tr>
<th scope="row"><?php echo $tax_row->tax_rate; ?></th> <th scope="row"><?php echo apply_filters( 'woocommerce_reports_taxes_tax_rate', $tax_row->tax_rate, $rate_id, $tax_row ); ?></th>
<td><?php echo $rate; ?>%</td> <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 $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->tax_amount ); ?></td>
<td class="total_row"><?php echo wc_price( $tax_row->shipping_tax_amount ); ?></td> <td class="total_row"><?php echo wc_price( $tax_row->shipping_tax_amount ); ?></td>