| @@ -21,7 +21,7 @@ const SysSettingProvider = ({ children }) => { | |||||
| // console.log(responseData) | // console.log(responseData) | ||||
| setSysSetting(responseData); | setSysSetting(responseData); | ||||
| localStorage.setItem('sysEnv', responseData.sysEnv) | localStorage.setItem('sysEnv', responseData.sysEnv) | ||||
| localStorage.setItem('paymentSuspention', responseData.suspensionMode) | |||||
| localStorage.setItem('paymentSuspension', responseData.suspensionMode) | |||||
| } | } | ||||
| }); | }); | ||||
| } | } | ||||
| @@ -13,7 +13,7 @@ import { useParams } from "react-router-dom"; | |||||
| import { useNavigate } from "react-router-dom"; | import { useNavigate } from "react-router-dom"; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| import * as FormatUtils from "utils/FormatUtils"; | import * as FormatUtils from "utils/FormatUtils"; | ||||
| import { checkPaymentSuspention } from "utils/Utils"; | |||||
| import { checkPaymentSuspension } from "utils/Utils"; | |||||
| import { | import { | ||||
| checkIsOnlyOnlinePayment, | checkIsOnlyOnlinePayment, | ||||
| } from "utils/Utils"; | } from "utils/Utils"; | ||||
| @@ -182,7 +182,7 @@ const Index = () => { | |||||
| ) | ) | ||||
| }} /> | }} /> | ||||
| <br /> | <br /> | ||||
| {checkPaymentSuspention()? | |||||
| {checkPaymentSuspension()? | |||||
| <div> | <div> | ||||
| <Typography style={{ textAlign: "flex-start", color: "red" }}> | <Typography style={{ textAlign: "flex-start", color: "red" }}> | ||||
| <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | ||||
| @@ -192,7 +192,7 @@ const Index = () => { | |||||
| } | } | ||||
| </Typography> | </Typography> | ||||
| {!checkPaymentSuspention()? | |||||
| {!checkPaymentSuspension()? | |||||
| <Typography variant="h4" sx={{ ml: 8, textAlign: "left" }}> | <Typography variant="h4" sx={{ ml: 8, textAlign: "left" }}> | ||||
| <ThemeProvider theme={PNSPS_BUTTON_THEME}> | <ThemeProvider theme={PNSPS_BUTTON_THEME}> | ||||
| <Button | <Button | ||||
| @@ -12,7 +12,7 @@ const Pay_Creditor = Loadable(lazy(() => import('./Pay_Creditor'))); | |||||
| const Pay_Dn = Loadable(lazy(() => import('./Pay_DN'))); | const Pay_Dn = Loadable(lazy(() => import('./Pay_DN'))); | ||||
| const Pay_Office = Loadable(lazy(() => import('./Pay_Office'))); | const Pay_Office = Loadable(lazy(() => import('./Pay_Office'))); | ||||
| const Pay_Online = Loadable(lazy(() => import('./Pay_Online'))); | const Pay_Online = Loadable(lazy(() => import('./Pay_Online'))); | ||||
| import { checkPaymentSuspention } from "utils/Utils"; | |||||
| import { checkPaymentSuspension } from "utils/Utils"; | |||||
| const Index = () => { | const Index = () => { | ||||
| @@ -35,7 +35,7 @@ const Index = () => { | |||||
| navigate("/proof/search"); | navigate("/proof/search"); | ||||
| } | } | ||||
| setRecord(responseData.data); | setRecord(responseData.data); | ||||
| if(checkPaymentSuspention()){ | |||||
| if(checkPaymentSuspension()){ | |||||
| setPaymentMethod("online") | setPaymentMethod("online") | ||||
| }else{ | }else{ | ||||
| setPaymentMethod(responseData.data.paymentMethod) | setPaymentMethod(responseData.data.paymentMethod) | ||||
| @@ -29,7 +29,7 @@ import { FormattedMessage, useIntl } from "react-intl"; | |||||
| import { | import { | ||||
| isDummyLoggedIn, | isDummyLoggedIn, | ||||
| checkIsOnlyOnlinePayment, | checkIsOnlyOnlinePayment, | ||||
| checkPaymentSuspention, | |||||
| checkPaymentSuspension, | |||||
| checkIsNoPaymentByCreateDate, | checkIsNoPaymentByCreateDate, | ||||
| } from "utils/Utils" | } from "utils/Utils" | ||||
| @@ -450,7 +450,7 @@ const FormPanel = ({ formData }) => { | |||||
| } | } | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| <FormattedMessage id="payOnline" /> | <FormattedMessage id="payOnline" /> | ||||
| {checkPaymentSuspention()? | |||||
| {checkPaymentSuspension()? | |||||
| <Typography style={{ padding: '16px', color: "red" }}> | <Typography style={{ padding: '16px', color: "red" }}> | ||||
| <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | ||||
| </Typography>:null | </Typography>:null | ||||
| @@ -26,6 +26,7 @@ import * as HttpUtils from "utils/HttpUtils" | |||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| import { CHECK_CREATE_PROOF, UPDATE_GLDREMARKS, APPLICATION_UPDATE_PAYMENT_MEANS} from "utils/ApiPathConst" | import { CHECK_CREATE_PROOF, UPDATE_GLDREMARKS, APPLICATION_UPDATE_PAYMENT_MEANS} from "utils/ApiPathConst" | ||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | ||||
| import { checkPaymentSuspension } from "utils/Utils"; | |||||
| import DoneIcon from '@mui/icons-material/Done'; | import DoneIcon from '@mui/icons-material/Done'; | ||||
| import CloseIcon from '@mui/icons-material/Close'; | import CloseIcon from '@mui/icons-material/Close'; | ||||
| @@ -749,7 +750,7 @@ const ApplicationDetailCard = ( | |||||
| </Typography> | </Typography> | ||||
| </FormControl> | </FormControl> | ||||
| </Grid> | </Grid> | ||||
| {currentApplicationDetailData.paymentMethod!=null? | |||||
| {currentApplicationDetailData.paymentMethod!=null && checkPaymentSuspension()? | |||||
| <Grid item md={3} lg={3}> | <Grid item md={3} lg={3}> | ||||
| <Button | <Button | ||||
| size="small" | size="small" | ||||
| @@ -4,7 +4,7 @@ import CloseIcon from '@mui/icons-material/Close'; | |||||
| import Loadable from 'components/Loadable'; | import Loadable from 'components/Loadable'; | ||||
| import { lazy, useState } from 'react'; | import { lazy, useState } from 'react'; | ||||
| import { FormattedMessage, useIntl } from "react-intl"; | import { FormattedMessage, useIntl } from "react-intl"; | ||||
| import { checkSysEnv, checkPaymentSuspention } from "utils/Utils"; | |||||
| import { checkSysEnv, checkPaymentSuspension } from "utils/Utils"; | |||||
| import backbroundImg from 'assets/images/bg_ml.jpg'; | import backbroundImg from 'assets/images/bg_ml.jpg'; | ||||
| import lgceImg from 'assets/images/2025_lgce.jpg'; // <-- your popup image | import lgceImg from 'assets/images/2025_lgce.jpg'; // <-- your popup image | ||||
| import 'assets/style/loginStyles.css'; | import 'assets/style/loginStyles.css'; | ||||
| @@ -95,7 +95,7 @@ const AuthWrapper = ({ children }) => { | |||||
| sx={{ minHeight: { md: 'calc(87vh)' } }} | sx={{ minHeight: { md: 'calc(87vh)' } }} | ||||
| > | > | ||||
| <Grid item xs={12} sx={{ ml: 4,}}> | <Grid item xs={12} sx={{ ml: 4,}}> | ||||
| {checkPaymentSuspention()? | |||||
| {checkPaymentSuspension()? | |||||
| <Typography style={{ textAlign: "flex-start" }}> | <Typography style={{ textAlign: "flex-start" }}> | ||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| @@ -18,7 +18,7 @@ import Loadable from 'components/Loadable'; | |||||
| import * as HttpUtils from "utils/HttpUtils"; | import * as HttpUtils from "utils/HttpUtils"; | ||||
| import * as UrlUtils from "utils/ApiPathConst"; | import * as UrlUtils from "utils/ApiPathConst"; | ||||
| import * as DateUtils from "utils/DateUtils"; | import * as DateUtils from "utils/DateUtils"; | ||||
| import { checkPaymentSuspention } from "utils/Utils"; | |||||
| import { checkPaymentSuspension } from "utils/Utils"; | |||||
| const Message = Loadable(React.lazy(() => import('./Message'))); | const Message = Loadable(React.lazy(() => import('./Message'))); | ||||
| const Notice = Loadable(React.lazy(() => import('./Notice'))); | const Notice = Loadable(React.lazy(() => import('./Notice'))); | ||||
| @@ -79,7 +79,7 @@ const DashboardDefault = () => { | |||||
| // console.log(onNoticeReady) | // console.log(onNoticeReady) | ||||
| if(messageOnReady&&onNoticeReady){ | if(messageOnReady&&onNoticeReady){ | ||||
| setLoding(false) | setLoding(false) | ||||
| if(checkPaymentSuspention()){ | |||||
| if(checkPaymentSuspension()){ | |||||
| setIsPopUp(true); | setIsPopUp(true); | ||||
| } | } | ||||
| // console.log(123) | // console.log(123) | ||||
| @@ -111,9 +111,9 @@ export const checkSysEnv = () =>{ | |||||
| return localStorage.getItem('sysEnv') | return localStorage.getItem('sysEnv') | ||||
| } | } | ||||
| } | } | ||||
| export const checkPaymentSuspention = () =>{ | |||||
| if (localStorage.getItem('paymentSuspention') != null){ | |||||
| return JSON.parse(localStorage.getItem('paymentSuspention')) | |||||
| export const checkPaymentSuspension = () =>{ | |||||
| if (localStorage.getItem('paymentSuspension') != null){ | |||||
| return JSON.parse(localStorage.getItem('paymentSuspension')) | |||||
| } | } | ||||
| } | } | ||||
| /** | /** | ||||