From ccbbd3c39c94c70ccc118bff7350818ed6dcd886 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Thu, 26 Oct 2023 14:12:45 +0900 Subject: [PATCH] =?UTF-8?q?=E6=8C=AF=E6=9B=BF=E9=A0=BB=E5=BA=A6=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E7=94=B3=E8=AB=8B=E3=82=92=E3=83=97=E3=83=A9=E3=83=B3?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E7=94=B3=E8=AB=8B=E3=81=B8=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/season-ticket-contract.ts | 2 + ...terval-order.tsx => change-plan-order.tsx} | 4 +- src/pages/dashboard/contract/detail.tsx | 259 +++++++++--------- src/pages/index.ts | 2 +- src/routes/path.ts | 5 +- src/routes/sub/dashboard.tsx | 11 +- 6 files changed, 145 insertions(+), 138 deletions(-) rename src/pages/dashboard/contract/{change-payment-interval-order.tsx => change-plan-order.tsx} (96%) diff --git a/src/api/season-ticket-contract.ts b/src/api/season-ticket-contract.ts index 60a0abe..18e6feb 100644 --- a/src/api/season-ticket-contract.ts +++ b/src/api/season-ticket-contract.ts @@ -23,6 +23,8 @@ export type SeasonTicketContract = { other_license_images_upload_datetime: string | null; has_season_ticket: boolean | null; has_sticker: boolean | null; + can_some_apply: boolean | null; + can_apply_change_plan: boolean | null; revision: number; }; diff --git a/src/pages/dashboard/contract/change-payment-interval-order.tsx b/src/pages/dashboard/contract/change-plan-order.tsx similarity index 96% rename from src/pages/dashboard/contract/change-payment-interval-order.tsx rename to src/pages/dashboard/contract/change-plan-order.tsx index ca1f698..f162c6f 100644 --- a/src/pages/dashboard/contract/change-payment-interval-order.tsx +++ b/src/pages/dashboard/contract/change-plan-order.tsx @@ -33,7 +33,7 @@ type FormProps = { export default function ChangPaymentIntervalOrder() { const { setHeaderTitle, setTabs } = useDashboard( - PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER, + PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN, TabID.NONE ); @@ -72,7 +72,7 @@ export default function ChangPaymentIntervalOrder() { }; useEffect(() => { - setHeaderTitle("振替頻度変更申請"); + setHeaderTitle("プラン変更申請"); setTabs(null); }, [setHeaderTitle, setTabs]); diff --git a/src/pages/dashboard/contract/detail.tsx b/src/pages/dashboard/contract/detail.tsx index 993e870..0fa4db6 100644 --- a/src/pages/dashboard/contract/detail.tsx +++ b/src/pages/dashboard/contract/detail.tsx @@ -9,13 +9,11 @@ import { TableRow, Typography, } from "@mui/material"; -import { PaymentPlan, getPaymentPlans } from "api/season-ticket-contract"; import { useSeasonTicketContractContext } from "contexts/dashboard/SeasonTicketContractContext"; -import useAPICall from "hooks/useAPICall"; import useDashboard from "hooks/useDashBoard"; import useNavigateCustom from "hooks/useNavigateCustom"; import { PageID, TabID } from "pages"; -import { useEffect, useMemo, useState } from "react"; +import { useEffect, useMemo } from "react"; import { useParams } from "react-router-dom"; import { getPath } from "routes/path"; import { numberFormat } from "utils/string"; @@ -123,128 +121,139 @@ export default function ContractDetail() { - - 各種申請 - - {seasonTicketContract.has_sticker && ( - - - - )} - {seasonTicketContract.has_season_ticket && ( - - - - )} - - - - - - - - - - - - - - - - 各種証明証提出 - - - - - - - - - + + {seasonTicketContract.can_some_apply && ( + <> + + 各種申請 + + {seasonTicketContract.has_sticker && ( + + + + )} + {seasonTicketContract.has_season_ticket && ( + + + + )} + + + + + + + + + + {seasonTicketContract.can_apply_change_plan && ( + + + + )} + + + + 各種証明証提出 + + + + + + + + + + + )} ); diff --git a/src/pages/index.ts b/src/pages/index.ts index 228f8b6..041176b 100644 --- a/src/pages/index.ts +++ b/src/pages/index.ts @@ -18,7 +18,7 @@ export const PageID = { DASHBOARD_SEASON_TICKET_CONTRACT_PARKING_CERTIFICATE_ORDER: id++, DASHBOARD_SEASON_TICKET_CONTRACT_TERMINATE_ORDER: id++, DASHBOARD_SEASON_TICKET_CONTRACT_UPDATE_VEHICLE_INFO_ORDER: id++, - DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER: id++, + DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN: id++, DASHBOARD_RECEIPT_DOWNLOAD: id++, diff --git a/src/routes/path.ts b/src/routes/path.ts index de20bb3..c22d987 100644 --- a/src/routes/path.ts +++ b/src/routes/path.ts @@ -49,9 +49,8 @@ const PATHS_DASHBOARD = { [makePathKey( PageID.DASHBOARD_SEASON_TICKET_CONTRACT_UPDATE_VEHICLE_INFO_ORDER )]: "/dashboard/contract/update-vehicle-info-order", - [makePathKey( - PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER - )]: "/dashboard/contract/change-paying-interval-order", + [makePathKey(PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN)]: + "/dashboard/contract/change-plan", [makePathKey(PageID.DASHBOARD_USER_STUDENT_LICENSE_IMAGES_UPLOAD)]: "/dashboard/contract/upload/student-license", [makePathKey(PageID.DASHBOARD_USER_OTHER_LICENSE_IMAGES_UPLOAD)]: diff --git a/src/routes/sub/dashboard.tsx b/src/routes/sub/dashboard.tsx index f7eab2d..22bcd3b 100644 --- a/src/routes/sub/dashboard.tsx +++ b/src/routes/sub/dashboard.tsx @@ -95,10 +95,8 @@ export default function DashboardRoutes(): RouteObject[] { const UpdateVehicleInfoOrder = Loadable( lazy(() => import("pages/dashboard/contract/update-vehicle-info-order")) ); - const ChangePaymentIntervalOrder = Loadable( - lazy( - () => import("pages/dashboard/contract/change-payment-interval-order") - ) + const ChangePlanOrder = Loadable( + lazy(() => import("pages/dashboard/contract/change-plan-order")) ); const StudentLicenseImagesUpload = Loadable( lazy( @@ -141,9 +139,8 @@ export default function DashboardRoutes(): RouteObject[] { element: , }, { - pageId: - PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER, - element: , + pageId: PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN, + element: , }, { pageId: PageID.DASHBOARD_USER_STUDENT_LICENSE_IMAGES_UPLOAD,