Merge remote-tracking branch 'upstream/main'

apps/admin/public/assets/locales/en-US/user.json

@@ -73,6 +73,14 @@
   "referrerUserId": "Referrer User ID",
   "remove": "Remove",
   "resetLogs": "Reset Logs",
+  "resetTraffic": "Reset Traffic",
+  "toggleStatus": "Toggle Status",
+  "resetSubscriptionToken": "Reset Token",
+  "resetSubscriptionTokenDescription": "This will reset the subscription token. Old links will become invalid.",
+  "resetSubscriptionTraffic": "Reset Traffic",
+  "resetSubscriptionTrafficDescription": "This will reset the subscription traffic counters.",
+  "toggleSubscriptionStatus": "Toggle Status",
+  "toggleSubscriptionStatusDescription": "This will toggle the subscription status.",
   "resetTime": "Reset Time",
   "resetToken": "Reset Subscription Address",
   "resetTokenDescription": "This will reset the subscription address and regenerate a new token.",

apps/admin/public/assets/locales/zh-CN/user.json

@@ -73,6 +73,14 @@
   "referrerUserId": "推荐人用户 ID",
   "remove": "移除",
   "resetLogs": "重置日志",
+  "resetTraffic": "重置流量",
+  "toggleStatus": "切换状态",
+  "resetSubscriptionToken": "重置令牌",
+  "resetSubscriptionTokenDescription": "将重置订阅令牌，旧订阅链接会失效。",
+  "resetSubscriptionTraffic": "重置流量",
+  "resetSubscriptionTrafficDescription": "将重置该订阅的流量统计。",
+  "toggleSubscriptionStatus": "切换状态",
+  "toggleSubscriptionStatusDescription": "将切换该订阅的启用/停用状态。",
   "resetTime": "重置时间",
   "resetToken": "重置订阅地址",
   "resetTokenDescription": "这将重置订阅地址并重新生成新的令牌。",

apps/admin/src/sections/product/subscribe-form.tsx

@@ -77,6 +77,7 @@ const defaultValues = {
   purchase_with_discount: false,
   reset_cycle: 0,
   renewal_reset: false,
+  show_original_price: false,
   deduction_mode: "auto",
 };
 
@@ -837,6 +838,41 @@ export default function SubscribeForm<T extends Record<string, any>>({
                         </FormItem>
                       )}
                     />
+
+                    <FormField
+                      control={form.control}
+                      name="show_original_price"
+                      render={({ field }) => (
+                        <FormItem>
+                          <div className="flex items-center justify-between">
+                            <div className="space-y-0.5">
+                              <FormLabel>
+                                {t(
+                                  "form.showOriginalPrice",
+                                  "Show Original Price"
+                                )}
+                              </FormLabel>
+                              <FormDescription>
+                                {t(
+                                  "form.showOriginalPriceDescription",
+                                  "Display original price in the storefront"
+                                )}
+                              </FormDescription>
+                            </div>
+                            <FormControl>
+                              <Switch
+                                checked={!!field.value}
+                                onCheckedChange={(value) =>
+                                  form.setValue(field.name, value)
+                                }
+                              />
+                            </FormControl>
+                          </div>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
                     <FormField
                       control={form.control}
                       name="allow_deduction"

apps/admin/src/sections/system/user-security/verify-form.tsx

@@ -37,7 +37,7 @@ const verifySchema = z.object({
   turnstile_secret: z.string().optional(),
   enable_register_verify: z.boolean().optional(),
   enable_login_verify: z.boolean().optional(),
-  enable_password_verify: z.boolean().optional(),
+  enable_reset_password_verify: z.boolean().optional(),
 });
 
 type VerifyFormData = z.infer<typeof verifySchema>;
@@ -63,7 +63,7 @@ export default function VerifyConfig() {
       turnstile_secret: "",
       enable_register_verify: false,
       enable_login_verify: false,
-      enable_password_verify: false,
+      enable_reset_password_verify: false,
     },
   });
 
