diff --git a/src/i18n/en.json b/src/i18n/en.json index f775dfaa7..9052444d1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -2696,6 +2696,7 @@ "order_details": { "order": "Order", "purchase_date": "Purchase Date", + "pending": "Pending", "purchased_by": "Purchased by", "show": "Show", "sponsor": "Sponsor", diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js index 97dbc1e9f..5fa87a332 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js @@ -65,7 +65,9 @@ const SponsorOrderDetails = ({ label: T.translate( "edit_sponsor.purchase_tab.order_details.purchase_date" ), - value: formatDate(currentOrder.created, "LOC", DATE_FORMAT) + value: currentOrder.purchased_date + ? formatDate(currentOrder.purchased_date, "LOC", DATE_FORMAT) + : T.translate("edit_sponsor.purchase_tab.order_details.pending") }, { label: T.translate( diff --git a/src/reducers/sponsors/show-purchase-list-reducer.js b/src/reducers/sponsors/show-purchase-list-reducer.js index ab5cd09c2..8784f8a18 100644 --- a/src/reducers/sponsors/show-purchase-list-reducer.js +++ b/src/reducers/sponsors/show-purchase-list-reducer.js @@ -12,6 +12,7 @@ * */ import moment from "moment-timezone"; +import T from "i18n-react/dist/i18n-react"; import { amountFromCents } from "openstack-uicore-foundation/lib/utils/money"; import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions"; import { @@ -70,7 +71,7 @@ const showPurchaseListReducer = (state = DEFAULT_STATE, action) => { ? moment(a.purchased_date * MILLISECONDS_TO_SECONDS).format( "YYYY/MM/DD HH:mm a" ) - : "N/A" + : T.translate("edit_sponsor.purchase_tab.order_details.pending") })); return { diff --git a/src/reducers/sponsors/sponsor-page-purchase-list-reducer.js b/src/reducers/sponsors/sponsor-page-purchase-list-reducer.js index 87f95f10a..b04207a68 100644 --- a/src/reducers/sponsors/sponsor-page-purchase-list-reducer.js +++ b/src/reducers/sponsors/sponsor-page-purchase-list-reducer.js @@ -12,6 +12,7 @@ * */ import moment from "moment-timezone"; +import T from "i18n-react/dist/i18n-react"; import { amountFromCents } from "openstack-uicore-foundation/lib/utils/money"; import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions"; import { @@ -71,9 +72,11 @@ const sponsorPagePurchaseListReducer = (state = DEFAULT_STATE, action) => { ...a, order: a.order_number, amount: `$${amountFromCents(a.net_amount)}`, - purchased: moment(a.purchased_date * MILLISECONDS_TO_SECONDS).format( - "YYYY/MM/DD HH:mm a" - ) + purchased: a.purchased_date + ? moment(a.purchased_date * MILLISECONDS_TO_SECONDS).format( + "YYYY/MM/DD HH:mm a" + ) + : T.translate("edit_sponsor.purchase_tab.order_details.pending") })); return {