From f8b6d827801fb1e2df9260709145f3ac293dd9fc Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Thu, 9 Jan 2025 20:25:34 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(coupon):=20Rename=20'server'?=
 =?UTF-8?q?=20field=20to=20'subscribe'=20in=20coupon=20form=20and=20update?=
 =?UTF-8?q?=20coupon=20update=20request=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/dashboard/coupon/coupon-form.tsx | 2 +-
 apps/admin/app/dashboard/coupon/page.tsx        | 4 ++--
 packages/ui/src/custom-components/combobox.tsx  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/admin/app/dashboard/coupon/coupon-form.tsx b/apps/admin/app/dashboard/coupon/coupon-form.tsx
index 1969a42..f9df564 100644
--- a/apps/admin/app/dashboard/coupon/coupon-form.tsx
+++ b/apps/admin/app/dashboard/coupon/coupon-form.tsx
@@ -235,7 +235,7 @@ export default function CouponForm<T extends Record<string, any>>({
               )}
               <FormField
                 control={form.control}
-                name='server'
+                name='subscribe'
                 render={({ field }) => (
                   <FormItem>
                     <FormLabel>{t('form.specifiedServer')}</FormLabel>
diff --git a/apps/admin/app/dashboard/coupon/page.tsx b/apps/admin/app/dashboard/coupon/page.tsx
index 0ee0c87..e999782 100644
--- a/apps/admin/app/dashboard/coupon/page.tsx
+++ b/apps/admin/app/dashboard/coupon/page.tsx
@@ -96,9 +96,9 @@ export default function Page() {
                 defaultChecked={row.getValue('enable')}
                 onCheckedChange={async (checked) => {
                   await updateCoupon({
-                    ...row,
+                    ...row.original,
                     enable: checked,
-                  } as any);
+                  } as API.UpdateCouponRequest);
                   ref.current?.refresh();
                 }}
               />
diff --git a/packages/ui/src/custom-components/combobox.tsx b/packages/ui/src/custom-components/combobox.tsx
index 3e29c87..b583dbf 100644
--- a/packages/ui/src/custom-components/combobox.tsx
+++ b/packages/ui/src/custom-components/combobox.tsx
@@ -100,7 +100,7 @@ export function Combobox<T, M extends boolean = false>({
               {options.map((option) => (
                 <CommandItem
                   key={String(option.label + option.value)}
-                  value={option.label}
+                  value={option.label + option.value}
                   onSelect={() => handleSelect(option.value)}
                 >
                   {option.children || option.label}