diff --git a/src/api/parking.ts b/src/api/parking.ts index 7b5317e..962e623 100644 --- a/src/api/parking.ts +++ b/src/api/parking.ts @@ -7,7 +7,7 @@ export type 駐車場マスタ = { }; export type サービス券マスタ = { discount_ticket_code: number; - ticket_name: string; + ticket_name: string | null; }; // -------駐車場マスタ一覧取得--------------- diff --git a/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/サービス券.tsx b/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/サービス券.tsx index d452709..edfee39 100644 --- a/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/サービス券.tsx +++ b/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/サービス券.tsx @@ -35,11 +35,8 @@ export default function Page({ const target = discountTickets.find((ele) => { return ele.discount_ticket_code === setting.discount_ticket_code; }); - return sprintf( - "%s(%d)", - target?.ticket_name ?? "", - setting.discount_ticket_code - ); + if (!target) return "-"; + return !!target.ticket_name ? target.ticket_name : ""; }, [discountTickets, setting]); const handleRemove = () => { diff --git a/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/駐車場設定.tsx b/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/駐車場設定.tsx index e579ba7..886bab6 100644 --- a/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/駐車場設定.tsx +++ b/src/pages/dashboard/shop/店舗詳細/QR認証設定/駐車場一覧/駐車場設定.tsx @@ -97,7 +97,7 @@ export default function Page({ settings, deleteParkingSetting }: RowProps) { ) ) .map((ele) => ({ - label: sprintf("%s(%d)", ele.ticket_name, ele.discount_ticket_code), + label: !!ele.ticket_name ? ele.ticket_name : "-", value: String(ele.discount_ticket_code), })); }, [サービス券マスタ, settings]); diff --git a/src/pages/qr-service/QRサービス券承認.tsx b/src/pages/qr-service/QRサービス券承認.tsx index 0d48ada..4e87a33 100644 --- a/src/pages/qr-service/QRサービス券承認.tsx +++ b/src/pages/qr-service/QRサービス券承認.tsx @@ -64,7 +64,7 @@ export default function Main() { const options: AutoCompleteOption[] = useMemo(() => { if (checkData === undefined) return []; return checkData.discount_tickets.map((ele) => ({ - label: ele.ticket_name, + label: !!ele.ticket_name ? ele.ticket_name : "-", value: String(ele.discount_ticket_code), })); }, [checkData]);