| @@ -7,7 +7,7 @@ export type 駐車場マスタ = { | |||||
| }; | }; | ||||
| export type サービス券マスタ = { | export type サービス券マスタ = { | ||||
| discount_ticket_code: number; | discount_ticket_code: number; | ||||
| ticket_name: string; | |||||
| ticket_name: string | null; | |||||
| }; | }; | ||||
| // -------駐車場マスタ一覧取得--------------- | // -------駐車場マスタ一覧取得--------------- | ||||
| @@ -35,11 +35,8 @@ export default function Page({ | |||||
| const target = discountTickets.find((ele) => { | const target = discountTickets.find((ele) => { | ||||
| return ele.discount_ticket_code === setting.discount_ticket_code; | 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]); | }, [discountTickets, setting]); | ||||
| const handleRemove = () => { | const handleRemove = () => { | ||||
| @@ -97,7 +97,7 @@ export default function Page({ settings, deleteParkingSetting }: RowProps) { | |||||
| ) | ) | ||||
| ) | ) | ||||
| .map((ele) => ({ | .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), | value: String(ele.discount_ticket_code), | ||||
| })); | })); | ||||
| }, [サービス券マスタ, settings]); | }, [サービス券マスタ, settings]); | ||||
| @@ -64,7 +64,7 @@ export default function Main() { | |||||
| const options: AutoCompleteOption[] = useMemo(() => { | const options: AutoCompleteOption[] = useMemo(() => { | ||||
| if (checkData === undefined) return []; | if (checkData === undefined) return []; | ||||
| return checkData.discount_tickets.map((ele) => ({ | return checkData.discount_tickets.map((ele) => ({ | ||||
| label: ele.ticket_name, | |||||
| label: !!ele.ticket_name ? ele.ticket_name : "-", | |||||
| value: String(ele.discount_ticket_code), | value: String(ele.discount_ticket_code), | ||||
| })); | })); | ||||
| }, [checkData]); | }, [checkData]); | ||||