Browse Source

update pay reminder page

master
jason.lam 1 year ago
parent
commit
9a13e1f566
2 changed files with 36 additions and 27 deletions
  1. +31
    -19
      src/pages/Proof/Payment/Pay.js
  2. +5
    -8
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

+ 31
- 19
src/pages/Proof/Payment/Pay.js View File

@@ -32,6 +32,8 @@ import {
// useEffect, // useEffect,
useState useState
} from "react"; } from "react";
import {PNSPS_BUTTON_THEME, PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const Index = () => { const Index = () => {
@@ -90,11 +92,11 @@ const Index = () => {
<Grid container justifyContent="flex-start" alignItems="center" > <Grid container justifyContent="flex-start" alignItems="center" >
<center> <center>
<Grid item xs={12} md={8} > <Grid item xs={12} md={8} >
<Typography variant="h2" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
<Typography variant="h3" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
公共啟事:校對完成及付款 公共啟事:校對完成及付款
</Typography> </Typography>


<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
<Typography variant="h4" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。 我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。
<br /><br /> <br /><br />
請於 <span style={{ color: "red" }}>{DateUtils.dateStr_Cht(record?.returnBeforeDate)} 下午 2:00 前</span> 完成繳費,我們將於收到繳費確認後處理刊出事宜。 請於 <span style={{ color: "red" }}>{DateUtils.dateStr_Cht(record?.returnBeforeDate)} 下午 2:00 前</span> 完成繳費,我們將於收到繳費確認後處理刊出事宜。
@@ -102,27 +104,37 @@ const Index = () => {
如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請,你可選擇完成所有此期所有稿件校對確定後,於繳費期限前在「我的公共啟事」內合併付款。 如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請,你可選擇完成所有此期所有稿件校對確定後,於繳費期限前在「我的公共啟事」內合併付款。
</Typography> </Typography>


<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
<Typography variant="h4" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
請按以下完成繳費: 請按以下完成繳費:
<Button
component="span"
variant="contained"
size="large"
sx={{ m: 4}}
onClick={() => { setIsPopUp(true) }}
><Typography variant="h5">即時網上繳費</Typography></Button>
</Typography>

<Typography variant="h4" sx={{ml:8, textAlign: "left" }}>
<ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
<Button
component="span"
variant="contained"
sx={{ ml: {md:4,lg:4}, mr:4}}
onClick={() => { setIsPopUp(true) }}
>
即時網上繳費
</Button>
</ThemeProvider>




<Button
component="span"
variant="contained"
size="large"
sx={{ m: 4}}
onClick={()=>{
navigate("/publicNotice");
}}
><Typography variant="h5">稍後繳費 - 返回「我的公共啟事」</Typography></Button>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button
component="span"
variant="contained"
sx={{ ml: {sm:4, md:4, lg:4}, mr: 4, mt:{xs:2,sm:2}, mb:{xs:2, sm:2}}}
onClick={()=>{
navigate("/publicNotice");
}}
>
稍後繳費
</Button>
(返回「我的公共啟事」)
</ThemeProvider>
</Typography> </Typography>
</Grid> </Grid>
</center> </center>


+ 5
- 8
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js View File

@@ -142,26 +142,23 @@ const ApplicationDetailCard = (
spacing={2} spacing={2}
mb={2} mb={2}
> >
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
{ {
currentApplicationDetailData.status == "confirmed" ? currentApplicationDetailData.status == "confirmed" ?
<Button <Button
// size="large"
variant="contained" variant="contained"
color="create "
onClick={() => { checkExprityDate(true) }} onClick={() => { checkExprityDate(true) }}
disabled={currentApplicationDetailData.status == "rejected" disabled={currentApplicationDetailData.status == "rejected"
|| currentApplicationDetailData.status == "cancelled" || currentApplicationDetailData.status == "cancelled"
|| currentApplicationDetailData.status == "paid" || currentApplicationDetailData.status == "paid"
|| currentApplicationDetailData.creditor} || currentApplicationDetailData.creditor}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}>
<EditNoteIcon />
<Typography ml={1} variant="h5"> 支付</Typography>
startIcon={<EditNoteIcon />}
>
支付
</Button> </Button>
: null : null
} }
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
onClick={cancelledClick()} onClick={cancelledClick()}


Loading…
Cancel
Save