| @@ -58,10 +58,13 @@ const MultiPaymentWindow = (props) => { | |||||
| const [paymentHoldedErrText, setPaymentHoldedErrText] = React.useState(""); | const [paymentHoldedErrText, setPaymentHoldedErrText] = React.useState(""); | ||||
| const [paymentHoldedErr, setPaymentHoldedErr] = React.useState(false); | const [paymentHoldedErr, setPaymentHoldedErr] = React.useState(false); | ||||
| const mobileBrowser = "Mobile"; | |||||
| useEffect(() => { | useEffect(() => { | ||||
| // console.log(props.transactionData) | // console.log(props.transactionData) | ||||
| if(Object.keys(props.transactionData).length > 0){ | if(Object.keys(props.transactionData).length > 0){ | ||||
| setLoadtTransactionData(props.transactionData) | setLoadtTransactionData(props.transactionData) | ||||
| console.log(props.browserType) | |||||
| } | } | ||||
| }, [props.transactionData]); | }, [props.transactionData]); | ||||
| @@ -336,9 +339,13 @@ const MultiPaymentWindow = (props) => { | |||||
| </Button> | </Button> | ||||
| </Grid> | </Grid> | ||||
| <Grid item> | <Grid item> | ||||
| {props.browserType==mobileBrowser? | |||||
| null | |||||
| : | |||||
| <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("PPS")} disabled={props.ppsStatus.active === "N"}> | <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("PPS")} disabled={props.ppsStatus.active === "N"}> | ||||
| <img className={pPSClass} src={PpsIcon} width="80" height="80" alt="PPS"></img> | <img className={pPSClass} src={PpsIcon} width="80" height="80" alt="PPS"></img> | ||||
| </Button> | </Button> | ||||
| } | |||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| @@ -384,26 +391,28 @@ const MultiPaymentWindow = (props) => { | |||||
| : | : | ||||
| !isLimit? | !isLimit? | ||||
| !onReady? <LoadingComponent/> : | !onReady? <LoadingComponent/> : | ||||
| !isLimit? | |||||
| filteredPaymentMethod.map((availableMethod) => { | |||||
| return ( | |||||
| <Grid container key={availableMethod.subtype} className={"css-1tx0bae"} sx={{ mt: 1, p:2 }}> | |||||
| { | |||||
| availableMethod.pointstonote.map((pointstonote) => { | |||||
| return ( | |||||
| <Grid container key={pointstonote.order} sx={{ p:0.5 }} direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item> | |||||
| <Typography sx={{fontSize: "16px", color: "#000000", textAlign: "left" }}> | |||||
| {pointstonote.content} | |||||
| </Typography> | |||||
| !isLimit? | |||||
| filteredPaymentMethod.length>0? | |||||
| filteredPaymentMethod.map((availableMethod) => { | |||||
| return ( | |||||
| <Grid container key={availableMethod.subtype} className={"css-1tx0bae"} sx={{ mt: 1, p:2 }}> | |||||
| { | |||||
| availableMethod.pointstonote.map((pointstonote) => { | |||||
| return ( | |||||
| <Grid container key={pointstonote.order} sx={{ p:0.5 }} direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item> | |||||
| <Typography sx={{fontSize: "16px", color: "#000000", textAlign: "left" }}> | |||||
| {pointstonote.content} | |||||
| </Typography> | |||||
| </Grid> | |||||
| </Grid> | </Grid> | ||||
| </Grid> | |||||
| ); | |||||
| }) | |||||
| } | |||||
| </Grid> | |||||
| ); | |||||
| }) | |||||
| ); | |||||
| }) | |||||
| } | |||||
| </Grid> | |||||
| ); | |||||
| }) | |||||
| : null | |||||
| : null | : null | ||||
| : | : | ||||
| !onReady? <LoadingComponent/> : | !onReady? <LoadingComponent/> : | ||||
| @@ -433,9 +442,14 @@ const MultiPaymentWindow = (props) => { | |||||
| </Button> | </Button> | ||||
| </DialogActions> | </DialogActions> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button variant="contained" color="success" onClick={confirmPaymentHandle()} disabled={paymentMethod === "" || isLimit || isPPSLimit}> | |||||
| <FormattedMessage id="pay"/> | |||||
| </Button> | |||||
| { | |||||
| props.onPayment? | |||||
| <LoadingComponent disableText={true} alignItems="flex-start"/> | |||||
| : | |||||
| <Button variant="contained" color="success" onClick={confirmPaymentHandle()} disabled={paymentMethod === "" || isLimit || isPPSLimit}> | |||||
| <FormattedMessage id="pay"/> | |||||
| </Button> | |||||
| } | |||||
| </DialogActions> | </DialogActions> | ||||
| </Stack> | </Stack> | ||||
| <div> | <div> | ||||
| @@ -62,7 +62,11 @@ const Index = () => { | |||||
| return ( | return ( | ||||
| !onReady ? | !onReady ? | ||||
| <LoadingComponent/> | |||||
| <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center"> | |||||
| <Grid item> | |||||
| <LoadingComponent /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| : | : | ||||
| <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column"> | <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column"> | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| @@ -63,7 +63,11 @@ const Index = () => { | |||||
| return ( | return ( | ||||
| !onReady ? | !onReady ? | ||||
| <LoadingComponent/> | |||||
| <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center"> | |||||
| <Grid item> | |||||
| <LoadingComponent /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| : | : | ||||
| <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column"> | <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column"> | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| @@ -64,10 +64,15 @@ const Index = () => { | |||||
| const [itemList, setItemList] = useState([]); | const [itemList, setItemList] = useState([]); | ||||
| const [onReady, setOnReady] = useState(false); | const [onReady, setOnReady] = useState(false); | ||||
| const [onPayment, setOnPayment] = useState(false); | |||||
| const [isFullScreen, setIsFullScreen] = useState(false); | const [isFullScreen, setIsFullScreen] = useState(false); | ||||
| const [expiryDateErrText, setExpiryDateErrText] = React.useState(""); | const [expiryDateErrText, setExpiryDateErrText] = React.useState(""); | ||||
| const [expiryDateErr, setExpiryDateErr] = React.useState(false); | const [expiryDateErr, setExpiryDateErr] = React.useState(false); | ||||
| const [browserType, setBrowserType] = React.useState(""); | |||||
| const mobileBrowser = "Mobile"; | |||||
| const desktopBrowser = "Desktop"; | |||||
| useEffect(() => { | useEffect(() => { | ||||
| setAppIds(location.state?.appIdList ?? []) | setAppIds(location.state?.appIdList ?? []) | ||||
| @@ -77,8 +82,10 @@ const Index = () => { | |||||
| localStorage.removeItem("paymentId"); | localStorage.removeItem("paymentId"); | ||||
| if (Utils.getBowserType() === "PC_Browser"){ | if (Utils.getBowserType() === "PC_Browser"){ | ||||
| setIsFullScreen(false) | setIsFullScreen(false) | ||||
| setBrowserType(desktopBrowser) | |||||
| } else { | } else { | ||||
| setIsFullScreen(true) | setIsFullScreen(true) | ||||
| setBrowserType(mobileBrowser) | |||||
| } | } | ||||
| }, []); | }, []); | ||||
| @@ -107,6 +114,7 @@ const Index = () => { | |||||
| useEffect(() => { | useEffect(() => { | ||||
| if (afterConfirmPayment) { | if (afterConfirmPayment) { | ||||
| setOnPayment(true) | |||||
| // setOpen(false); | // setOpen(false); | ||||
| // let transactionid = ""; | // let transactionid = ""; | ||||
| // let webtoken = ""; | // let webtoken = ""; | ||||
| @@ -152,6 +160,7 @@ const Index = () => { | |||||
| onSuccess: function (responData) { | onSuccess: function (responData) { | ||||
| localStorage.removeItem("paymentId"); | localStorage.removeItem("paymentId"); | ||||
| localStorage.setItem("paymentId", responData.id) | localStorage.setItem("paymentId", responData.id) | ||||
| setOnPayment(false) | |||||
| navigate(page, stateParams); | navigate(page, stateParams); | ||||
| } | } | ||||
| }); | }); | ||||
| @@ -542,6 +551,8 @@ const Index = () => { | |||||
| isFullScreen={isFullScreen} | isFullScreen={isFullScreen} | ||||
| appIds={appIds} | appIds={appIds} | ||||
| // appNo={itemList.appNo} | // appNo={itemList.appNo} | ||||
| browserType={browserType} | |||||
| onPayment={onPayment} | |||||
| /> | /> | ||||
| </Grid > | </Grid > | ||||
| ); | ); | ||||
| @@ -96,8 +96,7 @@ const UserSearchPage_Individual = () => { | |||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| : | : | ||||
| <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column" | |||||
| > | |||||
| <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column"> | |||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <div style={BackgroundHead}> | <div style={BackgroundHead}> | ||||
| <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | ||||
| @@ -78,7 +78,11 @@ const UserSearchPage_Individual = () => { | |||||
| return ( | return ( | ||||
| !onReady ? | !onReady ? | ||||
| <LoadingComponent/> | |||||
| <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center"> | |||||
| <Grid item> | |||||
| <LoadingComponent /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| : | : | ||||
| <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column"> | <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column"> | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| @@ -24,6 +24,9 @@ import { notifyActionSuccess } from 'utils/CommonFunction'; | |||||
| import {PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst"; | import {PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst"; | ||||
| import {ThemeProvider} from "@emotion/react"; | import {ThemeProvider} from "@emotion/react"; | ||||
| import {FormattedMessage, useIntl} from "react-intl"; | import {FormattedMessage, useIntl} from "react-intl"; | ||||
| import Loadable from 'components/Loadable'; | |||||
| import { lazy } from 'react'; | |||||
| const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); | |||||
| // ==============================|| DASHBOARD - DEFAULT ||============================== // | // ==============================|| DASHBOARD - DEFAULT ||============================== // | ||||
| @@ -36,6 +39,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => { | |||||
| const [val, setVal] = React.useState({}); | const [val, setVal] = React.useState({}); | ||||
| const [reloadPage, setReloadPage] = React.useState(false); | const [reloadPage, setReloadPage] = React.useState(false); | ||||
| const [isSubmitting, setSubmitting] = React.useState(false); | |||||
| const [issueId, setIssueId] = React.useState(loadedData.issueId); | const [issueId, setIssueId] = React.useState(loadedData.issueId); | ||||
| const navigate = useNavigate(); | const navigate = useNavigate(); | ||||
| @@ -114,6 +118,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => { | |||||
| }); | }); | ||||
| const apply = (values)=>{ | const apply = (values)=>{ | ||||
| setSubmitting(true) | |||||
| HttpUtils.postWithFiles({ | HttpUtils.postWithFiles({ | ||||
| url: UrlUtils.POST_PUBLIC_NOTICE_APPLY, | url: UrlUtils.POST_PUBLIC_NOTICE_APPLY, | ||||
| params: { | params: { | ||||
| @@ -140,6 +145,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| setSubmitting(false) | |||||
| notifyActionSuccess(intl.formatMessage({id: 'submissionSuccess'}) + '!') | notifyActionSuccess(intl.formatMessage({id: 'submissionSuccess'}) + '!') | ||||
| navigate("/publicNotice"); | navigate("/publicNotice"); | ||||
| // location.reload(); | // location.reload(); | ||||
| @@ -190,152 +196,159 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => { | |||||
| {/* <Grid item xs={12}> | {/* <Grid item xs={12}> | ||||
| <Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography> | <Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography> | ||||
| </Grid> */} | </Grid> */} | ||||
| <Grid item xs={12} md={12} width={{ md: "60%", xs: "90%" }}> | |||||
| <Box xs={12} mt={1} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}> | |||||
| <form onSubmit={formik.handleSubmit}> | |||||
| <Grid container spacing={1} sx={{ minHeight: '80vh' }} direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}> | |||||
| {FieldUtils.getTextField({ | |||||
| label: intl.formatMessage({id: 'contactPerson'}) + ":", | |||||
| valueName: "contactPerson", | |||||
| form: formik, | |||||
| disabled: true | |||||
| })} | |||||
| </Grid> | |||||
| <Grid item xs={12} md={12}> | |||||
| {FieldUtils.getPhoneField({ | |||||
| label: intl.formatMessage({id: 'userContactNumber'}) + ":", | |||||
| disabled: true, | |||||
| valueName: { | |||||
| code: "tel_countryCode", | |||||
| num: "phoneNumber", | |||||
| }, | |||||
| form: formik | |||||
| })} | |||||
| </Grid> | |||||
| <Grid item xs={12} md={12}> | |||||
| {FieldUtils.getPhoneField({ | |||||
| label: intl.formatMessage({id: 'contactFaxNumber'}) + ":", | |||||
| disabled: true, | |||||
| valueName: { | |||||
| code: "fax_countryCode", | |||||
| num: "faxNumber", | |||||
| }, | |||||
| form: formik | |||||
| })} | |||||
| </Grid> | |||||
| <Grid item xs={12} lg={12}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="pnspsFormParagraphBold"> | |||||
| <FormattedMessage id="targetVol" />: | |||||
| </Typography> | |||||
| { | |||||
| isSubmitting ? | |||||
| <Grid item xs={12} md={12} width={{ md: "60%", xs: "90%" }}> | |||||
| <LoadingComponent /> | |||||
| </Grid> | |||||
| : | |||||
| <Grid item xs={12} md={12} width={{ md: "60%", xs: "90%" }}> | |||||
| <Box xs={12} mt={1} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}> | |||||
| <form onSubmit={formik.handleSubmit}> | |||||
| <Grid container spacing={1} sx={{ minHeight: '80vh' }} direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}> | |||||
| {FieldUtils.getTextField({ | |||||
| label: intl.formatMessage({id: 'contactPerson'}) + ":", | |||||
| valueName: "contactPerson", | |||||
| form: formik, | |||||
| disabled: true | |||||
| })} | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={9} lg={6}> | |||||
| <RadioGroup | |||||
| aria-labelledby="radio-buttons-group-label" | |||||
| id="issueId" | |||||
| name="issueId" | |||||
| defaultValue={issueId} | |||||
| onChange={(event) => { | |||||
| setIssueId(event.target.value); | |||||
| }} | |||||
| > | |||||
| { | |||||
| selections | |||||
| } | |||||
| </RadioGroup> | |||||
| <Grid item xs={12} md={12}> | |||||
| {FieldUtils.getPhoneField({ | |||||
| label: intl.formatMessage({id: 'userContactNumber'}) + ":", | |||||
| disabled: true, | |||||
| valueName: { | |||||
| code: "tel_countryCode", | |||||
| num: "phoneNumber", | |||||
| }, | |||||
| form: formik | |||||
| })} | |||||
| </Grid> | </Grid> | ||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| <Grid container direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="pnspsFormParagraphBold"> | |||||
| <FormattedMessage id="draftFile"/> ({intl.formatMessage({id: 'fileSizeWarning'})}): | |||||
| </Typography> | |||||
| <Grid item xs={12} md={12}> | |||||
| {FieldUtils.getPhoneField({ | |||||
| label: intl.formatMessage({id: 'contactFaxNumber'}) + ":", | |||||
| disabled: true, | |||||
| valueName: { | |||||
| code: "fax_countryCode", | |||||
| num: "faxNumber", | |||||
| }, | |||||
| form: formik | |||||
| })} | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={6} lg={6} sx={{ wordBreak: 'break-word' }}> | |||||
| <input | |||||
| id="uploadFileBtn" | |||||
| name="file" | |||||
| type="file" | |||||
| accept=".doc,.docx,.xls,.xlsx" | |||||
| style={{ display: 'none' }} | |||||
| onChange={(event) => { | |||||
| readFile(event) | |||||
| }} | |||||
| /> | |||||
| {attachment.name} | |||||
| <Grid item xs={12} lg={12}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="pnspsFormParagraphBold"> | |||||
| <FormattedMessage id="targetVol" />: | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={9} lg={6}> | |||||
| <RadioGroup | |||||
| aria-labelledby="radio-buttons-group-label" | |||||
| id="issueId" | |||||
| name="issueId" | |||||
| defaultValue={issueId} | |||||
| onChange={(event) => { | |||||
| setIssueId(event.target.value); | |||||
| }} | |||||
| > | |||||
| { | |||||
| selections | |||||
| } | |||||
| </RadioGroup> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | </Grid> | ||||
| {/* <Grid item xs={12} md={3} lg={3}> | |||||
| <label htmlFor="uploadFileBtn"> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'uploadFileBtn'})} | |||||
| component="span" | |||||
| variant="outlined" | |||||
| size="large" | |||||
| >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button> | |||||
| </label> | |||||
| </Grid> */} | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| <Grid container direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| <Grid container direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="pnspsFormParagraphBold"> | |||||
| <FormattedMessage id="draftFile"/> ({intl.formatMessage({id: 'fileSizeWarning'})}): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={6} lg={6} sx={{ wordBreak: 'break-word' }}> | |||||
| <input | |||||
| id="uploadFileBtn" | |||||
| name="file" | |||||
| type="file" | |||||
| accept=".doc,.docx,.xls,.xlsx" | |||||
| style={{ display: 'none' }} | |||||
| onChange={(event) => { | |||||
| readFile(event) | |||||
| }} | |||||
| /> | |||||
| {attachment.name} | |||||
| </Grid> | |||||
| {/* <Grid item xs={12} md={3} lg={3}> | |||||
| <label htmlFor="uploadFileBtn"> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'uploadFileBtn'})} | |||||
| component="span" | |||||
| variant="outlined" | |||||
| size="large" | |||||
| >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button> | |||||
| </label> | |||||
| </Grid> */} | |||||
| </Grid> | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={6} lg={6} > | |||||
| <label htmlFor="uploadFileBtn"> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'uploadFileBtn'})} | |||||
| component="span" | |||||
| variant="outlined" | |||||
| size="large" | |||||
| >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button> | |||||
| </label> | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| <Grid container direction="row" justifyContent="flex-start" alignItems="center"> | |||||
| <Grid item xs={12} md={3} lg={3} | |||||
| sx={{ display: 'flex', alignItems: 'center' }}> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={6} lg={6} > | |||||
| <label htmlFor="uploadFileBtn"> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'uploadFileBtn'})} | |||||
| component="span" | |||||
| variant="outlined" | |||||
| size="large" | |||||
| >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button> | |||||
| </label> | |||||
| </Grid> | |||||
| <Grid item xs={12} md={3} lg={3}> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={3} lg={3}> | |||||
| {isORGLoggedIn()? | |||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}> | |||||
| {FieldUtils.getTextField({ | |||||
| label: intl.formatMessage({id: 'careOf'}) + ":", | |||||
| valueName: "careOf", | |||||
| form: formik, | |||||
| // disabled: true | |||||
| })} | |||||
| </Grid>:null | |||||
| } | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| {FieldUtils.getTextArea({ | |||||
| label: intl.formatMessage({id: 'extraMark'}) + ":", | |||||
| valueName: "remarks", | |||||
| form: formik, | |||||
| inputProps: { maxLength: 255 } | |||||
| })} | |||||
| </Grid> | |||||
| <Grid item xs={12}> | |||||
| <center> | |||||
| <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'applyPublicNotice'})} | |||||
| variant="contained" | |||||
| type="submit" | |||||
| > | |||||
| <FormattedMessage id="applyPublicNotice"/> | |||||
| </Button> | |||||
| </ThemeProvider> | |||||
| </center> | |||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| </Grid> | |||||
| {isORGLoggedIn()? | |||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}> | |||||
| {FieldUtils.getTextField({ | |||||
| label: intl.formatMessage({id: 'careOf'}) + ":", | |||||
| valueName: "careOf", | |||||
| form: formik, | |||||
| // disabled: true | |||||
| })} | |||||
| </Grid>:null | |||||
| } | |||||
| <Grid item xs={12} md={12} lg={12}> | |||||
| {FieldUtils.getTextArea({ | |||||
| label: intl.formatMessage({id: 'extraMark'}) + ":", | |||||
| valueName: "remarks", | |||||
| form: formik, | |||||
| inputProps: { maxLength: 255 } | |||||
| })} | |||||
| </Grid> | |||||
| <Grid item xs={12}> | |||||
| <center> | |||||
| <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}> | |||||
| <Button | |||||
| aria-label={intl.formatMessage({id: 'applyPublicNotice'})} | |||||
| variant="contained" | |||||
| type="submit" | |||||
| > | |||||
| <FormattedMessage id="applyPublicNotice"/> | |||||
| </Button> | |||||
| </ThemeProvider> | |||||
| </center> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </form> | |||||
| </Box> | |||||
| </Grid> | |||||
| </form> | |||||
| </Box> | |||||
| </Grid> | |||||
| } | |||||
| <div> | <div> | ||||
| <Dialog | <Dialog | ||||
| open={isWarningPopUp} | open={isWarningPopUp} | ||||
| @@ -500,7 +500,7 @@ const ApplicationDetailCard = ( | |||||
| </Grid> | </Grid> | ||||
| { | { | ||||
| fee > 0 ? | fee > 0 ? | ||||
| <Grid item xs={12} sm={12} md={9} lg={5} sx={{ mb: 1, ml: 1 }}> | |||||
| <Grid item xs={12} sm={12} md={9} lg={5} sx={{ mb: 1, }}> | |||||
| <Grid container alignItems={"center"}> | <Grid container alignItems={"center"}> | ||||
| <Grid item xs={12} md={3} lg={3} | <Grid item xs={12} md={3} lg={3} | ||||
| sx={{ display: 'flex', alignItems: 'center' }}> | sx={{ display: 'flex', alignItems: 'center' }}> | ||||
| @@ -162,7 +162,7 @@ const DashboardDefault = () => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container direction="column" justifyContent="flex-start" alignItems="center"> | <Grid container direction="column" justifyContent="flex-start" alignItems="center"> | ||||
| <Grid item xs={12} width="75%"> | |||||
| <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}> | |||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Button | <Button | ||||
| aria-label={intl.formatMessage({id: 'back'})} | aria-label={intl.formatMessage({id: 'back'})} | ||||
| @@ -175,7 +175,7 @@ const DashboardDefault = () => { | |||||
| <Typography ml={3} mt={3} variant="h4">{title}</Typography> | <Typography ml={3} mt={3} variant="h4">{title}</Typography> | ||||
| </Stack> | </Stack> | ||||
| </Grid> | </Grid> | ||||
| <Grid item width="75%"> | |||||
| <Grid item width={{ md: "60%", xs: "90%" }}> | |||||
| <Box xs={12} mt={3} sx={{ border: '0px groove grey', borderRadius: '10px', ..._sx }}> | <Box xs={12} mt={3} sx={{ border: '0px groove grey', borderRadius: '10px', ..._sx }}> | ||||
| <ApplicationDetailCard | <ApplicationDetailCard | ||||
| setStatus={setStatus} | setStatus={setStatus} | ||||
| @@ -227,11 +227,11 @@ const ManageOrgUserPage = () => { | |||||
| ]; | ]; | ||||
| return ( | return ( | ||||
| <Grid container> | |||||
| <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column"> | |||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <div style={BackgroundHead}> | <div style={BackgroundHead}> | ||||
| <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | ||||
| <Typography ml={15} color='#FFF' variant="h4" sx={{ display: { xs: 'none', sm: 'none', md: 'block' } }}> | |||||
| <Typography ml={15} color='#FFF' variant="h4" sx={{ "textShadow": "0px 0px 25px #0C489E" }}> | |||||
| <FormattedMessage id="companyOrUserRecord" /> | <FormattedMessage id="companyOrUserRecord" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||