diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/order/payment-status-cell/payment-status-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/order/payment-status-cell/payment-status-cell.tsx index a7b2d6b9cb..0aacd0ba09 100644 --- a/packages/admin-next/dashboard/src/components/table/table-cells/order/payment-status-cell/payment-status-cell.tsx +++ b/packages/admin-next/dashboard/src/components/table/table-cells/order/payment-status-cell/payment-status-cell.tsx @@ -1,4 +1,3 @@ -import type { PaymentStatus } from "@medusajs/medusa" import { useTranslation } from "react-i18next" import { getOrderPaymentStatus } from "../../../../../lib/order-helpers" import { StatusCell } from "../../common/status-cell" @@ -10,9 +9,6 @@ type PaymentStatusCellProps = { export const PaymentStatusCell = ({ status }: PaymentStatusCellProps) => { const { t } = useTranslation() - // TODO: remove this when Order<>Payments are linked - return "-" - const { label, color } = getOrderPaymentStatus(t, status) return {label} diff --git a/packages/admin-next/dashboard/src/i18n/translations/en.json b/packages/admin-next/dashboard/src/i18n/translations/en.json index a91edb488e..1e52b75565 100644 --- a/packages/admin-next/dashboard/src/i18n/translations/en.json +++ b/packages/admin-next/dashboard/src/i18n/translations/en.json @@ -632,9 +632,12 @@ "statusTitle": "Payment Status", "status": { "notPaid": "Not paid", + "authorized": "Authorized", + "partiallyAuthorized": "Partially authorized", "awaiting": "Awaiting", "captured": "Captured", "partiallyRefunded": "Partially refunded", + "partiallyCaptured": "Partially captured", "refunded": "Refunded", "canceled": "Canceled", "requiresAction": "Requires action" diff --git a/packages/admin-next/dashboard/src/lib/order-helpers.ts b/packages/admin-next/dashboard/src/lib/order-helpers.ts index 1cfcae4898..ca1118d70a 100644 --- a/packages/admin-next/dashboard/src/lib/order-helpers.ts +++ b/packages/admin-next/dashboard/src/lib/order-helpers.ts @@ -1,12 +1,16 @@ -import { FulfillmentStatus, PaymentStatus } from "@medusajs/medusa" import { TFunction } from "i18next" export const getOrderPaymentStatus = ( t: TFunction<"translation">, - status: PaymentStatus + status: string ) => { - const [label, color] = ({ + const [label, color] = { not_paid: [t("orders.payment.status.notPaid"), "red"], + authorized: [t("orders.payment.status.authorized"), "orange"], + partially_authorized: [ + t("orders.payment.status.partiallyAuthorized"), + "red", + ], awaiting: [t("orders.payment.status.awaiting"), "orange"], captured: [t("orders.payment.status.captured"), "green"], refunded: [t("orders.payment.status.refunded"), "green"], @@ -14,18 +18,20 @@ export const getOrderPaymentStatus = ( t("orders.payment.status.partiallyRefunded"), "orange", ], + partially_captured: [ + t("orders.payment.status.partiallyCaptured"), + "orange", + ], canceled: [t("orders.payment.status.canceled"), "red"], requires_action: [t("orders.payment.status.requiresAction"), "orange"], - }[status] || - // TODO: remove this when Order<>Payment are linked - "not_paid") as [string, "red" | "orange" | "green"] + }[status] return { label, color } } export const getOrderFulfillmentStatus = ( t: TFunction<"translation">, - status: FulfillmentStatus + status: string ) => { const [label, color] = { not_fulfilled: [t("orders.fulfillment.status.notFulfilled"), "red"], diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/constants.ts b/packages/admin-next/dashboard/src/routes/orders/order-detail/constants.ts index 7dad163f0a..1ab3ceac18 100644 --- a/packages/admin-next/dashboard/src/routes/orders/order-detail/constants.ts +++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/constants.ts @@ -4,7 +4,6 @@ const DEFAULT_PROPERTIES = [ "created_at", "canceled_at", "email", - // "payment_status", // -> TODO replacement for this "display_id", "currency_code", // --- TOTALS --- diff --git a/packages/admin-next/dashboard/src/routes/orders/order-list/const.ts b/packages/admin-next/dashboard/src/routes/orders/order-list/const.ts index b1d1c31b75..a79f925158 100644 --- a/packages/admin-next/dashboard/src/routes/orders/order-list/const.ts +++ b/packages/admin-next/dashboard/src/routes/orders/order-list/const.ts @@ -4,7 +4,8 @@ const DEFAULT_PROPERTIES = [ "created_at", "email", "display_id", - // "payment_status", // -> TODO replacement for this + "payment_status", + "fulfillment_status", "total", "currency_code", ]