Fix marked as paid item not displaying correctly in order history
This commit is contained in:
parent
94d08dde7d
commit
f7c7f4e518
2 changed files with 26 additions and 1 deletions
|
@ -78,6 +78,11 @@ export const titles = defineMessages({
|
|||
defaultMessage: "Products were returned by",
|
||||
description: "returned event title",
|
||||
id: "event title returned"
|
||||
},
|
||||
orderMarkedAsPaid: {
|
||||
defaultMessage: "Order was marked as paid by",
|
||||
description: "order marked as paid event title",
|
||||
id: "event title marked as paid"
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -96,6 +101,11 @@ export const messages = defineMessages({
|
|||
defaultMessage: "Shipment was refunded",
|
||||
description: "shipment refund title",
|
||||
id: "shipment refund title"
|
||||
},
|
||||
transactionReference: {
|
||||
defaultMessage: "Transaction reference",
|
||||
description: "transaction reference subtitle",
|
||||
id: "transaction reference subtitle"
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -115,6 +125,7 @@ const ExtendedTimelineEvent: React.FC<ExtendedTimelineEventProps> = ({
|
|||
user,
|
||||
lines,
|
||||
amount,
|
||||
transactionReference,
|
||||
shippingCostsIncluded,
|
||||
relatedOrder
|
||||
} = event;
|
||||
|
@ -204,6 +215,19 @@ const ExtendedTimelineEvent: React.FC<ExtendedTimelineEventProps> = ({
|
|||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{!!transactionReference && (
|
||||
<>
|
||||
<Typography
|
||||
variant="caption"
|
||||
color="textSecondary"
|
||||
className={classNames(classes.eventSubtitle)}
|
||||
>
|
||||
{intl.formatMessage(messages.transactionReference)}
|
||||
</Typography>
|
||||
<Typography>{transactionReference}</Typography>
|
||||
</>
|
||||
)}
|
||||
</TimelineEvent>
|
||||
);
|
||||
};
|
||||
|
|
|
@ -24,7 +24,8 @@ const timelineEventTypes = {
|
|||
OrderEventsEnum.FULFILLMENT_REFUNDED,
|
||||
OrderEventsEnum.FULFILLMENT_REPLACED,
|
||||
OrderEventsEnum.FULFILLMENT_RETURNED,
|
||||
OrderEventsEnum.DRAFT_CREATED_FROM_REPLACE
|
||||
OrderEventsEnum.DRAFT_CREATED_FROM_REPLACE,
|
||||
OrderEventsEnum.ORDER_MARKED_AS_PAID
|
||||
],
|
||||
linked: [OrderEventsEnum.ORDER_REPLACEMENT_CREATED],
|
||||
note: [OrderEventsEnum.NOTE_ADDED],
|
||||
|
|
Loading…
Reference in a new issue