From e1fd72d06b6f41fb6d8a5a1007020fa621557b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= Date: Tue, 4 Dec 2018 13:29:58 -0600 Subject: [PATCH] Fix 'categories' value in Categories report table summary (https://github.com/woocommerce/woocommerce-admin/pull/995) * Add table summary to Revenue report * Fix 'categories' value in Categories report table summary --- .../client/analytics/components/report-table/index.js | 5 +++-- .../client/analytics/report/categories/table.js | 7 ++++--- .../client/analytics/report/revenue/table.js | 9 +++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/woocommerce-admin/client/analytics/components/report-table/index.js b/plugins/woocommerce-admin/client/analytics/components/report-table/index.js index 45f4b71fa47..3a8e653922c 100644 --- a/plugins/woocommerce-admin/client/analytics/components/report-table/index.js +++ b/plugins/woocommerce-admin/client/analytics/components/report-table/index.js @@ -51,7 +51,8 @@ class ReportTable extends Component { const ids = itemIdField ? orderedItems.map( item => item[ itemIdField ] ) : null; const rows = getRowsContent( orderedItems ); const totals = get( primaryData, [ 'data', 'totals' ], null ); - const summary = getSummary ? getSummary( totals ) : null; + const totalCount = items.totalCount || 0; + const summary = getSummary ? getSummary( totals, totalCount ) : null; return ( ); diff --git a/plugins/woocommerce-admin/client/analytics/report/categories/table.js b/plugins/woocommerce-admin/client/analytics/report/categories/table.js index fc237f95829..d484da8b12a 100644 --- a/plugins/woocommerce-admin/client/analytics/report/categories/table.js +++ b/plugins/woocommerce-admin/client/analytics/report/categories/table.js @@ -98,14 +98,15 @@ export default class CategoriesReportTable extends Component { } ); } - getSummary( totals ) { + getSummary( totals, totalCount ) { if ( ! totals ) { return []; } + return [ { - label: _n( 'category', 'categories', totals.categories_count, 'wc-admin' ), - value: numberFormat( totals.categories_count ), + label: _n( 'category', 'categories', totalCount, 'wc-admin' ), + value: numberFormat( totalCount ), }, { label: _n( 'item sold', 'items sold', totals.items_sold, 'wc-admin' ), diff --git a/plugins/woocommerce-admin/client/analytics/report/revenue/table.js b/plugins/woocommerce-admin/client/analytics/report/revenue/table.js index e31fa76ca46..e7854d53197 100644 --- a/plugins/woocommerce-admin/client/analytics/report/revenue/table.js +++ b/plugins/woocommerce-admin/client/analytics/report/revenue/table.js @@ -162,18 +162,15 @@ class RevenueReportTable extends Component { } ); } - getSummary( totals ) { + getSummary( totals, totalCount ) { if ( ! totals ) { return []; } - const { tableData } = this.props; - const daysCount = tableData.items.totalCount; - return [ { - label: _n( 'day', 'days', daysCount, 'wc-admin' ), - value: numberFormat( daysCount ), + label: _n( 'day', 'days', totalCount, 'wc-admin' ), + value: numberFormat( totalCount ), }, { label: _n( 'order', 'orders', totals.orders_count, 'wc-admin' ),