Skip to content

Commit

Permalink
🐛 fix(types): Order type
Browse files Browse the repository at this point in the history
  • Loading branch information
web-ppanel committed Nov 26, 2024
1 parent 255bd82 commit c7e50a9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
12 changes: 9 additions & 3 deletions apps/admin/app/dashboard/order/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,19 @@ export default function Page() {
</span>
</li>
<li className='flex items-center justify-between'>
<span className='text-muted-foreground'>{t('reductionPrice')}</span>
<span className='text-muted-foreground'>{t('discount')}</span>
<span>
<Display type='currency' value={row.original.reduction} />
<Display type='currency' value={row.original.discount} />
</span>
</li>
<li className='flex items-center justify-between'>
<span className='text-muted-foreground'>{t('feAmount')}</span>
<span className='text-muted-foreground'>{t('couponDiscount')}</span>
<span>
<Display type='currency' value={row.original.coupon_discount} />
</span>
</li>
<li className='flex items-center justify-between'>
<span className='text-muted-foreground'>{t('feeAmount')}</span>
<span>
<Display type='currency' value={row.original.fee_amount} />
</span>
Expand Down
5 changes: 3 additions & 2 deletions apps/admin/locales/en-US/order.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"amount": "Amount",
"couponDiscount": "Coupon Discount",
"discount": "Discount Amount",
"failed": "Failed",
"feAmount": "Fee Amount",
"feeAmount": "Fee Amount",
"method": "Payment Method",
"methods": {
"alipay_f2f": "Alipay (Face to Face)",
Expand All @@ -11,7 +13,6 @@
"stripe_wechat_pay": "Stripe (WeChat)"
},
"orderNumber": "Order Number",
"reductionPrice": "Discount Amount",
"status": "Order Status",
"subscribe": "Subscribe",
"subscribePrice": "Subscription Price",
Expand Down
5 changes: 3 additions & 2 deletions apps/admin/locales/zh-CN/order.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"amount": "金额",
"couponDiscount": "优惠券折扣",
"discount": "折扣金额",
"failed": "失败",
"feAmount": "手续费",
"feeAmount": "手续费",
"method": "支付方式",
"methods": {
"alipay_f2f": "支付宝(面对面)",
Expand All @@ -11,7 +13,6 @@
"stripe_wechat_pay": "Stripe(微信)"
},
"orderNumber": "订单编号",
"reductionPrice": "优惠金额",
"status": {
"0": "状态",
"1": "待支付",
Expand Down

0 comments on commit c7e50a9

Please sign in to comment.