Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Named the order page's ledger card after the sidebar, and dated its rows

Damian Legawiec28abd6907f95
diff --git a/packages/dashboard/src/components/spree/orders/order-seller-transfers-card.tsx b/packages/dashboard/src/components/spree/orders/order-seller-transfers-card.tsx
index 868f8656f5..c9e13d2b46 100644
--- a/packages/dashboard/src/components/spree/orders/order-seller-transfers-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/order-seller-transfers-card.tsx
@@ -13,6 +13,7 @@ import {
} from '@spree/dashboard-ui'
import { BanknoteIcon } from '@spree/dashboard-ui/icons'
import { Link } from '@tanstack/react-router'
+import i18n from 'i18next'
import { useTranslation } from 'react-i18next'
import { useSellerTransfers } from '../../../hooks/use-seller-ledger'
@@ -41,6 +42,7 @@ export function SellerTransfersCard({ order }: { order: Order }) {
<Table>
<TableHeader>
<TableRow>
+ <TableHead>{t('admin.payouts.columns.date')}</TableHead>
<TableHead>{t('admin.payouts.columns.kind')}</TableHead>
<TableHead>{t('admin.fields.status.label')}</TableHead>
<TableHead>{t('admin.nav.seller_payouts')}</TableHead>
@@ -50,6 +52,9 @@ export function SellerTransfersCard({ order }: { order: Order }) {
<TableBody>
{transfers.map((transfer) => (
<TableRow key={transfer.id}>
+ <TableCell className="whitespace-nowrap">
+ {new Date(transfer.created_at).toLocaleDateString(i18n.language)}
+ </TableCell>
<TableCell>
{t(`admin.payouts.kinds.${transfer.kind}`, { defaultValue: transfer.kind })}
</TableCell>
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index df5e824b94..839e98005d 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -5329,7 +5329,7 @@
"covers_error": "تعذر تحميل الأرباح التي تغطيها هذه الدفعة."
},
"order_card": {
- "title": "أرباح البائع",
+ "title": "تحويلات البائعين",
"view_payout": "عرض الدفعة",
"not_settled": "لم يتم الدفع بعد"
},
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 48e282a185..20ff15b805 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -2568,7 +2568,7 @@
"reports": "Berichte",
"returns": "Retouren",
"seller_payouts": "Auszahlungen",
- "seller_transfers": "Überweisungen",
+ "seller_transfers": "Verkäufer-Überweisungen",
"sellers": "Verkäufer",
"settings": "Einstellungen",
"transfers": "Umlagerungen",
@@ -5304,7 +5304,7 @@
"covers_error": "Die Einnahmen dieser Auszahlung konnten nicht geladen werden."
},
"order_card": {
- "title": "Verkäufereinnahmen",
+ "title": "Verkäufer-Überweisungen",
"view_payout": "Auszahlung ansehen",
"not_settled": "Noch nicht ausgezahlt"
},
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 4c2e9b7464..6b01f73d4b 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -5304,7 +5304,7 @@
"covers_error": "Could not load the earnings this payout covers."
},
"order_card": {
- "title": "Seller earnings",
+ "title": "Seller transfers",
"view_payout": "View payout",
"not_settled": "Not paid out yet"
},
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 4e8603b3e4..75f14c9107 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -5304,7 +5304,7 @@
"covers_error": "Impossible de charger les gains couverts par ce versement."
},
"order_card": {
- "title": "Gains du vendeur",
+ "title": "Transferts vendeurs",
"view_payout": "Voir le versement",
"not_settled": "Pas encore versé"
},
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index c48eb715d4..8b5886ffd5 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -5364,7 +5364,7 @@
"covers_error": "Nie udało się wczytać zarobków objętych tą wypłatą."
},
"order_card": {
- "title": "Zarobki sprzedawcy",
+ "title": "Transfery sprzedawców",
"view_payout": "Zobacz wypłatę",
"not_settled": "Jeszcze nie wypłacone"
},
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index 1a1c65c3c2..e6248fc43a 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -2561,7 +2561,7 @@
"reports": "报表",
"returns": "退货",
"seller_payouts": "打款",
- "seller_transfers": "收入",
+ "seller_transfers": "卖家收入转账",
"sellers": "卖家",
"settings": "设置",
"transfers": "调拨",
@@ -5294,7 +5294,7 @@
"covers_error": "无法加载此打款涵盖的收入。"
},
"order_card": {
- "title": "卖家收入",
+ "title": "卖家收入转账",
"view_payout": "查看打款",
"not_settled": "尚未打款"
},
diff --git a/packages/seller-dashboard/src/components/orders/order-earnings-card.tsx b/packages/seller-dashboard/src/components/orders/order-earnings-card.tsx
index f2bf2762e4..73dca642d0 100644
--- a/packages/seller-dashboard/src/components/orders/order-earnings-card.tsx
+++ b/packages/seller-dashboard/src/components/orders/order-earnings-card.tsx
@@ -14,6 +14,7 @@ import {
import { BanknoteIcon } from '@spree/dashboard-ui/icons'
import type { Order } from '@spree/seller-sdk'
import { Link, useParams } from '@tanstack/react-router'
+import i18n from 'i18next'
import { useTranslation } from 'react-i18next'
import { useTransfers } from '../../hooks/use-ledger'
@@ -47,6 +48,7 @@ export function OrderEarningsCard({ order }: { order: Order }) {
<Table>
<TableHeader>
<TableRow>
+ <TableHead>{t('earnings.columns.date')}</TableHead>
<TableHead>{t('earnings.columns.kind')}</TableHead>
<TableHead>{t('earnings.columns.status')}</TableHead>
<TableHead>{t('orders.earnings.payout')}</TableHead>
@@ -56,6 +58,9 @@ export function OrderEarningsCard({ order }: { order: Order }) {
<TableBody>
{transfers.map((transfer) => (
<TableRow key={transfer.id}>
+ <TableCell className="whitespace-nowrap">
+ {new Date(transfer.created_at).toLocaleDateString(i18n.language)}
+ </TableCell>
<TableCell>
{t(`earnings.kinds.${transfer.kind}`, { defaultValue: transfer.kind })}
</TableCell>