diff --git a/apps/user/public/assets/locales/en-US/subscribe.json b/apps/user/public/assets/locales/en-US/subscribe.json index 77526c0..812832f 100644 --- a/apps/user/public/assets/locales/en-US/subscribe.json +++ b/apps/user/public/assets/locales/en-US/subscribe.json @@ -9,6 +9,7 @@ "originalPrice": "Original Price (Monthly)", "price": "Price", "productDiscount": "Product Discount", + "promoDiscount": "Promo Discount", "total": "Total" }, "buy": "Buy", diff --git a/apps/user/public/assets/locales/zh-CN/subscribe.json b/apps/user/public/assets/locales/zh-CN/subscribe.json index ece8ba7..d0375bb 100644 --- a/apps/user/public/assets/locales/zh-CN/subscribe.json +++ b/apps/user/public/assets/locales/zh-CN/subscribe.json @@ -9,6 +9,7 @@ "originalPrice": "原价(按月)", "price": "价格", "productDiscount": "商品折扣", + "promoDiscount": "促销优惠", "total": "总价" }, "buy": "购买", diff --git a/apps/user/src/sections/subscribe/billing.tsx b/apps/user/src/sections/subscribe/billing.tsx index c24db2e..ec016a4 100644 --- a/apps/user/src/sections/subscribe/billing.tsx +++ b/apps/user/src/sections/subscribe/billing.tsx @@ -10,6 +10,7 @@ interface SubscribeBillingProps { unit_price: number; unit_time: string; subscribe_discount: number; + promo_discount: number; show_original_price?: boolean; } >; @@ -66,6 +67,14 @@ export function SubscribeBilling({ order }: Readonly) { +
  • + + {t("billing.promoDiscount", "Promo Discount")} + + + + +
  • {t("billing.couponDiscount", "Coupon Discount")} diff --git a/apps/user/src/sections/subscribe/promo-info.tsx b/apps/user/src/sections/subscribe/promo-info.tsx index d6f439e..55f88c0 100644 --- a/apps/user/src/sections/subscribe/promo-info.tsx +++ b/apps/user/src/sections/subscribe/promo-info.tsx @@ -18,10 +18,10 @@ export function PromoInfo({ discount }: Readonly) { {promo.rule_name || t("promo.available", "Promo Available")} - {promo.end_time && ( + {promo.expires_at && ( {t("promo.validUntil", "Valid until")}:{" "} - {new Date(promo.end_time * 1000).toLocaleString()} + {new Date(promo.expires_at * 1000).toLocaleString()} )} diff --git a/packages/ui/src/services/user/typings.d.ts b/packages/ui/src/services/user/typings.d.ts index cfcc498..9a5e1be 100644 --- a/packages/ui/src/services/user/typings.d.ts +++ b/packages/ui/src/services/user/typings.d.ts @@ -548,6 +548,7 @@ declare namespace API { price: number; amount: number; discount: number; + promo_discount: number; gift_amount: number; coupon: string; coupon_discount: number; @@ -1024,8 +1025,9 @@ declare namespace API { type SubscribeDiscountPromo = { rule_name?: string; + rule_type?: string; promo_price: number; - end_time?: number; + expires_at?: number; }; type SubscribeGroup = {