Dynamic Currency with Context API (https://github.com/woocommerce/woocommerce-admin/pull/4027)
* Make currency setting dynamic with context API * reference Currency * what is 'this' * remove comment * All report tables * Customers report * activity panel * leaderboard test * business details * store details * single source of truth * shipping rates * remove currency-format.js * tidy up * make Currency a factory function * factory revenue table * tables * Chart y-axis labels * customers table * cleanup * business details * shipping * number-format * stock and downloads tables * changelog * cleanup * SQL example: update to dynamic currencies (https://github.com/woocommerce/woocommerce-admin/pull/4033)
This commit is contained in:
parent
ac52cf7f92
commit
cb4ba39e30
|
@ -6,33 +6,41 @@ import { mount, shallow } from 'enzyme';
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { formatCurrency, getCurrencyFormatDecimal } from 'lib/currency-format';
|
import { numberFormat } from '@woocommerce/number';
|
||||||
import { numberFormat } from 'lib/number-format';
|
import Currency from '@woocommerce/currency';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import { Leaderboard } from '../';
|
import { Leaderboard } from '../';
|
||||||
import mockData from '../data/top-selling-products-mock-data';
|
import mockData from '../data/top-selling-products-mock-data';
|
||||||
|
import { CURRENCY } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
|
const { formatCurrency, formatDecimal } = Currency( CURRENCY );
|
||||||
|
|
||||||
const rows = mockData.map( ( row ) => {
|
const rows = mockData.map( ( row ) => {
|
||||||
const { name, items_sold: itemsSold, net_revenue: netRevenue, orders_count: ordersCount } = row;
|
const {
|
||||||
|
name,
|
||||||
|
items_sold: itemsSold,
|
||||||
|
net_revenue: netRevenue,
|
||||||
|
orders_count: ordersCount,
|
||||||
|
} = row;
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
display: '<a href="#">' + name + '</a>',
|
display: '<a href="#">' + name + '</a>',
|
||||||
value: name,
|
value: name,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: numberFormat( itemsSold ),
|
display: numberFormat( CURRENCY, itemsSold ),
|
||||||
value: itemsSold,
|
value: itemsSold,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: numberFormat( ordersCount ),
|
display: numberFormat( CURRENCY, ordersCount ),
|
||||||
value: ordersCount,
|
value: ordersCount,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatCurrency( netRevenue ),
|
display: formatCurrency( netRevenue ),
|
||||||
value: getCurrencyFormatDecimal( netRevenue ),
|
value: formatDecimal( netRevenue ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
} );
|
} );
|
||||||
|
@ -85,7 +93,7 @@ describe( 'Leaderboard', () => {
|
||||||
expect( firstRow[ 1 ].value ).toBe( mockData[ 0 ].items_sold );
|
expect( firstRow[ 1 ].value ).toBe( mockData[ 0 ].items_sold );
|
||||||
expect( firstRow[ 2 ].value ).toBe( mockData[ 0 ].orders_count );
|
expect( firstRow[ 2 ].value ).toBe( mockData[ 0 ].orders_count );
|
||||||
expect( firstRow[ 3 ].value ).toBe(
|
expect( firstRow[ 3 ].value ).toBe(
|
||||||
getCurrencyFormatDecimal( mockData[ 0 ].net_revenue )
|
formatDecimal( mockData[ 0 ].net_revenue )
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
|
@ -93,10 +101,10 @@ describe( 'Leaderboard', () => {
|
||||||
).toBe( 5 );
|
).toBe( 5 );
|
||||||
expect( tableItems.at( 0 ).text() ).toBe( mockData[ 0 ].name );
|
expect( tableItems.at( 0 ).text() ).toBe( mockData[ 0 ].name );
|
||||||
expect( tableItems.at( 1 ).text() ).toBe(
|
expect( tableItems.at( 1 ).text() ).toBe(
|
||||||
numberFormat( mockData[ 0 ].items_sold )
|
numberFormat( CURRENCY, mockData[ 0 ].items_sold )
|
||||||
);
|
);
|
||||||
expect( tableItems.at( 2 ).text() ).toBe(
|
expect( tableItems.at( 2 ).text() ).toBe(
|
||||||
numberFormat( mockData[ 0 ].orders_count )
|
numberFormat( CURRENCY, mockData[ 0 ].orders_count )
|
||||||
);
|
);
|
||||||
expect( tableItems.at( 3 ).text() ).toBe(
|
expect( tableItems.at( 3 ).text() ).toBe(
|
||||||
formatCurrency( mockData[ 0 ].net_revenue )
|
formatCurrency( mockData[ 0 ].net_revenue )
|
||||||
|
|
|
@ -20,8 +20,8 @@ import {
|
||||||
getPreviousDate,
|
getPreviousDate,
|
||||||
} from 'lib/date';
|
} from 'lib/date';
|
||||||
import { Chart } from '@woocommerce/components';
|
import { Chart } from '@woocommerce/components';
|
||||||
import { CURRENCY } from '@woocommerce/wc-admin-settings';
|
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
|
@ -80,9 +80,18 @@ export class ReportChart extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getTimeChartData() {
|
getTimeChartData() {
|
||||||
const { query, primaryData, secondaryData, selectedChart, defaultDateRange } = this.props;
|
const {
|
||||||
|
query,
|
||||||
|
primaryData,
|
||||||
|
secondaryData,
|
||||||
|
selectedChart,
|
||||||
|
defaultDateRange,
|
||||||
|
} = this.props;
|
||||||
const currentInterval = getIntervalForQuery( query );
|
const currentInterval = getIntervalForQuery( query );
|
||||||
const { primary, secondary } = getCurrentDates( query, defaultDateRange );
|
const { primary, secondary } = getCurrentDates(
|
||||||
|
query,
|
||||||
|
defaultDateRange
|
||||||
|
);
|
||||||
|
|
||||||
const chartData = primaryData.data.intervals.map( function(
|
const chartData = primaryData.data.intervals.map( function(
|
||||||
interval,
|
interval,
|
||||||
|
@ -159,6 +168,7 @@ export class ReportChart extends Component {
|
||||||
const emptyMessage = emptySearchResults
|
const emptyMessage = emptySearchResults
|
||||||
? __( 'No data for the current search', 'woocommerce-admin' )
|
? __( 'No data for the current search', 'woocommerce-admin' )
|
||||||
: __( 'No data for the selected date range', 'woocommerce-admin' );
|
: __( 'No data for the selected date range', 'woocommerce-admin' );
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
return (
|
return (
|
||||||
<Chart
|
<Chart
|
||||||
allowedIntervals={ allowedIntervals }
|
allowedIntervals={ allowedIntervals }
|
||||||
|
@ -184,13 +194,14 @@ export class ReportChart extends Component {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
tooltipValueFormat={ getTooltipValueFormat(
|
tooltipValueFormat={ getTooltipValueFormat(
|
||||||
selectedChart.type
|
selectedChart.type,
|
||||||
|
formatCurrency
|
||||||
) }
|
) }
|
||||||
chartType={ getChartTypeForQuery( query ) }
|
chartType={ getChartTypeForQuery( query ) }
|
||||||
valueType={ selectedChart.type }
|
valueType={ selectedChart.type }
|
||||||
xFormat={ formats.xFormat }
|
xFormat={ formats.xFormat }
|
||||||
x2Format={ formats.x2Format }
|
x2Format={ formats.x2Format }
|
||||||
currency={ CURRENCY }
|
currency={ getCurrency() }
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -243,6 +254,8 @@ export class ReportChart extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ReportChart.contextType = CurrencyContext;
|
||||||
|
|
||||||
ReportChart.propTypes = {
|
ReportChart.propTypes = {
|
||||||
/**
|
/**
|
||||||
* Filters available for that report.
|
* Filters available for that report.
|
||||||
|
@ -341,7 +354,10 @@ export default compose(
|
||||||
const limitBy = limitProperties || [ endpoint ];
|
const limitBy = limitProperties || [ endpoint ];
|
||||||
const selectedFilter = getSelectedFilter( filters, query );
|
const selectedFilter = getSelectedFilter( filters, query );
|
||||||
const filterParam = get( selectedFilter, [ 'settings', 'param' ] );
|
const filterParam = get( selectedFilter, [ 'settings', 'param' ] );
|
||||||
const chartMode = props.mode || getChartMode( selectedFilter, query ) || 'time-comparison';
|
const chartMode =
|
||||||
|
props.mode ||
|
||||||
|
getChartMode( selectedFilter, query ) ||
|
||||||
|
'time-comparison';
|
||||||
const { woocommerce_default_date_range: defaultDateRange } = select(
|
const { woocommerce_default_date_range: defaultDateRange } = select(
|
||||||
SETTINGS_STORE_NAME
|
SETTINGS_STORE_NAME
|
||||||
).getSetting( 'wc_admin', 'wcAdminSettings' );
|
).getSetting( 'wc_admin', 'wcAdminSettings' );
|
||||||
|
|
|
@ -17,12 +17,12 @@ import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import { recordEvent } from 'lib/tracks';
|
import { recordEvent } from 'lib/tracks';
|
||||||
import { Currency } from 'lib/currency-format';
|
|
||||||
import {
|
import {
|
||||||
getCurrentDates,
|
getCurrentDates,
|
||||||
getDateParamsFromQuery,
|
getDateParamsFromQuery,
|
||||||
isoDateFormat,
|
isoDateFormat,
|
||||||
} from 'lib/date';
|
} from 'lib/date';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class ReportFilters extends Component {
|
class ReportFilters extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -92,12 +92,22 @@ class ReportFilters extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { advancedFilters, filters, path, query, showDatePicker, defaultDateRange } = this.props;
|
const {
|
||||||
const { period, compare, before, after } = getDateParamsFromQuery( query, defaultDateRange );
|
advancedFilters,
|
||||||
const { primary: primaryDate, secondary: secondaryDate } = getCurrentDates(
|
filters,
|
||||||
|
path,
|
||||||
|
query,
|
||||||
|
showDatePicker,
|
||||||
|
defaultDateRange,
|
||||||
|
} = this.props;
|
||||||
|
const { period, compare, before, after } = getDateParamsFromQuery(
|
||||||
query,
|
query,
|
||||||
defaultDateRange
|
defaultDateRange
|
||||||
);
|
);
|
||||||
|
const {
|
||||||
|
primary: primaryDate,
|
||||||
|
secondary: secondaryDate,
|
||||||
|
} = getCurrentDates( query, defaultDateRange );
|
||||||
const dateQuery = {
|
const dateQuery = {
|
||||||
period,
|
period,
|
||||||
compare,
|
compare,
|
||||||
|
@ -106,6 +116,8 @@ class ReportFilters extends Component {
|
||||||
primaryDate,
|
primaryDate,
|
||||||
secondaryDate,
|
secondaryDate,
|
||||||
};
|
};
|
||||||
|
const Currency = this.context;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Filters
|
<Filters
|
||||||
query={ query }
|
query={ query }
|
||||||
|
@ -125,7 +137,9 @@ class ReportFilters extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default withSelect( select => {
|
ReportFilters.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default withSelect( ( select ) => {
|
||||||
const { woocommerce_default_date_range: defaultDateRange } = select(
|
const { woocommerce_default_date_range: defaultDateRange } = select(
|
||||||
SETTINGS_STORE_NAME
|
SETTINGS_STORE_NAME
|
||||||
).getSetting( 'wc_admin', 'wcAdminSettings' );
|
).getSetting( 'wc_admin', 'wcAdminSettings' );
|
||||||
|
|
|
@ -16,8 +16,7 @@ import {
|
||||||
SummaryListPlaceholder,
|
SummaryListPlaceholder,
|
||||||
SummaryNumber,
|
SummaryNumber,
|
||||||
} from '@woocommerce/components';
|
} from '@woocommerce/components';
|
||||||
import { calculateDelta, formatValue } from 'lib/number-format';
|
import { calculateDelta, formatValue } from '@woocommerce/number';
|
||||||
import { formatCurrency } from 'lib/currency-format';
|
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,15 +26,17 @@ import { getSummaryNumbers } from 'wc-api/reports/utils';
|
||||||
import ReportError from 'analytics/components/report-error';
|
import ReportError from 'analytics/components/report-error';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
import { recordEvent } from 'lib/tracks';
|
import { recordEvent } from 'lib/tracks';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Component to render summary numbers in reports.
|
* Component to render summary numbers in reports.
|
||||||
*/
|
*/
|
||||||
export class ReportSummary extends Component {
|
export class ReportSummary extends Component {
|
||||||
formatVal( val, type ) {
|
formatVal( val, type ) {
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
return type === 'currency'
|
return type === 'currency'
|
||||||
? formatCurrency( val )
|
? formatCurrency( val )
|
||||||
: formatValue( type, val );
|
: formatValue( getCurrency(), type, val );
|
||||||
}
|
}
|
||||||
|
|
||||||
getValues( key, type ) {
|
getValues( key, type ) {
|
||||||
|
@ -192,6 +193,8 @@ ReportSummary.defaultProps = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ReportSummary.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const {
|
const {
|
||||||
|
|
|
@ -9,14 +9,9 @@ import { map } from 'lodash';
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import {
|
|
||||||
formatCurrency,
|
|
||||||
getCurrencyFormatDecimal,
|
|
||||||
renderCurrency,
|
|
||||||
} from 'lib/currency-format';
|
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { Link } from '@woocommerce/components';
|
import { Link } from '@woocommerce/components';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
|
@ -24,12 +19,14 @@ import { formatValue } from 'lib/number-format';
|
||||||
import CategoryBreacrumbs from './breadcrumbs';
|
import CategoryBreacrumbs from './breadcrumbs';
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class CategoriesReportTable extends Component {
|
class CategoriesReportTable extends Component {
|
||||||
constructor( props ) {
|
constructor( props ) {
|
||||||
super( props );
|
super( props );
|
||||||
|
|
||||||
this.getRowsContent = this.getRowsContent.bind( this );
|
this.getRowsContent = this.getRowsContent.bind( this );
|
||||||
|
this.getSummary = this.getSummary.bind( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
getHeadersContent() {
|
getHeadersContent() {
|
||||||
|
@ -71,6 +68,13 @@ class CategoriesReportTable extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getRowsContent( categoryStats ) {
|
getRowsContent( categoryStats ) {
|
||||||
|
const {
|
||||||
|
render: renderCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
|
|
||||||
return map( categoryStats, ( categoryStat ) => {
|
return map( categoryStats, ( categoryStat ) => {
|
||||||
const {
|
const {
|
||||||
category_id: categoryId,
|
category_id: categoryId,
|
||||||
|
@ -95,7 +99,7 @@ class CategoriesReportTable extends Component {
|
||||||
value: category && category.name,
|
value: category && category.name,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', itemsSold ),
|
display: formatValue( currency, 'number', itemsSold ),
|
||||||
value: itemsSold,
|
value: itemsSold,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -115,13 +119,13 @@ class CategoriesReportTable extends Component {
|
||||||
) }
|
) }
|
||||||
type="wc-admin"
|
type="wc-admin"
|
||||||
>
|
>
|
||||||
{ formatValue( 'number', productsCount ) }
|
{ formatValue( currency, 'number', productsCount ) }
|
||||||
</Link>
|
</Link>
|
||||||
),
|
),
|
||||||
value: productsCount,
|
value: productsCount,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', ordersCount ),
|
display: formatValue( currency, 'number', ordersCount ),
|
||||||
value: ordersCount,
|
value: ordersCount,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
@ -129,7 +133,13 @@ class CategoriesReportTable extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getSummary( totals, totalResults = 0 ) {
|
getSummary( totals, totalResults = 0 ) {
|
||||||
const { items_sold: itemsSold = 0, net_revenue: netRevenue = 0, orders_count: ordersCount = 0 } = totals;
|
const {
|
||||||
|
items_sold: itemsSold = 0,
|
||||||
|
net_revenue: netRevenue = 0,
|
||||||
|
orders_count: ordersCount = 0,
|
||||||
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -138,7 +148,7 @@ class CategoriesReportTable extends Component {
|
||||||
totalResults,
|
totalResults,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', totalResults ),
|
value: formatValue( currency, 'number', totalResults ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -147,7 +157,7 @@ class CategoriesReportTable extends Component {
|
||||||
itemsSold,
|
itemsSold,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', itemsSold ),
|
value: formatValue( currency, 'number', itemsSold ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'net sales', 'woocommerce-admin' ),
|
label: __( 'net sales', 'woocommerce-admin' ),
|
||||||
|
@ -160,7 +170,7 @@ class CategoriesReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -207,6 +217,8 @@ class CategoriesReportTable extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CategoriesReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const { isRequesting, query } = props;
|
const { isRequesting, query } = props;
|
||||||
|
|
|
@ -10,17 +10,17 @@ import { map } from 'lodash';
|
||||||
*/
|
*/
|
||||||
import { Date, Link } from '@woocommerce/components';
|
import { Date, Link } from '@woocommerce/components';
|
||||||
import { defaultTableDateFormat } from 'lib/date';
|
import { defaultTableDateFormat } from 'lib/date';
|
||||||
import { formatCurrency, getCurrencyFormatDecimal } from 'lib/currency-format';
|
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getSetting } from '@woocommerce/wc-admin-settings';
|
import { getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
export default class CouponsReportTable extends Component {
|
class CouponsReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -71,9 +71,18 @@ export default class CouponsReportTable extends Component {
|
||||||
const { query } = this.props;
|
const { query } = this.props;
|
||||||
const persistedQuery = getPersistedQuery( query );
|
const persistedQuery = getPersistedQuery( query );
|
||||||
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
||||||
|
const {
|
||||||
|
formatCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
|
||||||
return map( coupons, ( coupon ) => {
|
return map( coupons, ( coupon ) => {
|
||||||
const { amount, coupon_id: couponId, orders_count: ordersCount } = coupon;
|
const {
|
||||||
|
amount,
|
||||||
|
coupon_id: couponId,
|
||||||
|
orders_count: ordersCount,
|
||||||
|
} = coupon;
|
||||||
const extendedInfo = coupon.extended_info || {};
|
const extendedInfo = coupon.extended_info || {};
|
||||||
const {
|
const {
|
||||||
code,
|
code,
|
||||||
|
@ -102,7 +111,7 @@ export default class CouponsReportTable extends Component {
|
||||||
} );
|
} );
|
||||||
const ordersLink = (
|
const ordersLink = (
|
||||||
<Link href={ ordersUrl } type="wc-admin">
|
<Link href={ ordersUrl } type="wc-admin">
|
||||||
{ formatValue( 'number', ordersCount ) }
|
{ formatValue( getCurrency(), 'number', ordersCount ) }
|
||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -148,7 +157,13 @@ export default class CouponsReportTable extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getSummary( totals ) {
|
getSummary( totals ) {
|
||||||
const { coupons_count: couponsCount = 0, orders_count: ordersCount = 0, amount = 0 } = totals;
|
const {
|
||||||
|
coupons_count: couponsCount = 0,
|
||||||
|
orders_count: ordersCount = 0,
|
||||||
|
amount = 0,
|
||||||
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -157,7 +172,7 @@ export default class CouponsReportTable extends Component {
|
||||||
couponsCount,
|
couponsCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', couponsCount ),
|
value: formatValue( currency, 'number', couponsCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -166,7 +181,7 @@ export default class CouponsReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'amount discounted', 'woocommerce-admin' ),
|
label: __( 'amount discounted', 'woocommerce-admin' ),
|
||||||
|
@ -216,3 +231,7 @@ export default class CouponsReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CouponsReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default CouponsReportTable;
|
||||||
|
|
|
@ -8,9 +8,8 @@ import { Tooltip } from '@wordpress/components';
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { formatCurrency, getCurrencyFormatDecimal } from 'lib/currency-format';
|
|
||||||
import { Date, Link } from '@woocommerce/components';
|
import { Date, Link } from '@woocommerce/components';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { defaultTableDateFormat } from 'lib/date';
|
import { defaultTableDateFormat } from 'lib/date';
|
||||||
|
|
||||||
|
@ -20,8 +19,9 @@ const { countries } = getSetting( 'dataEndpoints', { countries: {} } );
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
export default class CustomersReportTable extends Component {
|
class CustomersReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -114,6 +114,11 @@ export default class CustomersReportTable extends Component {
|
||||||
|
|
||||||
getRowsContent( customers ) {
|
getRowsContent( customers ) {
|
||||||
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
||||||
|
const {
|
||||||
|
formatCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
|
||||||
return customers.map( ( customer ) => {
|
return customers.map( ( customer ) => {
|
||||||
const {
|
const {
|
||||||
|
@ -145,19 +150,13 @@ export default class CustomersReportTable extends Component {
|
||||||
);
|
);
|
||||||
|
|
||||||
const dateLastActiveDisplay = dateLastActive ? (
|
const dateLastActiveDisplay = dateLastActive ? (
|
||||||
<Date
|
<Date date={ dateLastActive } visibleFormat={ dateFormat } />
|
||||||
date={ dateLastActive }
|
|
||||||
visibleFormat={ dateFormat }
|
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
'—'
|
'—'
|
||||||
);
|
);
|
||||||
|
|
||||||
const dateRegisteredDisplay = dateRegistered ? (
|
const dateRegisteredDisplay = dateRegistered ? (
|
||||||
<Date
|
<Date date={ dateRegistered } visibleFormat={ dateFormat } />
|
||||||
date={ dateRegistered }
|
|
||||||
visibleFormat={ dateFormat }
|
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
'—'
|
'—'
|
||||||
);
|
);
|
||||||
|
@ -193,7 +192,11 @@ export default class CustomersReportTable extends Component {
|
||||||
value: email,
|
value: email,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', ordersCount ),
|
display: formatValue(
|
||||||
|
getCurrency(),
|
||||||
|
'number',
|
||||||
|
ordersCount
|
||||||
|
),
|
||||||
value: ordersCount,
|
value: ordersCount,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -231,6 +234,8 @@ export default class CustomersReportTable extends Component {
|
||||||
avg_total_spend: avgTotalSpend = 0,
|
avg_total_spend: avgTotalSpend = 0,
|
||||||
avg_avg_order_value: avgAvgOrderValue = 0,
|
avg_avg_order_value: avgAvgOrderValue = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -239,7 +244,7 @@ export default class CustomersReportTable extends Component {
|
||||||
customersCount,
|
customersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', customersCount ),
|
value: formatValue( currency, 'number', customersCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -248,7 +253,7 @@ export default class CustomersReportTable extends Component {
|
||||||
avgOrdersCount,
|
avgOrdersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', avgOrdersCount ),
|
value: formatValue( currency, 'number', avgOrdersCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'average lifetime spend', 'woocommerce-admin' ),
|
label: __( 'average lifetime spend', 'woocommerce-admin' ),
|
||||||
|
@ -294,3 +299,7 @@ export default class CustomersReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CustomersReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default CustomersReportTable;
|
||||||
|
|
|
@ -13,7 +13,7 @@ import moment from 'moment';
|
||||||
import { getCurrentDates, defaultTableDateFormat } from 'lib/date';
|
import { getCurrentDates, defaultTableDateFormat } from 'lib/date';
|
||||||
import { Date, Link } from '@woocommerce/components';
|
import { Date, Link } from '@woocommerce/components';
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class CouponsReportTable extends Component {
|
class CouponsReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -150,11 +151,12 @@ class CouponsReportTable extends Component {
|
||||||
const after = moment( dates.primary.after );
|
const after = moment( dates.primary.after );
|
||||||
const before = moment( dates.primary.before );
|
const before = moment( dates.primary.before );
|
||||||
const days = before.diff( after, 'days' ) + 1;
|
const days = before.diff( after, 'days' ) + 1;
|
||||||
|
const currency = this.context.getCurrency();
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n( 'day', 'days', days, 'woocommerce-admin' ),
|
label: _n( 'day', 'days', days, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', days ),
|
value: formatValue( currency, 'number', days ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -163,7 +165,7 @@ class CouponsReportTable extends Component {
|
||||||
downloadCount,
|
downloadCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', downloadCount ),
|
value: formatValue( currency, 'number', downloadCount ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -191,6 +193,8 @@ class CouponsReportTable extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CouponsReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default withSelect( ( select ) => {
|
export default withSelect( ( select ) => {
|
||||||
const { woocommerce_default_date_range: defaultDateRange } = select(
|
const { woocommerce_default_date_range: defaultDateRange } = select(
|
||||||
SETTINGS_STORE_NAME
|
SETTINGS_STORE_NAME
|
||||||
|
|
|
@ -31,6 +31,10 @@ import CustomersReport from './customers';
|
||||||
import ReportError from 'analytics/components/report-error';
|
import ReportError from 'analytics/components/report-error';
|
||||||
import { searchItemsByString } from 'wc-api/items/utils';
|
import { searchItemsByString } from 'wc-api/items/utils';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
|
import {
|
||||||
|
CurrencyContext,
|
||||||
|
getFilteredCurrencyInstance,
|
||||||
|
} from 'lib/currency-context';
|
||||||
|
|
||||||
export const REPORTS_FILTER = 'woocommerce_admin_reports_list';
|
export const REPORTS_FILTER = 'woocommerce_admin_reports_list';
|
||||||
const manageStock = getSetting( 'manageStock', 'no' );
|
const manageStock = getSetting( 'manageStock', 'no' );
|
||||||
|
@ -142,7 +146,13 @@ class Report extends Component {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const Container = report.component;
|
const Container = report.component;
|
||||||
return <Container { ...this.props } />;
|
return (
|
||||||
|
<CurrencyContext.Provider
|
||||||
|
value={ getFilteredCurrencyInstance( getQuery() ) }
|
||||||
|
>
|
||||||
|
<Container { ...this.props } />
|
||||||
|
</CurrencyContext.Provider>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,7 @@ import { map } from 'lodash';
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { Date, Link, OrderStatus, ViewMoreList } from '@woocommerce/components';
|
import { Date, Link, OrderStatus, ViewMoreList } from '@woocommerce/components';
|
||||||
import { formatCurrency, renderCurrency } from 'lib/currency-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { formatValue } from 'lib/number-format';
|
|
||||||
import { getSetting } from '@woocommerce/wc-admin-settings';
|
import { getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { defaultTableDateFormat } from 'lib/date';
|
import { defaultTableDateFormat } from 'lib/date';
|
||||||
|
|
||||||
|
@ -19,9 +18,10 @@ import { defaultTableDateFormat } from 'lib/date';
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
|
|
||||||
export default class OrdersReportTable extends Component {
|
class OrdersReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -105,6 +105,7 @@ export default class OrdersReportTable extends Component {
|
||||||
const { query } = this.props;
|
const { query } = this.props;
|
||||||
const persistedQuery = getPersistedQuery( query );
|
const persistedQuery = getPersistedQuery( query );
|
||||||
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
||||||
|
const { render: renderCurrency, getCurrency } = this.context;
|
||||||
|
|
||||||
return map( tableData, ( row ) => {
|
return map( tableData, ( row ) => {
|
||||||
const {
|
const {
|
||||||
|
@ -205,7 +206,11 @@ export default class OrdersReportTable extends Component {
|
||||||
.join( ', ' ),
|
.join( ', ' ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', numItemsSold ),
|
display: formatValue(
|
||||||
|
getCurrency(),
|
||||||
|
'number',
|
||||||
|
numItemsSold
|
||||||
|
),
|
||||||
value: numItemsSold,
|
value: numItemsSold,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -237,6 +242,8 @@ export default class OrdersReportTable extends Component {
|
||||||
coupons_count: couponsCount = 0,
|
coupons_count: couponsCount = 0,
|
||||||
net_revenue: netRevenue = 0,
|
net_revenue: netRevenue = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -245,7 +252,7 @@ export default class OrdersReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -254,7 +261,7 @@ export default class OrdersReportTable extends Component {
|
||||||
numNewCustomers,
|
numNewCustomers,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', numNewCustomers ),
|
value: formatValue( currency, 'number', numNewCustomers ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -263,7 +270,7 @@ export default class OrdersReportTable extends Component {
|
||||||
numReturningCustomers,
|
numReturningCustomers,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', numReturningCustomers ),
|
value: formatValue( currency, 'number', numReturningCustomers ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -272,7 +279,7 @@ export default class OrdersReportTable extends Component {
|
||||||
products,
|
products,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', products ),
|
value: formatValue( currency, 'number', products ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -281,7 +288,7 @@ export default class OrdersReportTable extends Component {
|
||||||
numItemsSold,
|
numItemsSold,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', numItemsSold ),
|
value: formatValue( currency, 'number', numItemsSold ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -290,7 +297,7 @@ export default class OrdersReportTable extends Component {
|
||||||
couponsCount,
|
couponsCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', couponsCount ),
|
value: formatValue( currency, 'number', couponsCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'net sales', 'woocommerce-admin' ),
|
label: __( 'net sales', 'woocommerce-admin' ),
|
||||||
|
@ -348,3 +355,7 @@ export default class OrdersReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OrdersReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default OrdersReportTable;
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
/**
|
|
||||||
* External dependencies
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* WooCommerce dependencies
|
|
||||||
*/
|
|
||||||
import { getCurrencyFormatDecimal } from 'lib/currency-format';
|
|
||||||
import { getOrderRefundTotal } from 'lib/order-values';
|
|
||||||
|
|
||||||
export function formatTableOrders( orders ) {
|
|
||||||
return orders.map( ( order ) => {
|
|
||||||
const {
|
|
||||||
date_created: date,
|
|
||||||
id,
|
|
||||||
status,
|
|
||||||
customer_id: customerId,
|
|
||||||
line_items: lineItems,
|
|
||||||
coupon_lines: couponLines,
|
|
||||||
currency,
|
|
||||||
total,
|
|
||||||
total_tax: totalTax,
|
|
||||||
shipping_total: shippingTotal,
|
|
||||||
discount_total: discountTotal,
|
|
||||||
} = order;
|
|
||||||
|
|
||||||
return {
|
|
||||||
date,
|
|
||||||
id,
|
|
||||||
status,
|
|
||||||
customer_id: customerId,
|
|
||||||
line_items: lineItems,
|
|
||||||
items_sold: lineItems.reduce(
|
|
||||||
( acc, item ) => item.quantity + acc,
|
|
||||||
0
|
|
||||||
),
|
|
||||||
coupon_lines: couponLines,
|
|
||||||
currency,
|
|
||||||
net_revenue: getCurrencyFormatDecimal(
|
|
||||||
total -
|
|
||||||
totalTax -
|
|
||||||
shippingTotal -
|
|
||||||
discountTotal +
|
|
||||||
getOrderRefundTotal( order )
|
|
||||||
),
|
|
||||||
};
|
|
||||||
} );
|
|
||||||
}
|
|
|
@ -9,9 +9,8 @@ import { map, get } from 'lodash';
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { Link } from '@woocommerce/components';
|
import { Link } from '@woocommerce/components';
|
||||||
import { formatCurrency, getCurrencyFormatDecimal } from 'lib/currency-format';
|
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -19,16 +18,18 @@ import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import { isLowStock } from './utils';
|
import { isLowStock } from './utils';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
const manageStock = getSetting( 'manageStock', 'no' );
|
const manageStock = getSetting( 'manageStock', 'no' );
|
||||||
const stockStatuses = getSetting( 'stockStatuses', {} );
|
const stockStatuses = getSetting( 'stockStatuses', {} );
|
||||||
|
|
||||||
export default class VariationsReportTable extends Component {
|
class VariationsReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.getHeadersContent = this.getHeadersContent.bind( this );
|
this.getHeadersContent = this.getHeadersContent.bind( this );
|
||||||
this.getRowsContent = this.getRowsContent.bind( this );
|
this.getRowsContent = this.getRowsContent.bind( this );
|
||||||
|
this.getSummary = this.getSummary.bind( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
getHeadersContent() {
|
getHeadersContent() {
|
||||||
|
@ -86,9 +87,19 @@ export default class VariationsReportTable extends Component {
|
||||||
getRowsContent( data = [] ) {
|
getRowsContent( data = [] ) {
|
||||||
const { query } = this.props;
|
const { query } = this.props;
|
||||||
const persistedQuery = getPersistedQuery( query );
|
const persistedQuery = getPersistedQuery( query );
|
||||||
|
const {
|
||||||
|
formatCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
|
||||||
return map( data, ( row ) => {
|
return map( data, ( row ) => {
|
||||||
const { items_sold: itemsSold, net_revenue: netRevenue, orders_count: ordersCount, product_id: productId } = row;
|
const {
|
||||||
|
items_sold: itemsSold,
|
||||||
|
net_revenue: netRevenue,
|
||||||
|
orders_count: ordersCount,
|
||||||
|
product_id: productId,
|
||||||
|
} = row;
|
||||||
const extendedInfo = row.extended_info || {};
|
const extendedInfo = row.extended_info || {};
|
||||||
const {
|
const {
|
||||||
stock_status: stockStatus,
|
stock_status: stockStatus,
|
||||||
|
@ -123,7 +134,7 @@ export default class VariationsReportTable extends Component {
|
||||||
value: sku,
|
value: sku,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', itemsSold ),
|
display: formatValue( getCurrency(), 'number', itemsSold ),
|
||||||
value: itemsSold,
|
value: itemsSold,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -175,6 +186,8 @@ export default class VariationsReportTable extends Component {
|
||||||
net_revenue: netRevenue = 0,
|
net_revenue: netRevenue = 0,
|
||||||
orders_count: ordersCount = 0,
|
orders_count: ordersCount = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -183,7 +196,7 @@ export default class VariationsReportTable extends Component {
|
||||||
variationsCount,
|
variationsCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', variationsCount ),
|
value: formatValue( currency, 'number', variationsCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -192,7 +205,7 @@ export default class VariationsReportTable extends Component {
|
||||||
itemsSold,
|
itemsSold,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', itemsSold ),
|
value: formatValue( currency, 'number', itemsSold ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'net sales', 'woocommerce-admin' ),
|
label: __( 'net sales', 'woocommerce-admin' ),
|
||||||
|
@ -205,7 +218,7 @@ export default class VariationsReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -265,3 +278,7 @@ export default class VariationsReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VariationsReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default VariationsReportTable;
|
||||||
|
|
|
@ -10,14 +10,9 @@ import { map } from 'lodash';
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import {
|
|
||||||
formatCurrency,
|
|
||||||
getCurrencyFormatDecimal,
|
|
||||||
renderCurrency,
|
|
||||||
} from 'lib/currency-format';
|
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { Link, Tag } from '@woocommerce/components';
|
import { Link, Tag } from '@woocommerce/components';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,6 +22,7 @@ import CategoryBreacrumbs from '../categories/breadcrumbs';
|
||||||
import { isLowStock } from './utils';
|
import { isLowStock } from './utils';
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
|
|
||||||
const manageStock = getSetting( 'manageStock', 'no' );
|
const manageStock = getSetting( 'manageStock', 'no' );
|
||||||
|
@ -38,6 +34,7 @@ class ProductsReportTable extends Component {
|
||||||
|
|
||||||
this.getHeadersContent = this.getHeadersContent.bind( this );
|
this.getHeadersContent = this.getHeadersContent.bind( this );
|
||||||
this.getRowsContent = this.getRowsContent.bind( this );
|
this.getRowsContent = this.getRowsContent.bind( this );
|
||||||
|
this.getSummary = this.getSummary.bind( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
getHeadersContent() {
|
getHeadersContent() {
|
||||||
|
@ -105,6 +102,12 @@ class ProductsReportTable extends Component {
|
||||||
getRowsContent( data = [] ) {
|
getRowsContent( data = [] ) {
|
||||||
const { query } = this.props;
|
const { query } = this.props;
|
||||||
const persistedQuery = getPersistedQuery( query );
|
const persistedQuery = getPersistedQuery( query );
|
||||||
|
const {
|
||||||
|
render: renderCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
|
|
||||||
return map( data, ( row ) => {
|
return map( data, ( row ) => {
|
||||||
const {
|
const {
|
||||||
|
@ -185,7 +188,7 @@ class ProductsReportTable extends Component {
|
||||||
value: sku,
|
value: sku,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', itemsSold ),
|
display: formatValue( currency, 'number', itemsSold ),
|
||||||
value: itemsSold,
|
value: itemsSold,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -238,7 +241,11 @@ class ProductsReportTable extends Component {
|
||||||
.join( ', ' ),
|
.join( ', ' ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', variations.length ),
|
display: formatValue(
|
||||||
|
currency,
|
||||||
|
'number',
|
||||||
|
variations.length
|
||||||
|
),
|
||||||
value: variations.length,
|
value: variations.length,
|
||||||
},
|
},
|
||||||
manageStock === 'yes'
|
manageStock === 'yes'
|
||||||
|
@ -254,7 +261,11 @@ class ProductsReportTable extends Component {
|
||||||
manageStock === 'yes'
|
manageStock === 'yes'
|
||||||
? {
|
? {
|
||||||
display: extendedInfoManageStock
|
display: extendedInfoManageStock
|
||||||
? formatValue( 'number', stockQuantity )
|
? formatValue(
|
||||||
|
currency,
|
||||||
|
'number',
|
||||||
|
stockQuantity
|
||||||
|
)
|
||||||
: __( 'N/A', 'woocommerce-admin' ),
|
: __( 'N/A', 'woocommerce-admin' ),
|
||||||
value: stockQuantity,
|
value: stockQuantity,
|
||||||
}
|
}
|
||||||
|
@ -270,6 +281,8 @@ class ProductsReportTable extends Component {
|
||||||
net_revenue: netRevenue = 0,
|
net_revenue: netRevenue = 0,
|
||||||
orders_count: ordersCount = 0,
|
orders_count: ordersCount = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -278,7 +291,7 @@ class ProductsReportTable extends Component {
|
||||||
productsCount,
|
productsCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', productsCount ),
|
value: formatValue( currency, 'number', productsCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -287,7 +300,7 @@ class ProductsReportTable extends Component {
|
||||||
itemsSold,
|
itemsSold,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', itemsSold ),
|
value: formatValue( currency, 'number', itemsSold ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'net sales', 'woocommerce-admin' ),
|
label: __( 'net sales', 'woocommerce-admin' ),
|
||||||
|
@ -300,7 +313,7 @@ class ProductsReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -360,6 +373,8 @@ class ProductsReportTable extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ProductsReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const { query, isRequesting } = props;
|
const { query, isRequesting } = props;
|
||||||
|
|
|
@ -16,12 +16,7 @@ import {
|
||||||
getCurrentDates,
|
getCurrentDates,
|
||||||
} from 'lib/date';
|
} from 'lib/date';
|
||||||
import { Date, Link } from '@woocommerce/components';
|
import { Date, Link } from '@woocommerce/components';
|
||||||
import {
|
import { formatValue } from '@woocommerce/number';
|
||||||
formatCurrency,
|
|
||||||
getCurrencyFormatDecimal,
|
|
||||||
renderCurrency,
|
|
||||||
} from 'lib/currency-format';
|
|
||||||
import { formatValue } from 'lib/number-format';
|
|
||||||
import { getSetting } from '@woocommerce/wc-admin-settings';
|
import { getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
|
@ -32,6 +27,7 @@ import { QUERY_DEFAULTS } from 'wc-api/constants';
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
import { getReportTableQuery } from 'wc-api/reports/utils';
|
import { getReportTableQuery } from 'wc-api/reports/utils';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class RevenueReportTable extends Component {
|
class RevenueReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -113,6 +109,12 @@ class RevenueReportTable extends Component {
|
||||||
|
|
||||||
getRowsContent( data = [] ) {
|
getRowsContent( data = [] ) {
|
||||||
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
const dateFormat = getSetting( 'dateFormat', defaultTableDateFormat );
|
||||||
|
const {
|
||||||
|
formatCurrency,
|
||||||
|
render: renderCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
|
||||||
return data.map( ( row ) => {
|
return data.map( ( row ) => {
|
||||||
const {
|
const {
|
||||||
|
@ -136,7 +138,7 @@ class RevenueReportTable extends Component {
|
||||||
}
|
}
|
||||||
type="wp-admin"
|
type="wp-admin"
|
||||||
>
|
>
|
||||||
{ formatValue( 'number', ordersCount ) }
|
{ formatValue( getCurrency(), 'number', ordersCount ) }
|
||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
return [
|
return [
|
||||||
|
@ -196,10 +198,12 @@ class RevenueReportTable extends Component {
|
||||||
shipping = 0,
|
shipping = 0,
|
||||||
net_revenue: netRevenue = 0,
|
net_revenue: netRevenue = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n( 'day', 'days', totalResults, 'woocommerce-admin' ),
|
label: _n( 'day', 'days', totalResults, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', totalResults ),
|
value: formatValue( currency, 'number', totalResults ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -208,7 +212,7 @@ class RevenueReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'gross sales', 'woocommerce-admin' ),
|
label: __( 'gross sales', 'woocommerce-admin' ),
|
||||||
|
@ -271,6 +275,8 @@ class RevenueReportTable extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RevenueReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const { query, filters, advancedFilters } = props;
|
const { query, filters, advancedFilters } = props;
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { decodeEntities } from '@wordpress/html-entities';
|
||||||
*/
|
*/
|
||||||
import { Link } from '@woocommerce/components';
|
import { Link } from '@woocommerce/components';
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,10 +18,11 @@ import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
import { isLowStock } from './utils';
|
import { isLowStock } from './utils';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
const stockStatuses = getSetting( 'stockStatuses', {} );
|
const stockStatuses = getSetting( 'stockStatuses', {} );
|
||||||
|
|
||||||
export default class StockReportTable extends Component {
|
class StockReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -126,7 +127,11 @@ export default class StockReportTable extends Component {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: manageStock
|
display: manageStock
|
||||||
? formatValue( 'number', stockQuantity )
|
? formatValue(
|
||||||
|
this.context.getCurrency(),
|
||||||
|
'number',
|
||||||
|
stockQuantity
|
||||||
|
)
|
||||||
: __( 'N/A', 'woocommerce-admin' ),
|
: __( 'N/A', 'woocommerce-admin' ),
|
||||||
value: stockQuantity,
|
value: stockQuantity,
|
||||||
},
|
},
|
||||||
|
@ -142,6 +147,7 @@ export default class StockReportTable extends Component {
|
||||||
instock = 0,
|
instock = 0,
|
||||||
onbackorder = 0,
|
onbackorder = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const currency = this.context.getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -150,23 +156,23 @@ export default class StockReportTable extends Component {
|
||||||
products,
|
products,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', products ),
|
value: formatValue( currency, 'number', products ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'out of stock', outofstock, 'woocommerce-admin' ),
|
label: __( 'out of stock', outofstock, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', outofstock ),
|
value: formatValue( currency, 'number', outofstock ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'low stock', lowstock, 'woocommerce-admin' ),
|
label: __( 'low stock', lowstock, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', lowstock ),
|
value: formatValue( 'currency, number', lowstock ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'on backorder', onbackorder, 'woocommerce-admin' ),
|
label: __( 'on backorder', onbackorder, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', onbackorder ),
|
value: formatValue( currency, 'number', onbackorder ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'in stock', instock, 'woocommerce-admin' ),
|
label: __( 'in stock', instock, 'woocommerce-admin' ),
|
||||||
value: formatValue( 'number', instock ),
|
value: formatValue( currency, 'number', instock ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -200,3 +206,7 @@ export default class StockReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StockReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default StockReportTable;
|
||||||
|
|
|
@ -9,21 +9,17 @@ import { map } from 'lodash';
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { Link } from '@woocommerce/components';
|
import { Link } from '@woocommerce/components';
|
||||||
import {
|
|
||||||
formatCurrency,
|
|
||||||
getCurrencyFormatDecimal,
|
|
||||||
renderCurrency,
|
|
||||||
} from 'lib/currency-format';
|
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { getTaxCode } from './utils';
|
import { getTaxCode } from './utils';
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import ReportTable from 'analytics/components/report-table';
|
import ReportTable from 'analytics/components/report-table';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
export default class TaxesReportTable extends Component {
|
class TaxesReportTable extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -74,6 +70,12 @@ export default class TaxesReportTable extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getRowsContent( taxes ) {
|
getRowsContent( taxes ) {
|
||||||
|
const {
|
||||||
|
render: renderCurrency,
|
||||||
|
formatDecimal: getCurrencyFormatDecimal,
|
||||||
|
getCurrency,
|
||||||
|
} = this.context;
|
||||||
|
|
||||||
return map( taxes, ( tax ) => {
|
return map( taxes, ( tax ) => {
|
||||||
const { query } = this.props;
|
const { query } = this.props;
|
||||||
const {
|
const {
|
||||||
|
@ -123,7 +125,11 @@ export default class TaxesReportTable extends Component {
|
||||||
value: getCurrencyFormatDecimal( shippingTax ),
|
value: getCurrencyFormatDecimal( shippingTax ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
display: formatValue( 'number', ordersCount ),
|
display: formatValue(
|
||||||
|
getCurrency(),
|
||||||
|
'number',
|
||||||
|
ordersCount
|
||||||
|
),
|
||||||
value: ordersCount,
|
value: ordersCount,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
@ -138,6 +144,8 @@ export default class TaxesReportTable extends Component {
|
||||||
shipping_tax: shippingTax = 0,
|
shipping_tax: shippingTax = 0,
|
||||||
orders_count: ordersCount = 0,
|
orders_count: ordersCount = 0,
|
||||||
} = totals;
|
} = totals;
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: _n(
|
label: _n(
|
||||||
|
@ -146,7 +154,7 @@ export default class TaxesReportTable extends Component {
|
||||||
taxesCodes,
|
taxesCodes,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', taxesCodes ),
|
value: formatValue( currency, 'number', taxesCodes ),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __( 'total tax', 'woocommerce-admin' ),
|
label: __( 'total tax', 'woocommerce-admin' ),
|
||||||
|
@ -167,7 +175,7 @@ export default class TaxesReportTable extends Component {
|
||||||
ordersCount,
|
ordersCount,
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
),
|
),
|
||||||
value: formatValue( 'number', ordersCount ),
|
value: formatValue( currency, 'number', ordersCount ),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -204,3 +212,7 @@ export default class TaxesReportTable extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TaxesReportTable.contextType = CurrencyContext;
|
||||||
|
|
||||||
|
export default TaxesReportTable;
|
||||||
|
|
|
@ -11,11 +11,8 @@ import { keys, get, pickBy } from 'lodash';
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { formatValue } from 'lib/number-format';
|
import { formatValue } from '@woocommerce/number';
|
||||||
import {
|
import { getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
getSetting,
|
|
||||||
CURRENCY as currency,
|
|
||||||
} from '@woocommerce/wc-admin-settings';
|
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,10 +27,10 @@ import {
|
||||||
} from '@woocommerce/components';
|
} from '@woocommerce/components';
|
||||||
import withWCApiSelect from 'wc-api/with-select';
|
import withWCApiSelect from 'wc-api/with-select';
|
||||||
import { recordEvent } from 'lib/tracks';
|
import { recordEvent } from 'lib/tracks';
|
||||||
import { formatCurrency } from 'lib/currency-format';
|
|
||||||
import Plugins from 'dashboard/task-list/tasks/steps/plugins';
|
import Plugins from 'dashboard/task-list/tasks/steps/plugins';
|
||||||
import { pluginNames } from 'wc-api/onboarding/constants';
|
import { pluginNames } from 'wc-api/onboarding/constants';
|
||||||
import { getCurrencyRegion } from 'dashboard/utils';
|
import { getCurrencyRegion } from 'dashboard/utils';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
const wcAdminAssetUrl = getSetting( 'wcAdminAssetUrl', '' );
|
const wcAdminAssetUrl = getSetting( 'wcAdminAssetUrl', '' );
|
||||||
|
|
||||||
|
@ -95,11 +92,12 @@ class BusinessDetails extends Component {
|
||||||
selling_venues: sellingVenues,
|
selling_venues: sellingVenues,
|
||||||
} = values;
|
} = values;
|
||||||
const businessExtensions = this.getBusinessExtensions( values );
|
const businessExtensions = this.getBusinessExtensions( values );
|
||||||
|
const { getCurrency } = this.context;
|
||||||
|
|
||||||
recordEvent( 'storeprofiler_store_business_details_continue', {
|
recordEvent( 'storeprofiler_store_business_details_continue', {
|
||||||
product_number: productCount,
|
product_number: productCount,
|
||||||
already_selling: sellingVenues,
|
already_selling: sellingVenues,
|
||||||
currency: currency.code,
|
currency: getCurrency().code,
|
||||||
revenue,
|
revenue,
|
||||||
used_platform: otherPlatform,
|
used_platform: otherPlatform,
|
||||||
used_platform_name: otherPlatformName,
|
used_platform_name: otherPlatformName,
|
||||||
|
@ -247,7 +245,8 @@ class BusinessDetails extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
numberFormat( value ) {
|
numberFormat( value ) {
|
||||||
return formatValue( 'number', value );
|
const { getCurrency } = this.context;
|
||||||
|
return formatValue( getCurrency(), 'number', value );
|
||||||
}
|
}
|
||||||
|
|
||||||
getNumberRangeString( min, max = false, format = this.numberFormat ) {
|
getNumberRangeString( min, max = false, format = this.numberFormat ) {
|
||||||
|
@ -409,6 +408,7 @@ class BusinessDetails extends Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { isInstallingExtensions, extensionInstallError } = this.state;
|
const { isInstallingExtensions, extensionInstallError } = this.state;
|
||||||
|
const { formatCurrency } = this.context;
|
||||||
const productCountOptions = [
|
const productCountOptions = [
|
||||||
{
|
{
|
||||||
key: '0',
|
key: '0',
|
||||||
|
@ -684,6 +684,8 @@ class BusinessDetails extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BusinessDetails.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withWCApiSelect( ( select ) => {
|
withWCApiSelect( ( select ) => {
|
||||||
const { getProfileItems, getProfileItemsError } = select( 'wc-api' );
|
const { getProfileItems, getProfileItemsError } = select( 'wc-api' );
|
||||||
|
|
|
@ -19,7 +19,6 @@ import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import { setCurrency } from 'lib/currency-format';
|
|
||||||
import { getCountryCode, getCurrencyRegion } from 'dashboard/utils';
|
import { getCountryCode, getCurrencyRegion } from 'dashboard/utils';
|
||||||
import {
|
import {
|
||||||
StoreAddress,
|
StoreAddress,
|
||||||
|
@ -27,6 +26,7 @@ import {
|
||||||
} from '../../components/settings/general/store-address';
|
} from '../../components/settings/general/store-address';
|
||||||
import UsageModal from './usage-modal';
|
import UsageModal from './usage-modal';
|
||||||
import withWCApiSelect from 'wc-api/with-select';
|
import withWCApiSelect from 'wc-api/with-select';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class StoreDetails extends Component {
|
class StoreDetails extends Component {
|
||||||
constructor( props ) {
|
constructor( props ) {
|
||||||
|
@ -91,7 +91,8 @@ class StoreDetails extends Component {
|
||||||
const currencySettings = this.deriveCurrencySettings(
|
const currencySettings = this.deriveCurrencySettings(
|
||||||
values.countryState
|
values.countryState
|
||||||
);
|
);
|
||||||
setCurrency( currencySettings );
|
const Currency = this.context;
|
||||||
|
Currency.setCurrency( currencySettings );
|
||||||
|
|
||||||
recordEvent( 'storeprofiler_store_details_continue', {
|
recordEvent( 'storeprofiler_store_details_continue', {
|
||||||
store_country: getCountryCode( values.countryState ),
|
store_country: getCountryCode( values.countryState ),
|
||||||
|
@ -203,8 +204,10 @@ class StoreDetails extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StoreDetails.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withWCApiSelect( select => {
|
withWCApiSelect( ( select ) => {
|
||||||
const { getProfileItemsError, getProfileItems } = select( 'wc-api' );
|
const { getProfileItemsError, getProfileItems } = select( 'wc-api' );
|
||||||
|
|
||||||
const profileItems = getProfileItems();
|
const profileItems = getProfileItems();
|
||||||
|
@ -215,10 +218,12 @@ export default compose(
|
||||||
profileItems,
|
profileItems,
|
||||||
};
|
};
|
||||||
} ),
|
} ),
|
||||||
withSelect( select => {
|
withSelect( ( select ) => {
|
||||||
const { getSettings, getSettingsError, isGetSettingsRequesting } = select(
|
const {
|
||||||
SETTINGS_STORE_NAME
|
getSettings,
|
||||||
);
|
getSettingsError,
|
||||||
|
isGetSettingsRequesting,
|
||||||
|
} = select( SETTINGS_STORE_NAME );
|
||||||
|
|
||||||
const { general: settings = {} } = getSettings( 'general' );
|
const { general: settings = {} } = getSettings( 'general' );
|
||||||
const isSettingsError = Boolean( getSettingsError( 'general' ) );
|
const isSettingsError = Boolean( getSettingsError( 'general' ) );
|
||||||
|
@ -233,7 +238,9 @@ export default compose(
|
||||||
withDispatch( ( dispatch ) => {
|
withDispatch( ( dispatch ) => {
|
||||||
const { createNotice } = dispatch( 'core/notices' );
|
const { createNotice } = dispatch( 'core/notices' );
|
||||||
const { updateProfileItems } = dispatch( 'wc-api' );
|
const { updateProfileItems } = dispatch( 'wc-api' );
|
||||||
const { updateAndPersistSettingsForGroup } = dispatch( SETTINGS_STORE_NAME );
|
const { updateAndPersistSettingsForGroup } = dispatch(
|
||||||
|
SETTINGS_STORE_NAME
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
createNotice,
|
createNotice,
|
||||||
|
|
|
@ -17,8 +17,7 @@ import {
|
||||||
getDateParamsFromQuery,
|
getDateParamsFromQuery,
|
||||||
} from 'lib/date';
|
} from 'lib/date';
|
||||||
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
import { getNewPath, getPersistedQuery } from '@woocommerce/navigation';
|
||||||
import { calculateDelta, formatValue } from 'lib/number-format';
|
import { calculateDelta, formatValue } from '@woocommerce/number';
|
||||||
import { formatCurrency } from 'lib/currency-format';
|
|
||||||
import { getSetting } from '@woocommerce/wc-admin-settings';
|
import { getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
|
@ -37,6 +36,7 @@ import {
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
import { recordEvent } from 'lib/tracks';
|
import { recordEvent } from 'lib/tracks';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
const { performanceIndicators: indicators } = getSetting( 'dataEndpoints', {
|
const { performanceIndicators: indicators } = getSetting( 'dataEndpoints', {
|
||||||
performanceIndicators: '',
|
performanceIndicators: '',
|
||||||
|
@ -141,6 +141,8 @@ class StorePerformance extends Component {
|
||||||
compare === 'previous_period'
|
compare === 'previous_period'
|
||||||
? __( 'Previous Period:', 'woocommerce-admin' )
|
? __( 'Previous Period:', 'woocommerce-admin' )
|
||||||
: __( 'Previous Year:', 'woocommerce-admin' );
|
: __( 'Previous Year:', 'woocommerce-admin' );
|
||||||
|
const { formatCurrency, getCurrency } = this.context;
|
||||||
|
const currency = getCurrency();
|
||||||
return (
|
return (
|
||||||
<SummaryList>
|
<SummaryList>
|
||||||
{ () =>
|
{ () =>
|
||||||
|
@ -178,12 +180,14 @@ class StorePerformance extends Component {
|
||||||
const primaryValue = isCurrency
|
const primaryValue = isCurrency
|
||||||
? formatCurrency( primaryItem.value )
|
? formatCurrency( primaryItem.value )
|
||||||
: formatValue(
|
: formatValue(
|
||||||
|
currency,
|
||||||
primaryItem.format,
|
primaryItem.format,
|
||||||
primaryItem.value
|
primaryItem.value
|
||||||
);
|
);
|
||||||
const secondaryValue = isCurrency
|
const secondaryValue = isCurrency
|
||||||
? formatCurrency( secondaryItem.value )
|
? formatCurrency( secondaryItem.value )
|
||||||
: formatValue(
|
: formatValue(
|
||||||
|
currency,
|
||||||
secondaryItem.format,
|
secondaryItem.format,
|
||||||
secondaryItem.value
|
secondaryItem.value
|
||||||
);
|
);
|
||||||
|
@ -229,6 +233,9 @@ class StorePerformance extends Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StorePerformance.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const { hiddenBlocks, query } = props;
|
const { hiddenBlocks, query } = props;
|
||||||
|
|
|
@ -11,19 +11,13 @@ import PropTypes from 'prop-types';
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import { Flag, Form, TextControlWithAffixes } from '@woocommerce/components';
|
import { Flag, Form, TextControlWithAffixes } from '@woocommerce/components';
|
||||||
import {
|
import { getSetting, setSetting } from '@woocommerce/wc-admin-settings';
|
||||||
CURRENCY,
|
|
||||||
getSetting,
|
|
||||||
setSetting,
|
|
||||||
} from '@woocommerce/wc-admin-settings';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
*/
|
*/
|
||||||
import { getCurrencyFormatString } from 'lib/currency-format';
|
|
||||||
import { recordEvent } from 'lib/tracks';
|
import { recordEvent } from 'lib/tracks';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
const { symbol, symbolPosition } = CURRENCY;
|
|
||||||
|
|
||||||
class ShippingRates extends Component {
|
class ShippingRates extends Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -132,6 +126,7 @@ class ShippingRates extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
renderInputPrefix() {
|
renderInputPrefix() {
|
||||||
|
const { symbolPosition, symbol } = this.context.getCurrency();
|
||||||
if ( symbolPosition.indexOf( 'right' ) === 0 ) {
|
if ( symbolPosition.indexOf( 'right' ) === 0 ) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -143,6 +138,7 @@ class ShippingRates extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
renderInputSuffix( rate ) {
|
renderInputSuffix( rate ) {
|
||||||
|
const { symbolPosition, symbol } = this.context.getCurrency();
|
||||||
if ( symbolPosition.indexOf( 'right' ) === 0 ) {
|
if ( symbolPosition.indexOf( 'right' ) === 0 ) {
|
||||||
return (
|
return (
|
||||||
<span className="woocommerce-shipping-rate__control-suffix">
|
<span className="woocommerce-shipping-rate__control-suffix">
|
||||||
|
@ -159,15 +155,17 @@ class ShippingRates extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getFormattedRate( value ) {
|
getFormattedRate( value ) {
|
||||||
const currencyString = getCurrencyFormatString( value );
|
const { formatDecimalString } = this.context;
|
||||||
|
const currencyString = formatDecimalString( value );
|
||||||
if ( ! value.length || ! currencyString.length ) {
|
if ( ! value.length || ! currencyString.length ) {
|
||||||
return getCurrencyFormatString( 0 );
|
return formatDecimalString( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return getCurrencyFormatString( value );
|
return formatDecimalString( value );
|
||||||
}
|
}
|
||||||
|
|
||||||
getInitialValues() {
|
getInitialValues() {
|
||||||
|
const { formatDecimalString } = this.context;
|
||||||
const values = {};
|
const values = {};
|
||||||
|
|
||||||
this.props.shippingZones.forEach( ( zone ) => {
|
this.props.shippingZones.forEach( ( zone ) => {
|
||||||
|
@ -177,7 +175,7 @@ class ShippingRates extends Component {
|
||||||
? this.getFormattedRate(
|
? this.getFormattedRate(
|
||||||
shippingMethods[ 0 ].settings.cost.value
|
shippingMethods[ 0 ].settings.cost.value
|
||||||
)
|
)
|
||||||
: getCurrencyFormatString( 0 );
|
: formatDecimalString( 0 );
|
||||||
values[ `${ zone.id }_rate` ] = rate;
|
values[ `${ zone.id }_rate` ] = rate;
|
||||||
|
|
||||||
if ( shippingMethods.length && shippingMethods[ 0 ].enabled ) {
|
if ( shippingMethods.length && shippingMethods[ 0 ].enabled ) {
|
||||||
|
@ -346,4 +344,6 @@ ShippingRates.defaultProps = {
|
||||||
shippingZones: [],
|
shippingZones: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ShippingRates.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default ShippingRates;
|
export default ShippingRates;
|
||||||
|
|
|
@ -20,7 +20,6 @@ import {
|
||||||
OrderStatus,
|
OrderStatus,
|
||||||
Section,
|
Section,
|
||||||
} from '@woocommerce/components';
|
} from '@woocommerce/components';
|
||||||
import { formatCurrency } from 'lib/currency-format';
|
|
||||||
import { getNewPath } from '@woocommerce/navigation';
|
import { getNewPath } from '@woocommerce/navigation';
|
||||||
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
|
||||||
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
import { SETTINGS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
@ -34,6 +33,7 @@ import ActivityOutboundLink from '../activity-outbound-link';
|
||||||
import { QUERY_DEFAULTS } from 'wc-api/constants';
|
import { QUERY_DEFAULTS } from 'wc-api/constants';
|
||||||
import { DEFAULT_ACTIONABLE_STATUSES } from 'analytics/settings/config';
|
import { DEFAULT_ACTIONABLE_STATUSES } from 'analytics/settings/config';
|
||||||
import withSelect from 'wc-api/with-select';
|
import withSelect from 'wc-api/with-select';
|
||||||
|
import { CurrencyContext } from 'lib/currency-context';
|
||||||
|
|
||||||
class OrdersPanel extends Component {
|
class OrdersPanel extends Component {
|
||||||
renderEmptyCard() {
|
renderEmptyCard() {
|
||||||
|
@ -85,6 +85,7 @@ class OrdersPanel extends Component {
|
||||||
|
|
||||||
renderOrders() {
|
renderOrders() {
|
||||||
const { orders } = this.props;
|
const { orders } = this.props;
|
||||||
|
const Currency = this.context;
|
||||||
|
|
||||||
if ( orders.length === 0 ) {
|
if ( orders.length === 0 ) {
|
||||||
return this.renderEmptyCard();
|
return this.renderEmptyCard();
|
||||||
|
@ -194,7 +195,7 @@ class OrdersPanel extends Component {
|
||||||
productsCount
|
productsCount
|
||||||
) }
|
) }
|
||||||
</span>
|
</span>
|
||||||
<span>{ formatCurrency( total ) }</span>
|
<span>{ Currency.formatCurrency( total ) }</span>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
actions={
|
actions={
|
||||||
|
@ -304,6 +305,8 @@ OrdersPanel.defaultProps = {
|
||||||
isRequesting: false,
|
isRequesting: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
OrdersPanel.contextType = CurrencyContext;
|
||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withSelect( ( select, props ) => {
|
withSelect( ( select, props ) => {
|
||||||
const { hasActionableOrders } = props;
|
const { hasActionableOrders } = props;
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
/**
|
||||||
|
* External dependencies
|
||||||
|
*/
|
||||||
|
import { createContext } from '@wordpress/element';
|
||||||
|
import { applyFilters } from '@wordpress/hooks';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WooCommerce dependencies
|
||||||
|
*/
|
||||||
|
import Currency from '@woocommerce/currency';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal dependencies
|
||||||
|
*/
|
||||||
|
import { CURRENCY } from '@woocommerce/wc-admin-settings';
|
||||||
|
|
||||||
|
const appCurrency = Currency( CURRENCY );
|
||||||
|
|
||||||
|
export const getFilteredCurrencyInstance = ( query ) => {
|
||||||
|
const config = appCurrency.getCurrency();
|
||||||
|
const filteredConfig = applyFilters(
|
||||||
|
'woocommerce_admin_report_currency',
|
||||||
|
config,
|
||||||
|
query
|
||||||
|
);
|
||||||
|
return new Currency( filteredConfig );
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CurrencyContext = createContext(
|
||||||
|
appCurrency // default value
|
||||||
|
);
|
|
@ -1,31 +0,0 @@
|
||||||
/**
|
|
||||||
* Internal dependencies
|
|
||||||
*/
|
|
||||||
import { CURRENCY } from '@woocommerce/wc-admin-settings';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* WooCommerce dependencies
|
|
||||||
*/
|
|
||||||
import Currency from '@woocommerce/currency';
|
|
||||||
|
|
||||||
// Pass the site currency settings to our instance.
|
|
||||||
const storeCurrency = new Currency( CURRENCY );
|
|
||||||
|
|
||||||
// Allow our exported API to be called without knowing about the Currency instance.
|
|
||||||
const formatCurrency = storeCurrency.formatCurrency.bind( storeCurrency );
|
|
||||||
const formatDecimal = storeCurrency.formatDecimal.bind( storeCurrency );
|
|
||||||
const formatDecimalString = storeCurrency.formatDecimalString.bind(
|
|
||||||
storeCurrency
|
|
||||||
);
|
|
||||||
const render = storeCurrency.render.bind( storeCurrency );
|
|
||||||
const setCurrency = storeCurrency.setCurrency.bind( storeCurrency );
|
|
||||||
|
|
||||||
// Export the expected API for the consuming app, along with the instance.
|
|
||||||
export {
|
|
||||||
storeCurrency as Currency,
|
|
||||||
formatCurrency,
|
|
||||||
formatDecimal as getCurrencyFormatDecimal,
|
|
||||||
formatDecimalString as getCurrencyFormatString,
|
|
||||||
render as renderCurrency,
|
|
||||||
setCurrency,
|
|
||||||
};
|
|
|
@ -1,21 +0,0 @@
|
||||||
/**
|
|
||||||
* External dependencies
|
|
||||||
*/
|
|
||||||
import { partial } from 'lodash';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* WooCommerce dependencies
|
|
||||||
*/
|
|
||||||
import { CURRENCY } from '@woocommerce/wc-admin-settings';
|
|
||||||
import { numberFormat, formatValue, calculateDelta } from '@woocommerce/number';
|
|
||||||
|
|
||||||
// Compose the site currency settings with the format functions.
|
|
||||||
const storeNumberFormat = partial( numberFormat, CURRENCY );
|
|
||||||
const storeFormatValue = partial( formatValue, CURRENCY );
|
|
||||||
|
|
||||||
// Export the expected API for the consuming app.
|
|
||||||
export {
|
|
||||||
storeNumberFormat as numberFormat,
|
|
||||||
storeFormatValue as formatValue,
|
|
||||||
calculateDelta,
|
|
||||||
};
|
|
|
@ -17,7 +17,6 @@ import {
|
||||||
getActiveFiltersFromQuery,
|
getActiveFiltersFromQuery,
|
||||||
getUrlKey,
|
getUrlKey,
|
||||||
} from '@woocommerce/navigation';
|
} from '@woocommerce/navigation';
|
||||||
import { formatCurrency } from 'lib/currency-format';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal dependencies
|
* Internal dependencies
|
||||||
|
@ -388,9 +387,10 @@ export function getReportChartData( options ) {
|
||||||
* Returns a formatting function or string to be used by d3-format
|
* Returns a formatting function or string to be used by d3-format
|
||||||
*
|
*
|
||||||
* @param {string} type Type of number, 'currency', 'number', 'percent', 'average'
|
* @param {string} type Type of number, 'currency', 'number', 'percent', 'average'
|
||||||
|
* @param {Function} formatCurrency format currency function
|
||||||
* @return {string|Function} returns a number format based on the type or an overriding formatting function
|
* @return {string|Function} returns a number format based on the type or an overriding formatting function
|
||||||
*/
|
*/
|
||||||
export function getTooltipValueFormat( type ) {
|
export function getTooltipValueFormat( type, formatCurrency ) {
|
||||||
switch ( type ) {
|
switch ( type ) {
|
||||||
case 'currency':
|
case 'currency':
|
||||||
return formatCurrency;
|
return formatCurrency;
|
||||||
|
|
|
@ -91,10 +91,14 @@ const addTableColumn = ( reportTableData ) => {
|
||||||
];
|
];
|
||||||
const newRows = reportTableData.rows.map( ( row, index ) => {
|
const newRows = reportTableData.rows.map( ( row, index ) => {
|
||||||
const item = reportTableData.items.data[ index ];
|
const item = reportTableData.items.data[ index ];
|
||||||
|
const currency =
|
||||||
|
reportTableData.endpoint === 'revenue'
|
||||||
|
? item.subtotals.currency
|
||||||
|
: item.currency;
|
||||||
const newRow = [
|
const newRow = [
|
||||||
{
|
{
|
||||||
display: item.currency,
|
display: currency,
|
||||||
value: item.currency,
|
value: currency,
|
||||||
},
|
},
|
||||||
...row,
|
...row,
|
||||||
];
|
];
|
||||||
|
@ -126,3 +130,35 @@ addFilter(
|
||||||
'plugin-domain',
|
'plugin-domain',
|
||||||
persistQueries
|
persistQueries
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const currencies = {
|
||||||
|
ZAR: {
|
||||||
|
code: 'ZAR',
|
||||||
|
symbol: 'R',
|
||||||
|
symbolPosition: 'left',
|
||||||
|
thousandSeparator: ' ',
|
||||||
|
decimalSeparator: ',',
|
||||||
|
precision: 2,
|
||||||
|
},
|
||||||
|
NZD: {
|
||||||
|
code: 'NZD',
|
||||||
|
symbol: '$NZ',
|
||||||
|
symbolPosition: 'left',
|
||||||
|
thousandSeparator: ',',
|
||||||
|
decimalSeparator: '.',
|
||||||
|
precision: 2,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateReportCurrencies = ( config, { currency } ) => {
|
||||||
|
if ( currency && currencies[ currency ] ) {
|
||||||
|
return currencies[ currency ];
|
||||||
|
}
|
||||||
|
return config;
|
||||||
|
};
|
||||||
|
|
||||||
|
addFilter(
|
||||||
|
'woocommerce_admin_report_currency',
|
||||||
|
'plugin-domain',
|
||||||
|
updateReportCurrencies
|
||||||
|
);
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
# 3.0.0 (unreleased)
|
||||||
|
|
||||||
|
## Breaking changes
|
||||||
|
- Currency is now a factory function instead of a class.
|
||||||
|
|
||||||
|
- Add getCurrency method to retrieve currency config.
|
||||||
|
|
||||||
# 2.0.0
|
# 2.0.0
|
||||||
|
|
||||||
## Breaking changes
|
## Breaking changes
|
||||||
|
|
|
@ -8,48 +8,59 @@ import { sprintf } from '@wordpress/i18n';
|
||||||
*/
|
*/
|
||||||
import { numberFormat } from '@woocommerce/number';
|
import { numberFormat } from '@woocommerce/number';
|
||||||
|
|
||||||
export default class Currency {
|
const Currency = ( currencySetting ) => {
|
||||||
constructor( currency = null ) {
|
let currency;
|
||||||
if ( ! this.code ) {
|
|
||||||
this.setCurrency( currency );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
setCurrency( currencySetting );
|
||||||
* Set the currency configuration to use for the class.
|
|
||||||
*
|
function setCurrency( setting ) {
|
||||||
* @param {Object} currency An object containing currency configuration settings.
|
|
||||||
*/
|
|
||||||
setCurrency( currency ) {
|
|
||||||
const defaultCurrency = getCurrencyData().US;
|
const defaultCurrency = getCurrencyData().US;
|
||||||
const config = { ...defaultCurrency, ...currency };
|
const config = { ...defaultCurrency, ...setting };
|
||||||
|
currency = {
|
||||||
this.code = config.code.toString();
|
code: config.code.toString(),
|
||||||
this.symbol = config.symbol.toString();
|
symbol: config.symbol.toString(),
|
||||||
this.symbolPosition = config.symbolPosition.toString();
|
symbolPosition: config.symbolPosition.toString(),
|
||||||
this.decimalSeparator = config.decimalSeparator.toString();
|
decimalSeparator: config.decimalSeparator.toString(),
|
||||||
this.priceFormat = this.getPriceFormat( config );
|
priceFormat: getPriceFormat( config ),
|
||||||
this.thousandSeparator = config.thousandSeparator.toString();
|
thousandSeparator: config.thousandSeparator.toString(),
|
||||||
|
precision: parseInt( config.precision, 10 ),
|
||||||
const precisionNumber = parseInt( config.precision, 10 );
|
};
|
||||||
this.precision = precisionNumber;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
stripTags( str ) {
|
function stripTags( str ) {
|
||||||
const tmp = document.createElement( 'DIV' );
|
const tmp = document.createElement( 'DIV' );
|
||||||
tmp.innerHTML = str;
|
tmp.innerHTML = str;
|
||||||
return tmp.textContent || tmp.innerText || '';
|
return tmp.textContent || tmp.innerText || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats money value.
|
||||||
|
*
|
||||||
|
* @param {number|string} number number to format
|
||||||
|
* @return {?string} A formatted string.
|
||||||
|
*/
|
||||||
|
function formatCurrency( number ) {
|
||||||
|
const formattedNumber = numberFormat( currency, number );
|
||||||
|
|
||||||
|
if ( formattedNumber === '' ) {
|
||||||
|
return formattedNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { priceFormat, symbol } = currency;
|
||||||
|
|
||||||
|
// eslint-disable-next-line @wordpress/valid-sprintf
|
||||||
|
return sprintf( priceFormat, symbol, formattedNumber );
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the default price format from a currency.
|
* Get the default price format from a currency.
|
||||||
*
|
*
|
||||||
* @param {Object} config Currency configuration.
|
* @param {Object} config Currency configuration.
|
||||||
* @return {string} Price format.
|
* @return {string} Price format.
|
||||||
*/
|
*/
|
||||||
getPriceFormat( config ) {
|
function getPriceFormat( config ) {
|
||||||
if ( config.priceFormat ) {
|
if ( config.priceFormat ) {
|
||||||
return this.stripTags( config.priceFormat.toString() );
|
return stripTags( config.priceFormat.toString() );
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ( config.symbolPosition ) {
|
switch ( config.symbolPosition ) {
|
||||||
|
@ -66,22 +77,13 @@ export default class Currency {
|
||||||
return '%1$s%2$s';
|
return '%1$s%2$s';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
return {
|
||||||
* Formats money value.
|
getCurrency: () => {
|
||||||
*
|
return { ...currency };
|
||||||
* @param {number|string} number number to format
|
},
|
||||||
* @return {?string} A formatted string.
|
setCurrency,
|
||||||
*/
|
formatCurrency,
|
||||||
formatCurrency( number ) {
|
getPriceFormat,
|
||||||
const formattedNumber = numberFormat( this, number );
|
|
||||||
|
|
||||||
if ( formattedNumber === '' ) {
|
|
||||||
return formattedNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @wordpress/valid-sprintf
|
|
||||||
return sprintf( this.priceFormat, this.symbol, formattedNumber );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the rounded decimal value of a number at the precision used for the current currency.
|
* Get the rounded decimal value of a number at the precision used for the current currency.
|
||||||
|
@ -97,11 +99,12 @@ export default class Currency {
|
||||||
if ( Number.isNaN( number ) ) {
|
if ( Number.isNaN( number ) ) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
const { precision } = currency;
|
||||||
return (
|
return (
|
||||||
Math.round( number * Math.pow( 10, this.precision ) ) /
|
Math.round( number * Math.pow( 10, precision ) ) /
|
||||||
Math.pow( 10, this.precision )
|
Math.pow( 10, precision )
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the string representation of a floating point number to the precision used by the current currency.
|
* Get the string representation of a floating point number to the precision used by the current currency.
|
||||||
|
@ -117,8 +120,9 @@ export default class Currency {
|
||||||
if ( Number.isNaN( number ) ) {
|
if ( Number.isNaN( number ) ) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
return number.toFixed( this.precision );
|
const { precision } = currency;
|
||||||
}
|
return number.toFixed( precision );
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render a currency for display in a component.
|
* Render a currency for display in a component.
|
||||||
|
@ -133,13 +137,16 @@ export default class Currency {
|
||||||
if ( number < 0 ) {
|
if ( number < 0 ) {
|
||||||
return (
|
return (
|
||||||
<span className="is-negative">
|
<span className="is-negative">
|
||||||
{ this.formatCurrency( number ) }
|
{ formatCurrency( number ) }
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return this.formatCurrency( number );
|
return formatCurrency( number );
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Currency;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns currency data by country/region. Contains code, symbol, position, thousands separator, decimal separator, and precision.
|
* Returns currency data by country/region. Contains code, symbol, position, thousands separator, decimal separator, and precision.
|
||||||
|
|
|
@ -20,16 +20,16 @@ export function numberFormat(
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
precision = parseInt( precision, 10 );
|
let parsedPrecision = parseInt( precision, 10 );
|
||||||
|
|
||||||
if ( isNaN( precision ) ) {
|
if ( isNaN( parsedPrecision ) ) {
|
||||||
const [ , decimals ] = number.toString().split( '.' );
|
const [ , decimals ] = number.toString().split( '.' );
|
||||||
precision = decimals ? decimals.length : 0;
|
parsedPrecision = decimals ? decimals.length : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return numberFormatter(
|
return numberFormatter(
|
||||||
number,
|
number,
|
||||||
precision,
|
parsedPrecision,
|
||||||
decimalSeparator,
|
decimalSeparator,
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue