alex
/
PNSPS-frontend-MaterialUI
1
0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 활동
소스 검색

update pps hidden in mobile

master
Alex Cheung 1 년 전
부모
1d5f553314
커밋
9ccec8918a
10개의 변경된 파일과 220개의 추가작업 그리고 171개의 파일을 삭제
분할 보기
Diff Options
Show Stats Download Patch File Download Diff File
  1. +36
    -22
      src/pages/Payment/MultiPaymentWindow.js
  2. +5
    -1
      src/pages/Payment/Search_GLD/index.js
  3. +5
    -1
      src/pages/Payment/Search_Public/index.js
  4. +12
    -1
      src/pages/Payment/index.js
  5. +1
    -2
      src/pages/Proof/Search_GLD/index.js
  6. +5
    -1
      src/pages/Proof/Search_Public/index.js
  7. +151
    -138
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  8. +1
    -1
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  9. +2
    -2
      src/pages/PublicNotice/Details_Public/index.js
  10. +2
    -2
      src/pages/User/ManagePage_OrgPublic/index.js

+ 36
- 22
src/pages/Payment/MultiPaymentWindow.js 파일 보기

@@ -58,10 +58,13 @@ const MultiPaymentWindow = (props) => {
const [paymentHoldedErrText, setPaymentHoldedErrText] = React.useState("");
const [paymentHoldedErr, setPaymentHoldedErr] = React.useState(false);
const mobileBrowser = "Mobile";

useEffect(() => {
// console.log(props.transactionData)
if(Object.keys(props.transactionData).length > 0){
setLoadtTransactionData(props.transactionData)
console.log(props.browserType)
}
}, [props.transactionData]);

@@ -336,9 +339,13 @@ const MultiPaymentWindow = (props) => {
</Button>
</Grid>
<Grid item>
{props.browserType==mobileBrowser?
null
:
<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>
</Button>
}
</Grid>
</Grid>
</Grid>
@@ -384,26 +391,28 @@ const MultiPaymentWindow = (props) => {
:
!isLimit?
!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>
);
})
: null
: null
:
!onReady? <LoadingComponent/> :
@@ -433,9 +442,14 @@ const MultiPaymentWindow = (props) => {
</Button>
</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>
</Stack>
<div>


+ 5
- 1
src/pages/Payment/Search_GLD/index.js 파일 보기

@@ -62,7 +62,11 @@ const Index = () => {

return (
!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 item xs={12}>


+ 5
- 1
src/pages/Payment/Search_Public/index.js 파일 보기

@@ -63,7 +63,11 @@ const Index = () => {

return (
!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 item xs={12}>


+ 12
- 1
src/pages/Payment/index.js 파일 보기

@@ -64,10 +64,15 @@ const Index = () => {

const [itemList, setItemList] = useState([]);
const [onReady, setOnReady] = useState(false);
const [onPayment, setOnPayment] = useState(false);
const [isFullScreen, setIsFullScreen] = useState(false);
const [expiryDateErrText, setExpiryDateErrText] = React.useState("");
const [expiryDateErr, setExpiryDateErr] = React.useState(false);
const [browserType, setBrowserType] = React.useState("");
const mobileBrowser = "Mobile";
const desktopBrowser = "Desktop";

useEffect(() => {
setAppIds(location.state?.appIdList ?? [])
@@ -77,8 +82,10 @@ const Index = () => {
localStorage.removeItem("paymentId");
if (Utils.getBowserType() === "PC_Browser"){
setIsFullScreen(false)
setBrowserType(desktopBrowser)
} else {
setIsFullScreen(true)
setBrowserType(mobileBrowser)
}
}, []);

@@ -107,6 +114,7 @@ const Index = () => {

useEffect(() => {
if (afterConfirmPayment) {
setOnPayment(true)
// setOpen(false);
// let transactionid = "";
// let webtoken = "";
@@ -152,6 +160,7 @@ const Index = () => {
onSuccess: function (responData) {
localStorage.removeItem("paymentId");
localStorage.setItem("paymentId", responData.id)
setOnPayment(false)
navigate(page, stateParams);
}
});
@@ -542,6 +551,8 @@ const Index = () => {
isFullScreen={isFullScreen}
appIds={appIds}
// appNo={itemList.appNo}
browserType={browserType}
onPayment={onPayment}
/>
</Grid >
);


+ 1
- 2
src/pages/Proof/Search_GLD/index.js 파일 보기

@@ -96,8 +96,7 @@ const UserSearchPage_Individual = () => {
</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}>
<div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">


+ 5
- 1
src/pages/Proof/Search_Public/index.js 파일 보기

@@ -78,7 +78,11 @@ const UserSearchPage_Individual = () => {

return (
!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 item xs={12}>


+ 151
- 138
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js 파일 보기

@@ -24,6 +24,9 @@ import { notifyActionSuccess } from 'utils/CommonFunction';
import {PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
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 ||============================== //

@@ -36,6 +39,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {

const [val, setVal] = React.useState({});
const [reloadPage, setReloadPage] = React.useState(false);
const [isSubmitting, setSubmitting] = React.useState(false);

const [issueId, setIssueId] = React.useState(loadedData.issueId);
const navigate = useNavigate();
@@ -114,6 +118,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
});

const apply = (values)=>{
setSubmitting(true)
HttpUtils.postWithFiles({
url: UrlUtils.POST_PUBLIC_NOTICE_APPLY,
params: {
@@ -140,6 +145,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
setIsWarningPopUp(true);
return;
}
setSubmitting(false)
notifyActionSuccess(intl.formatMessage({id: 'submissionSuccess'}) + '!')
navigate("/publicNotice");
// location.reload();
@@ -190,152 +196,159 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
{/* <Grid item xs={12}>
<Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography>
</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 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 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 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 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 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 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>
{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>
<Dialog
open={isWarningPopUp}


+ 1
- 1
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js 파일 보기

@@ -500,7 +500,7 @@ const ApplicationDetailCard = (
</Grid>
{
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 item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>


+ 2
- 2
src/pages/PublicNotice/Details_Public/index.js 파일 보기

@@ -162,7 +162,7 @@ const DashboardDefault = () => {
</Grid>
<Grid item xs={12} md={12}>
<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">
<Button
aria-label={intl.formatMessage({id: 'back'})}
@@ -175,7 +175,7 @@ const DashboardDefault = () => {
<Typography ml={3} mt={3} variant="h4">{title}</Typography>
</Stack>
</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 }}>
<ApplicationDetailCard
setStatus={setStatus}


+ 2
- 2
src/pages/User/ManagePage_OrgPublic/index.js 파일 보기

@@ -227,11 +227,11 @@ const ManageOrgUserPage = () => {
];

return (
<Grid container>
<Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column">
<Grid item xs={12}>
<div style={BackgroundHead}>
<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" />
</Typography>
</Stack>


쓰기 미리보기
불러오는 중...
취소
저장