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

Merge remote-tracking branch 'origin/master' 

Conflicts:
	readme.txt
This commit is contained in:
Mike Jolley 2015-03-09 17:05:43 +00:00
parent 457050ae9d f0af0dad6c
commit 40f8ed5140
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/woocommerce.css
View File

File diff suppressed because one or more lines are too long

1
assets/css/woocommerce.scss
View File

@ -1409,7 +1409,6 @@ p.demo_store {
a,
span {
padding: 1px 0;
text-decoration: none;
}
}

1
includes/api/class-wc-api-reports.php
View File

@ -187,6 +187,7 @@ class WC_API_Reports extends WC_API_Resource {
'total_items' => $report_data->total_items,
'total_tax' => wc_format_decimal( $report_data->total_tax + $report_data->total_shipping_tax, 2 ),
'total_shipping' => $report_data->total_shipping,
'total_refunds' => $report_data->total_refunds,
'total_discount' => $report_data->total_coupons,
'totals_grouped_by' => $this->report->chart_groupby,
'totals' => $period_totals,

2
includes/widgets/class-wc-widget-layered-nav.php
View File

@ -396,7 +396,7 @@ class WC_Widget_Layered_Nav extends WC_Widget {
echo ( $count > 0 || $option_is_set ) ? '</a>' : '</span>';
echo ' <small class="count">' . $count . '</small></li>';
echo ' <span class="count">(' . $count . ')</span></li>';
}

1
readme.txt
View File

@ -156,6 +156,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Tweak - Improved message when variation attributes are missing.
* Tweak - Allow wc_attribute_label to support product-level attribute names.
* Tweak - Improved coupon percent calculation for fixed discounts.
* Dev - API - reports/sales now also returns total refunds.
= 2.3.5 - 20/02/2015 =
* Fix - Plain text address formatting.