@@ -243,7 +243,7 @@ export default function VerifyConfig() {
 
               <FormField
                 control={form.control}
-                name="enable_password_verify"
+                name="enable_reset_password_verify"
                 render={({ field }) => (
                   <FormItem>
                     <FormLabel>

apps/admin/src/sections/user/index.tsx

@@ -69,7 +69,11 @@ export default function User() {
       action={ref}
       actions={{
         render: (row) => [
-          <ProfileSheet key="profile" userId={row.id} />,
+          <ProfileSheet
+            key="profile"
+            onUpdated={() => ref.current?.refresh()}
+            userId={row.id}
+          />,
           <SubscriptionSheet key="subscription" userId={row.id} />,
           <ConfirmButton
             cancelText={t("cancel", "Cancel")}
@@ -308,7 +312,13 @@ export default function User() {
   );
 }
 
-function ProfileSheet({ userId }: { userId: number }) {
+function ProfileSheet({
+  userId,
+  onUpdated,
+}: {
+  userId: number;
+  onUpdated?: () => void;
+}) {
   const { t } = useTranslation("user");
   const [open, setOpen] = useState(false);
   const { data: user, refetch } = useQuery({
@@ -319,6 +329,12 @@ function ProfileSheet({ userId }: { userId: number }) {
       return data.data as API.User;
     },
   });
+
+  const refetchAll = async () => {
+    await refetch();
+    onUpdated?.();
+    return Promise.resolve();
+  };
   return (
     <Sheet onOpenChange={setOpen} open={open}>
       <SheetTrigger asChild>
@@ -348,13 +364,13 @@ function ProfileSheet({ userId }: { userId: number }) {
                 </TabsTrigger>
               </TabsList>
               <TabsContent className="mt-0" value="basic">
-                <BasicInfoForm refetch={refetch as any} user={user} />
+                <BasicInfoForm refetch={refetchAll} user={user} />
               </TabsContent>
               <TabsContent className="mt-0" value="notify">
-                <NotifySettingsForm refetch={refetch as any} user={user} />
+                <NotifySettingsForm refetch={refetchAll} user={user} />
               </TabsContent>
               <TabsContent className="mt-0" value="auth">
-                <AuthMethodsForm refetch={refetch as any} user={user} />
+                <AuthMethodsForm refetch={refetchAll} user={user} />
               </TabsContent>
             </Tabs>
           </ScrollArea>

apps/admin/src/sections/user/user-profile/auth-methods-form.tsx

@@ -21,7 +21,7 @@ export function AuthMethodsForm({
   refetch,
 }: {
   user: API.User;
-  refetch: () => void;
+  refetch: () => Promise<unknown>;
 }) {
   const { t } = useTranslation("user");
 

apps/admin/src/sections/user/user-profile/basic-info-form.tsx

@@ -47,7 +47,7 @@ export function BasicInfoForm({
   refetch,
 }: {
   user: API.User;
-  refetch: () => void;
+  refetch: () => Promise<unknown>;
 }) {
   const { t } = useTranslation("user");
 

apps/admin/src/sections/user/user-profile/notify-settings-form.tsx

@@ -34,7 +34,7 @@ export function NotifySettingsForm({
   refetch,
 }: {
   user: API.User;
-  refetch: () => void;
+  refetch: () => Promise<unknown>;
 }) {
   const { t } = useTranslation("user");
 

apps/admin/vite.config.ts

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { fileURLToPath, URL } from "node:url";
 import tailwindcss from "@tailwindcss/vite";
 import { devtools } from "@tanstack/devtools-vite";
@@ -18,6 +18,8 @@ function versionLockPlugin(): Plugin {
       );
       const rootPkg = JSON.parse(readFileSync(rootPkgPath, "utf-8"));
       const version = rootPkg.version || "0.0.0";
+
+      mkdirSync(distDir, { recursive: true });
       writeFileSync(`${distDir}/version.lock`, version);
     },
   };