Update order panel card title line to match latest design.
This commit is contained in:
parent
a055f1a829
commit
d18de54c35
|
@ -9,14 +9,15 @@ import { compose } from '@wordpress/compose';
|
||||||
import { withSelect } from '@wordpress/data';
|
import { withSelect } from '@wordpress/data';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { noop } from 'lodash';
|
import { noop } from 'lodash';
|
||||||
|
import interpolateComponents from 'interpolate-components';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WooCommerce dependencies
|
* WooCommerce dependencies
|
||||||
*/
|
*/
|
||||||
import {
|
import {
|
||||||
EllipsisMenu,
|
EllipsisMenu,
|
||||||
Gravatar,
|
|
||||||
Flag,
|
Flag,
|
||||||
|
Link,
|
||||||
MenuTitle,
|
MenuTitle,
|
||||||
MenuItem,
|
MenuItem,
|
||||||
OrderStatus,
|
OrderStatus,
|
||||||
|
@ -41,12 +42,31 @@ function OrdersPanel( { orders, isRequesting } ) {
|
||||||
</EllipsisMenu>
|
</EllipsisMenu>
|
||||||
);
|
);
|
||||||
|
|
||||||
const gravatarWithFlag = ( order, address ) => {
|
const orderCardTitle = ( order, address ) => {
|
||||||
|
const name = `${ address.first_name } ${ address.last_name }`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="woocommerce-layout__activity-panel-avatar-flag-overlay">
|
<Fragment>
|
||||||
<Flag order={ order } />
|
{ interpolateComponents( {
|
||||||
<Gravatar user={ address.email } />
|
mixedString: sprintf(
|
||||||
</div>
|
__(
|
||||||
|
/* eslint-disable-next-line max-len */
|
||||||
|
'Order {{orderLink}}#%(orderNumber)s{{/orderLink}} placed by {{customerLink}}%(customerName)s{{/customerLink}} {{destinationFlag/}}',
|
||||||
|
'wc-admin'
|
||||||
|
),
|
||||||
|
{
|
||||||
|
orderNumber: order.number,
|
||||||
|
customerName: name,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
components: {
|
||||||
|
orderLink: <Link href={ 'post.php?action=edit&post=' + order.id } type="wp-admin" />,
|
||||||
|
// @TODO: Hook up customer name link
|
||||||
|
customerLink: <Link href={ '#' } type="wp-admin" />,
|
||||||
|
destinationFlag: <Flag order={ order } round={ false } height={ 9 } width={ 12 } />,
|
||||||
|
},
|
||||||
|
} ) }
|
||||||
|
</Fragment>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -61,7 +81,6 @@ function OrdersPanel( { orders, isRequesting } ) {
|
||||||
{ orders.map( ( order, i ) => {
|
{ orders.map( ( order, i ) => {
|
||||||
// We want the billing address, but shipping can be used as a fallback.
|
// We want the billing address, but shipping can be used as a fallback.
|
||||||
const address = { ...order.shipping, ...order.billing };
|
const address = { ...order.shipping, ...order.billing };
|
||||||
const name = `${ address.first_name } ${ address.last_name }`;
|
|
||||||
const productsCount = order.line_items.reduce(
|
const productsCount = order.line_items.reduce(
|
||||||
( total, line ) => total + line.quantity,
|
( total, line ) => total + line.quantity,
|
||||||
0
|
0
|
||||||
|
@ -75,8 +94,7 @@ function OrdersPanel( { orders, isRequesting } ) {
|
||||||
<ActivityCard
|
<ActivityCard
|
||||||
key={ i }
|
key={ i }
|
||||||
className="woocommerce-order-activity-card"
|
className="woocommerce-order-activity-card"
|
||||||
title={ sprintf( __( '%s placed order #%d', 'wc-admin' ), name, order.id ) }
|
title={ orderCardTitle( order, address ) }
|
||||||
icon={ gravatarWithFlag( order, address ) }
|
|
||||||
date={ order.date_created }
|
date={ order.date_created }
|
||||||
subtitle={
|
subtitle={
|
||||||
<div>
|
<div>
|
||||||
|
|
Loading…
Reference in New Issue