ソースを参照

振替頻度変更申請をプラン変更申請へ変更

develop
sosuke.iwabuchi 2年前
コミット
ccbbd3c39c
6個のファイルの変更145行の追加138行の削除
  1. +2
    -0
      src/api/season-ticket-contract.ts
  2. +2
    -2
      src/pages/dashboard/contract/change-plan-order.tsx
  3. +134
    -125
      src/pages/dashboard/contract/detail.tsx
  4. +1
    -1
      src/pages/index.ts
  5. +2
    -3
      src/routes/path.ts
  6. +4
    -7
      src/routes/sub/dashboard.tsx

+ 2
- 0
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;
};



src/pages/dashboard/contract/change-payment-interval-order.tsx → 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]);


+ 134
- 125
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() {
</Table>
</Paper>
<PayingPlanList />
<Paper sx={{ p: 2 }}>
<Typography variant="h5">各種申請</Typography>
<Stack spacing={2} mt={2}>
{seasonTicketContract.has_sticker && (
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_STICKER_RE_ORDER
)
);
}}
>
シール再発行申請
</Button>
</Box>
)}
{seasonTicketContract.has_season_ticket && (
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_SEASON_TICKET_RE_ORDER
)
);
}}
>
定期券再発行申請
</Button>
</Box>
)}
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_PARKING_CERTIFICATE_ORDER
)
);
}}
>
駐車証明証申請
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_TERMINATE_ORDER
)
);
}}
>
解約申請
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_UPDATE_VEHICLE_INFO_ORDER
)
);
}}
>
車両情報変更申請
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER
)
);
}}
>
振替頻度変更申請
</Button>
</Box>
</Stack>
</Paper>
<Paper sx={{ p: 2 }}>
<Typography variant="h5">各種証明証提出</Typography>
<Stack spacing={2} mt={2}>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(PageID.DASHBOARD_USER_STUDENT_LICENSE_IMAGES_UPLOAD)
);
}}
>
学生証画像アップロード
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(PageID.DASHBOARD_USER_OTHER_LICENSE_IMAGES_UPLOAD)
);
}}
>
障がい者手帳画像アップロード
</Button>
</Box>
</Stack>
</Paper>

{seasonTicketContract.can_some_apply && (
<>
<Paper sx={{ p: 2 }}>
<Typography variant="h5">各種申請</Typography>
<Stack spacing={2} mt={2}>
{seasonTicketContract.has_sticker && (
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_STICKER_RE_ORDER
)
);
}}
>
シール再発行申請
</Button>
</Box>
)}
{seasonTicketContract.has_season_ticket && (
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_SEASON_TICKET_RE_ORDER
)
);
}}
>
定期券再発行申請
</Button>
</Box>
)}
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_PARKING_CERTIFICATE_ORDER
)
);
}}
>
駐車証明証申請
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_TERMINATE_ORDER
)
);
}}
>
解約申請
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_UPDATE_VEHICLE_INFO_ORDER
)
);
}}
>
車両情報変更申請
</Button>
</Box>
{seasonTicketContract.can_apply_change_plan && (
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN
)
);
}}
>
プラン変更
</Button>
</Box>
)}
</Stack>
</Paper>
<Paper sx={{ p: 2 }}>
<Typography variant="h5">各種証明証提出</Typography>
<Stack spacing={2} mt={2}>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_USER_STUDENT_LICENSE_IMAGES_UPLOAD
)
);
}}
>
学生証画像アップロード
</Button>
</Box>
<Box>
<Button
variant="contained"
onClick={() => {
navigateWhenChanged(
getPath(
PageID.DASHBOARD_USER_OTHER_LICENSE_IMAGES_UPLOAD
)
);
}}
>
障がい者手帳画像アップロード
</Button>
</Box>
</Stack>
</Paper>
</>
)}
</Stack>
</Box>
);


+ 1
- 1
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++,



+ 2
- 3
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)]:


+ 4
- 7
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: <UpdateVehicleInfoOrder />,
},
{
pageId:
PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PAYMENT_INTERVAL_ORDER,
element: <ChangePaymentIntervalOrder />,
pageId: PageID.DASHBOARD_SEASON_TICKET_CONTRACT_CHANGE_PLAN,
element: <ChangePlanOrder />,
},
{
pageId: PageID.DASHBOARD_USER_STUDENT_LICENSE_IMAGES_UPLOAD,


読み込み中…
キャンセル
保存