diff --git a/apps/admin/services/admin/index.ts b/apps/admin/services/admin/index.ts index 944988e..32cbdf0 100644 --- a/apps/admin/services/admin/index.ts +++ b/apps/admin/services/admin/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间: // API 唯一标识: import * as announcement from './announcement'; diff --git a/apps/user/components/subscribe/billing.tsx b/apps/user/components/subscribe/billing.tsx index 93ec19f..8f3026e 100644 --- a/apps/user/components/subscribe/billing.tsx +++ b/apps/user/components/subscribe/billing.tsx @@ -4,9 +4,7 @@ import { Display } from '@/components/display'; import { Separator } from '@workspace/ui/components/separator'; import { useTranslations } from 'next-intl'; -export function SubscribeBilling({ - order, -}: { +interface SubscribeBillingProps { order?: Partial< API.OrderDetail & { unit_price: number; @@ -14,7 +12,9 @@ export function SubscribeBilling({ subscribe_discount: number; } >; -}) { +} + +export function SubscribeBilling({ order }: Readonly) { const t = useTranslations('subscribe'); return ( @@ -47,14 +47,6 @@ export function SubscribeBilling({ - {order?.subscribe_discount && ( -
  • - {t('subscriptionDiscount')} - - - -
  • - )}
  • {t('billing.fee')} diff --git a/apps/user/components/subscribe/subscribe-selector.tsx b/apps/user/components/subscribe/subscribe-selector.tsx deleted file mode 100644 index ed45803..0000000 --- a/apps/user/components/subscribe/subscribe-selector.tsx +++ /dev/null @@ -1,78 +0,0 @@ -'use client'; - -import { Display } from '@/components/display'; -import useGlobalStore from '@/config/use-global'; -import { Combobox } from '@workspace/ui/custom-components/combobox'; -import { formatDate } from '@workspace/ui/utils'; -import { useTranslations } from 'next-intl'; -import { useCallback, useEffect, useMemo } from 'react'; - -interface SubscribeSelectorProps { - value?: number; - data: API.SubscribeDiscountInfo[]; - onChange: (value: number) => void; -} - -const SubscribeSelector: React.FC = ({ value, data, onChange }) => { - const t = useTranslations('subscribe'); - const { common } = useGlobalStore(); - const singleModel = common.subscribe.single_model; - - useEffect(() => { - if (singleModel && data.length > 0 && data[0]) { - onChange(data[0].id); - } - }, [data, singleModel, onChange, value]); - - const handleChange = useCallback( - (selectedValue: number) => { - if (singleModel) { - if (selectedValue) { - onChange(selectedValue); - } - } else { - onChange(selectedValue); - } - }, - [singleModel, onChange], - ); - - const options = useMemo(() => { - return data.map((item) => ({ - children: ( -
    -
    - {item.name} - -
    - - - -
    - ), - label: item.name, - value: item.id, - })); - }, [data]); - - if (!data.length) return null; - - return ( - <> -
    {t('subscriptionDiscount')}
    - - placeholder={t('selectSubscription')} - options={options} - value={value} - onChange={handleChange} - /> - - ); -}; - -export default SubscribeSelector; diff --git a/apps/user/locales/cs-CZ/subscribe.json b/apps/user/locales/cs-CZ/subscribe.json index db9f431..918ffca 100644 --- a/apps/user/locales/cs-CZ/subscribe.json +++ b/apps/user/locales/cs-CZ/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Obnovit cenu", "resetTraffic": "Obnovit provoz", "resetTrafficDescription": "Obnovit provoz pouze pro aktuální měsíc", - "resetTrafficTitle": "Obnovit provoz", - "selectSubscription": "Vyberte předplatné", - "subscriptionDiscount": "Sleva na předplatné" + "resetTrafficTitle": "Obnovit provoz" } diff --git a/apps/user/locales/de-DE/subscribe.json b/apps/user/locales/de-DE/subscribe.json index bdc835a..629731c 100644 --- a/apps/user/locales/de-DE/subscribe.json +++ b/apps/user/locales/de-DE/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Preis zurücksetzen", "resetTraffic": "Datenverkehr zurücksetzen", "resetTrafficDescription": "Verkehr nur für den aktuellen Monat zurücksetzen", - "resetTrafficTitle": "Datenverkehr zurücksetzen", - "selectSubscription": "Abonnement auswählen", - "subscriptionDiscount": "Abonnementrabatt" + "resetTrafficTitle": "Datenverkehr zurücksetzen" } diff --git a/apps/user/locales/en-US/subscribe.json b/apps/user/locales/en-US/subscribe.json index ad03a4f..9fc9143 100644 --- a/apps/user/locales/en-US/subscribe.json +++ b/apps/user/locales/en-US/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Reset Price", "resetTraffic": "Reset Traffic", "resetTrafficDescription": "Reset traffic for the current month only", - "resetTrafficTitle": "Reset Traffic", - "selectSubscription": "Select Subscription", - "subscriptionDiscount": "Subscription Discount" + "resetTrafficTitle": "Reset Traffic" } diff --git a/apps/user/locales/es-ES/subscribe.json b/apps/user/locales/es-ES/subscribe.json index fb7d20b..45fd290 100644 --- a/apps/user/locales/es-ES/subscribe.json +++ b/apps/user/locales/es-ES/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Restablecer Precio", "resetTraffic": "Restablecer Tráfico", "resetTrafficDescription": "Restablecer el tráfico solo para el mes actual", - "resetTrafficTitle": "Restablecer Tráfico", - "selectSubscription": "Seleccionar suscripción", - "subscriptionDiscount": "Descuento de Suscripción" + "resetTrafficTitle": "Restablecer Tráfico" } diff --git a/apps/user/locales/es-MX/subscribe.json b/apps/user/locales/es-MX/subscribe.json index cd234be..a357888 100644 --- a/apps/user/locales/es-MX/subscribe.json +++ b/apps/user/locales/es-MX/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Restablecer Precio", "resetTraffic": "Restablecer Tráfico", "resetTrafficDescription": "Restablecer el tráfico solo para el mes actual", - "resetTrafficTitle": "Restablecer Tráfico", - "selectSubscription": "Seleccionar Suscripción", - "subscriptionDiscount": "Descuento por Suscripción" + "resetTrafficTitle": "Restablecer Tráfico" } diff --git a/apps/user/locales/fa-IR/subscribe.json b/apps/user/locales/fa-IR/subscribe.json index 746ccf3..37954a7 100644 --- a/apps/user/locales/fa-IR/subscribe.json +++ b/apps/user/locales/fa-IR/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "بازنشانی قیمت", "resetTraffic": "بازنشانی ترافیک", "resetTrafficDescription": "بازنشانی ترافیک فقط برای ماه جاری", - "resetTrafficTitle": "بازنشانی ترافیک", - "selectSubscription": "انتخاب اشتراک", - "subscriptionDiscount": "تخفیف اشتراک" + "resetTrafficTitle": "بازنشانی ترافیک" } diff --git a/apps/user/locales/fi-FI/subscribe.json b/apps/user/locales/fi-FI/subscribe.json index a7a3e5b..e85bb71 100644 --- a/apps/user/locales/fi-FI/subscribe.json +++ b/apps/user/locales/fi-FI/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Nollaa hinta", "resetTraffic": "Nollaa liikenne", "resetTrafficDescription": "Nollaa liikenne vain kuluvan kuukauden osalta", - "resetTrafficTitle": "Nollaa liikenne", - "selectSubscription": "Valitse tilaus", - "subscriptionDiscount": "Tilauksen alennus" + "resetTrafficTitle": "Nollaa liikenne" } diff --git a/apps/user/locales/fr-FR/subscribe.json b/apps/user/locales/fr-FR/subscribe.json index 6631ef5..7916755 100644 --- a/apps/user/locales/fr-FR/subscribe.json +++ b/apps/user/locales/fr-FR/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Réinitialiser le prix", "resetTraffic": "Réinitialiser le trafic", "resetTrafficDescription": "Réinitialiser le trafic pour le mois en cours uniquement", - "resetTrafficTitle": "Réinitialiser le trafic", - "selectSubscription": "Sélectionner l'abonnement", - "subscriptionDiscount": "Remise sur l'abonnement" + "resetTrafficTitle": "Réinitialiser le trafic" } diff --git a/apps/user/locales/hi-IN/subscribe.json b/apps/user/locales/hi-IN/subscribe.json index 039d39e..db32bc1 100644 --- a/apps/user/locales/hi-IN/subscribe.json +++ b/apps/user/locales/hi-IN/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "मूल्य रीसेट करें", "resetTraffic": "ट्रैफ़िक रीसेट करें", "resetTrafficDescription": "केवल वर्तमान माह के लिए ट्रैफिक रीसेट करें", - "resetTrafficTitle": "ट्रैफ़िक रीसेट करें", - "selectSubscription": "सदस्यता चुनें", - "subscriptionDiscount": "सदस्यता छूट" + "resetTrafficTitle": "ट्रैफ़िक रीसेट करें" } diff --git a/apps/user/locales/hu-HU/subscribe.json b/apps/user/locales/hu-HU/subscribe.json index 91cb7c0..4ec86d7 100644 --- a/apps/user/locales/hu-HU/subscribe.json +++ b/apps/user/locales/hu-HU/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Ár visszaállítása", "resetTraffic": "Forgalom visszaállítása", "resetTrafficDescription": "Forgalmi adatok visszaállítása csak az aktuális hónapra", - "resetTrafficTitle": "Forgalom visszaállítása", - "selectSubscription": "Előfizetés kiválasztása", - "subscriptionDiscount": "Előfizetési kedvezmény" + "resetTrafficTitle": "Forgalom visszaállítása" } diff --git a/apps/user/locales/ja-JP/subscribe.json b/apps/user/locales/ja-JP/subscribe.json index c0b6ae0..e5beeef 100644 --- a/apps/user/locales/ja-JP/subscribe.json +++ b/apps/user/locales/ja-JP/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "価格をリセット", "resetTraffic": "トラフィックをリセット", "resetTrafficDescription": "今月のみのトラフィックをリセットする", - "resetTrafficTitle": "トラフィックをリセット", - "selectSubscription": "サブスクリプションを選択", - "subscriptionDiscount": "サブスクリプション割引" + "resetTrafficTitle": "トラフィックをリセット" } diff --git a/apps/user/locales/ko-KR/subscribe.json b/apps/user/locales/ko-KR/subscribe.json index 43df7c2..d686c76 100644 --- a/apps/user/locales/ko-KR/subscribe.json +++ b/apps/user/locales/ko-KR/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "가격 재설정", "resetTraffic": "트래픽 재설정", "resetTrafficDescription": "현재 월에 대한 트래픽만 재설정", - "resetTrafficTitle": "트래픽 재설정", - "selectSubscription": "구독 선택", - "subscriptionDiscount": "구독 할인" + "resetTrafficTitle": "트래픽 재설정" } diff --git a/apps/user/locales/no-NO/subscribe.json b/apps/user/locales/no-NO/subscribe.json index c7c0a3f..08e5407 100644 --- a/apps/user/locales/no-NO/subscribe.json +++ b/apps/user/locales/no-NO/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Tilbakestill pris", "resetTraffic": "Tilbakestill trafikk", "resetTrafficDescription": "Tilbakestill trafikk kun for inneværende måned", - "resetTrafficTitle": "Nullstill trafikk", - "selectSubscription": "Velg abonnement", - "subscriptionDiscount": "Abonnementsrabatt" + "resetTrafficTitle": "Nullstill trafikk" } diff --git a/apps/user/locales/pl-PL/subscribe.json b/apps/user/locales/pl-PL/subscribe.json index 8bf81d7..a4bc735 100644 --- a/apps/user/locales/pl-PL/subscribe.json +++ b/apps/user/locales/pl-PL/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Zresetuj cenę", "resetTraffic": "Zresetuj ruch", "resetTrafficDescription": "Zresetuj ruch tylko na bieżący miesiąc", - "resetTrafficTitle": "Zresetuj Ruch", - "selectSubscription": "Wybierz subskrypcję", - "subscriptionDiscount": "Zniżka na subskrypcję" + "resetTrafficTitle": "Zresetuj Ruch" } diff --git a/apps/user/locales/pt-BR/subscribe.json b/apps/user/locales/pt-BR/subscribe.json index 4fc61b9..c661749 100644 --- a/apps/user/locales/pt-BR/subscribe.json +++ b/apps/user/locales/pt-BR/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Redefinir Preço", "resetTraffic": "Redefinir Tráfego", "resetTrafficDescription": "Redefinir o tráfego apenas para o mês atual", - "resetTrafficTitle": "Redefinir Tráfego", - "selectSubscription": "Selecionar Assinatura", - "subscriptionDiscount": "Desconto na Assinatura" + "resetTrafficTitle": "Redefinir Tráfego" } diff --git a/apps/user/locales/ro-RO/subscribe.json b/apps/user/locales/ro-RO/subscribe.json index 755600b..454cbae 100644 --- a/apps/user/locales/ro-RO/subscribe.json +++ b/apps/user/locales/ro-RO/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Resetează Prețul", "resetTraffic": "Resetează Traficul", "resetTrafficDescription": "Resetează traficul doar pentru luna curentă", - "resetTrafficTitle": "Resetează Traficul", - "selectSubscription": "Selectați Abonamentul", - "subscriptionDiscount": "Reducere la abonament" + "resetTrafficTitle": "Resetează Traficul" } diff --git a/apps/user/locales/ru-RU/subscribe.json b/apps/user/locales/ru-RU/subscribe.json index 5f882ed..4257cc3 100644 --- a/apps/user/locales/ru-RU/subscribe.json +++ b/apps/user/locales/ru-RU/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Сбросить цену", "resetTraffic": "Сбросить трафик", "resetTrafficDescription": "Сбросить трафик только за текущий месяц", - "resetTrafficTitle": "Сбросить трафик", - "selectSubscription": "Выберите подписку", - "subscriptionDiscount": "Скидка на подписку" + "resetTrafficTitle": "Сбросить трафик" } diff --git a/apps/user/locales/th-TH/subscribe.json b/apps/user/locales/th-TH/subscribe.json index 16d1bc4..3adf751 100644 --- a/apps/user/locales/th-TH/subscribe.json +++ b/apps/user/locales/th-TH/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "รีเซ็ตราคา", "resetTraffic": "รีเซ็ตการจราจร", "resetTrafficDescription": "รีเซ็ตการใช้งานข้อมูลสำหรับเดือนปัจจุบันเท่านั้น", - "resetTrafficTitle": "รีเซ็ตการจราจร", - "selectSubscription": "เลือกการสมัครสมาชิก", - "subscriptionDiscount": "ส่วนลดการสมัครสมาชิก" + "resetTrafficTitle": "รีเซ็ตการจราจร" } diff --git a/apps/user/locales/tr-TR/subscribe.json b/apps/user/locales/tr-TR/subscribe.json index b2f23b8..e188d75 100644 --- a/apps/user/locales/tr-TR/subscribe.json +++ b/apps/user/locales/tr-TR/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Fiyatı Sıfırla", "resetTraffic": "Trafiği Sıfırla", "resetTrafficDescription": "Yalnızca mevcut ay için trafiği sıfırla", - "resetTrafficTitle": "Trafiği Sıfırla", - "selectSubscription": "Abonelik Seç", - "subscriptionDiscount": "Abonelik İndirimi" + "resetTrafficTitle": "Trafiği Sıfırla" } diff --git a/apps/user/locales/uk-UA/subscribe.json b/apps/user/locales/uk-UA/subscribe.json index 28564a5..059178d 100644 --- a/apps/user/locales/uk-UA/subscribe.json +++ b/apps/user/locales/uk-UA/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Скинути ціну", "resetTraffic": "Скинути трафік", "resetTrafficDescription": "Скинути трафік лише для поточного місяця", - "resetTrafficTitle": "Скинути трафік", - "selectSubscription": "Виберіть підписку", - "subscriptionDiscount": "Знижка на підписку" + "resetTrafficTitle": "Скинути трафік" } diff --git a/apps/user/locales/vi-VN/subscribe.json b/apps/user/locales/vi-VN/subscribe.json index 2d7bce2..f58f68a 100644 --- a/apps/user/locales/vi-VN/subscribe.json +++ b/apps/user/locales/vi-VN/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "Đặt lại giá", "resetTraffic": "Đặt lại Lưu lượng", "resetTrafficDescription": "Đặt lại lưu lượng truy cập chỉ cho tháng hiện tại", - "resetTrafficTitle": "Đặt lại Lưu lượng", - "selectSubscription": "Chọn Gói Đăng Ký", - "subscriptionDiscount": "Giảm giá Đăng ký" + "resetTrafficTitle": "Đặt lại Lưu lượng" } diff --git a/apps/user/locales/zh-CN/subscribe.json b/apps/user/locales/zh-CN/subscribe.json index f4027b3..4b83eb2 100644 --- a/apps/user/locales/zh-CN/subscribe.json +++ b/apps/user/locales/zh-CN/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "重置价格", "resetTraffic": "重置流量", "resetTrafficDescription": "仅重置本月的流量", - "resetTrafficTitle": "重置流量", - "selectSubscription": "选择订阅", - "subscriptionDiscount": "订阅折扣" + "resetTrafficTitle": "重置流量" } diff --git a/apps/user/locales/zh-HK/subscribe.json b/apps/user/locales/zh-HK/subscribe.json index 2fe24c9..5f88285 100644 --- a/apps/user/locales/zh-HK/subscribe.json +++ b/apps/user/locales/zh-HK/subscribe.json @@ -49,7 +49,5 @@ "resetPrice": "重設價格", "resetTraffic": "重設流量", "resetTrafficDescription": "僅重設本月的流量", - "resetTrafficTitle": "重設流量", - "selectSubscription": "選擇訂閱", - "subscriptionDiscount": "訂閱折扣" + "resetTrafficTitle": "重設流量" }