diff --git a/src/pages/Payment/Details_GLD/PaymentDetails.js b/src/pages/Payment/Details_GLD/PaymentDetails.js
index b8b6714..de9e10a 100644
--- a/src/pages/Payment/Details_GLD/PaymentDetails.js
+++ b/src/pages/Payment/Details_GLD/PaymentDetails.js
@@ -14,7 +14,7 @@ const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
import DownloadIcon from '@mui/icons-material/Download';
// ==============================|| DASHBOARD - DEFAULT ||============================== //
-const PaymentDetails = ({ formData,doPrint }) => {
+const PaymentDetails = ({ formData,doPrint,onDownload }) => {
const [data, setData] = React.useState({});
const [onReady, setOnReady] = React.useState(false);
@@ -158,10 +158,14 @@ const PaymentDetails = ({ formData,doPrint }) => {
+ {onDownload?
+
+ :
+ }
diff --git a/src/pages/Payment/Details_GLD/index.js b/src/pages/Payment/Details_GLD/index.js
index 302b87c..114cc82 100644
--- a/src/pages/Payment/Details_GLD/index.js
+++ b/src/pages/Payment/Details_GLD/index.js
@@ -4,7 +4,7 @@ import {
Typography,
Stack,
Box,
- // Button
+ Button
} from '@mui/material';
import * as UrlUtils from "utils/ApiPathConst";
import * as React from "react";
@@ -12,6 +12,7 @@ import * as HttpUtils from "utils/HttpUtils";
import * as DateUtils from "utils/DateUtils";
import { useParams } from "react-router-dom";
import { useNavigate } from "react-router-dom";
+import ForwardIcon from '@mui/icons-material/Forward';
import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
@@ -37,6 +38,7 @@ const Index = () => {
const [record, setRecord] = React.useState();
const [itemList, setItemList] = React.useState([]);
const [onReady, setOnReady] = React.useState(false);
+ const [onDownload, setOnDownload] = React.useState(false);
// const [detailsOrder, setDetailsOrder] = React.useState(2);
React.useEffect(() => {
@@ -54,8 +56,15 @@ const Index = () => {
const doPrint = () => {
// window.print();
+ setOnDownload(true)
HttpUtils.fileDownload({
url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+params.id,
+ onResponse:()=>{
+ setOnDownload(false)
+ },
+ onError:()=>{
+ setOnDownload(false)
+ }
});
};
@@ -98,6 +107,15 @@ const Index = () => {
+
+
+
{/*row 1*/}
@@ -106,6 +124,7 @@ const Index = () => {
{
paymentMethod = "01,PPSB,PPS";
}
- if (paymentMethod != "") {
- HttpUtils.post({
- url: UrlUtils.PAYMENT_CREATE,
- params: {
- transNo: transactionData.transactionid,
- payMethod: paymentMethod,
- payAmount: totalAmount,
- appIdList: location.state?.appIdList ?? []
- },
- onSuccess: function (responData) {
- localStorage.removeItem("paymentId");
- localStorage.setItem("paymentId", responData.id)
- navigate(page, stateParams);
- }
- });
- }
-
- // //For testing
// if (paymentMethod != "") {
// HttpUtils.post({
// url: UrlUtils.PAYMENT_CREATE,
// params: {
- // transNo: "test0001",
+ // transNo: transactionData.transactionid,
// payMethod: paymentMethod,
// payAmount: totalAmount,
// appIdList: location.state?.appIdList ?? []
@@ -174,181 +156,199 @@ const Index = () => {
// }
// });
// }
- }
- }, [afterConfirmPayment]);
- const getAvailablePayment = () =>{
- HttpUtils.post({
- url: UrlUtils.PAYMENT_AVAILABLE_PAYMENT,
- params: {
- "locale": locale === 'en' ?Utils.local.en:locale === 'zh-HK' ?Utils.local.zh:Utils.local.cn,
- "amount": totalAmount,
- // "eserviceids": [
- // "", ""
- // ],
- "preferpaymentmethods": Utils.preferpaymentmethods
- },
- onSuccess: (responseData) => {
- let availableMethods = responseData.availablepaymentmethods;
- setAvailableMethods(availableMethods);
- HttpUtils.get({
- url: UrlUtils.PAYMENT_LIMIT_SETTING_LIST,
- params: {},
- onSuccess: (responseData) => {
- // console.log(responseData)
- setPaymentLimit(responseData)
-
+ //For testing
+ if (paymentMethod != "") {
+ HttpUtils.post({
+ url: UrlUtils.PAYMENT_CREATE,
+ params: {
+ transNo: "test0002",
+ payMethod: paymentMethod,
+ payAmount: totalAmount,
+ appIdList: location.state?.appIdList ?? []
},
- onError: () =>{
- // setOnReady(true)
+ onSuccess: function (responData) {
+ localStorage.removeItem("paymentId");
+ localStorage.setItem("paymentId", responData.id)
+ navigate(page, stateParams);
}
});
- },
- onError: () =>{
- setOnReady(true)
}
- });
-
- // HttpUtils.get({
- // url: UrlUtils.PAYMENT_LIMIT_SETTING_LIST,
- // params: {},
- // onSuccess: (responseData) => {
- // // console.log(responseData)
- // setPaymentLimit(responseData)
+ }
+ }, [afterConfirmPayment]);
+ const getAvailablePayment = () =>{
+ // HttpUtils.post({
+ // url: UrlUtils.PAYMENT_AVAILABLE_PAYMENT,
+ // params: {
+ // "locale": locale === 'en' ?Utils.local.en:locale === 'zh-HK' ?Utils.local.zh:Utils.local.cn,
+ // "amount": totalAmount,
+ // // "eserviceids": [
+ // // "", ""
+ // // ],
+ // "preferpaymentmethods": Utils.preferpaymentmethods
+ // },
+ // onSuccess: (responseData) => {
+ // let availableMethods = responseData.availablepaymentmethods;
+ // setAvailableMethods(availableMethods);
+ // HttpUtils.get({
+ // url: UrlUtils.PAYMENT_LIMIT_SETTING_LIST,
+ // params: {},
+ // onSuccess: (responseData) => {
+ // // console.log(responseData)
+ // setPaymentLimit(responseData)
+
+ // },
+ // onError: () =>{
+ // // setOnReady(true)
+ // }
+ // });
// },
// onError: () =>{
- // // setOnReady(true)
+ // setOnReady(true)
// }
// });
+
+ HttpUtils.get({
+ url: UrlUtils.PAYMENT_LIMIT_SETTING_LIST,
+ params: {},
+ onSuccess: (responseData) => {
+ // console.log(responseData)
+ setPaymentLimit(responseData)
+
+ },
+ onError: () =>{
+ // setOnReady(true)
+ }
+ });
- // const responseData = {
- // "availablepaymentmethods": [
- // {
- // "active": "Y",
- // "code": "04,BCFP,FPS",
- // "pointstonote": [
- // {
- // "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
- // "order": 10,
- // "type": "INFO"
- // },
- // {
- // "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
- // "order": 11,
- // "type": "INFO"
- // }
- // ],
- // "subtype": "FPS"
- // },
- // {
- // "active": "Y",
- // "code": "02,BCMP,CreditCard",
- // "pointstonote": [
- // {
- // "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
- // "order": 10,
- // "type": "INFO"
- // },
- // {
- // "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
- // "order": 11,
- // "type": "INFO"
- // },
- // {
- // "content": "Merchant Name is applicable to credit card payment method only.",
- // "order": 40,
- // "type": "INFO"
- // },
- // {
- // "content": "Under exceptional conditions, a refund may need to be arranged. If the payment is made by Credit Card, the refund can normally be made to the Credit Card account that is used for the payment.",
- // "order": 41,
- // "type": "INFO"
- // },
- // {
- // "content": "Some users may receive an error page or have to wait for several minutes before they get a response from the credit card payment gateway. If you experience such a problem, please wait a moment and retry, or change to use other available payment methods. We apologise for any inconvenience caused.",
- // "order": 42,
- // "type": "INFO"
- // },
- // {
- // "content": "Different credit card issuers may have implemented different mechanisms to authenticate the cardholder's identity during online payment. Please contact your card issuer if you want to learn more about the J/Secure, MasterCard SecureCode and Verified by Visa service. ",
- // "order": 43,
- // "type": "INFO"
- // }
- // ],
- // "subtype": "CreditCard",
- // "supportedcard": [
- // "JCB",
- // "MasterCard",
- // "Visa"
- // ]
- // },
- // {
- // "active": "Y",
- // "code": "03,BCMP,CreditCard",
- // "pointstonote": [
- // {
- // "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
- // "order": 10,
- // "type": "INFO"
- // },
- // {
- // "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
- // "order": 11,
- // "type": "INFO"
- // },
- // {
- // "content": "Merchant Name is applicable to credit card payment method only.",
- // "order": 40,
- // "type": "INFO"
- // },
- // {
- // "content": "Under exceptional conditions, a refund may need to be arranged. If the payment is made by Credit Card, the refund can normally be made to the Credit Card account that is used for the payment.",
- // "order": 41,
- // "type": "INFO"
- // },
- // {
- // "content": "Some users may receive an error page or have to wait for several minutes before they get a response from the credit card payment gateway. If you experience such a problem, please wait a moment and retry, or change to use other available payment methods. We apologise for any inconvenience caused.",
- // "order": 42,
- // "type": "INFO"
- // },
- // {
- // "content": "Different credit card issuers may have implemented different mechanisms to authenticate the cardholder's identity during online payment. Please contact your card issuer if you want to learn more about the J/Secure, MasterCard SecureCode and Verified by Visa service. ",
- // "order": 43,
- // "type": "INFO"
- // }
- // ],
- // "subtype": "CreditCard",
- // "supportedcard": [
- // "UnionPay"
- // ]
- // },
- // {
- // "active": "Y",
- // "code": "01,PPSB,PPS",
- // "pointstonote": [
- // {
- // "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
- // "order": 10,
- // "type": "INFO"
- // },
- // {
- // "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
- // "order": 11,
- // "type": "INFO"
- // },
- // {
- // "content": "PPS Shop&Buy (PPS) does not support payment via browsers of mobile devices (including mobile phones and tablets) at the moment. If you wish to pay by PPS, please change to use desktop computer. ",
- // "order": 21,
- // "type": "INFO"
- // }
- // ],
- // "subtype": "PPS"
- // }
- // ]
- // };
- // let availableMethods = responseData.availablepaymentmethods;
- // setAvailableMethods(availableMethods);
+ const responseData = {
+ "availablepaymentmethods": [
+ {
+ "active": "Y",
+ "code": "04,BCFP,FPS",
+ "pointstonote": [
+ {
+ "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
+ "order": 10,
+ "type": "INFO"
+ },
+ {
+ "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
+ "order": 11,
+ "type": "INFO"
+ }
+ ],
+ "subtype": "FPS"
+ },
+ {
+ "active": "Y",
+ "code": "02,BCMP,CreditCard",
+ "pointstonote": [
+ {
+ "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
+ "order": 10,
+ "type": "INFO"
+ },
+ {
+ "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
+ "order": 11,
+ "type": "INFO"
+ },
+ {
+ "content": "Merchant Name is applicable to credit card payment method only.",
+ "order": 40,
+ "type": "INFO"
+ },
+ {
+ "content": "Under exceptional conditions, a refund may need to be arranged. If the payment is made by Credit Card, the refund can normally be made to the Credit Card account that is used for the payment.",
+ "order": 41,
+ "type": "INFO"
+ },
+ {
+ "content": "Some users may receive an error page or have to wait for several minutes before they get a response from the credit card payment gateway. If you experience such a problem, please wait a moment and retry, or change to use other available payment methods. We apologise for any inconvenience caused.",
+ "order": 42,
+ "type": "INFO"
+ },
+ {
+ "content": "Different credit card issuers may have implemented different mechanisms to authenticate the cardholder's identity during online payment. Please contact your card issuer if you want to learn more about the J/Secure, MasterCard SecureCode and Verified by Visa service. ",
+ "order": 43,
+ "type": "INFO"
+ }
+ ],
+ "subtype": "CreditCard",
+ "supportedcard": [
+ "JCB",
+ "MasterCard",
+ "Visa"
+ ]
+ },
+ {
+ "active": "Y",
+ "code": "03,BCMP,CreditCard",
+ "pointstonote": [
+ {
+ "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
+ "order": 10,
+ "type": "INFO"
+ },
+ {
+ "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
+ "order": 11,
+ "type": "INFO"
+ },
+ {
+ "content": "Merchant Name is applicable to credit card payment method only.",
+ "order": 40,
+ "type": "INFO"
+ },
+ {
+ "content": "Under exceptional conditions, a refund may need to be arranged. If the payment is made by Credit Card, the refund can normally be made to the Credit Card account that is used for the payment.",
+ "order": 41,
+ "type": "INFO"
+ },
+ {
+ "content": "Some users may receive an error page or have to wait for several minutes before they get a response from the credit card payment gateway. If you experience such a problem, please wait a moment and retry, or change to use other available payment methods. We apologise for any inconvenience caused.",
+ "order": 42,
+ "type": "INFO"
+ },
+ {
+ "content": "Different credit card issuers may have implemented different mechanisms to authenticate the cardholder's identity during online payment. Please contact your card issuer if you want to learn more about the J/Secure, MasterCard SecureCode and Verified by Visa service. ",
+ "order": 43,
+ "type": "INFO"
+ }
+ ],
+ "subtype": "CreditCard",
+ "supportedcard": [
+ "UnionPay"
+ ]
+ },
+ {
+ "active": "Y",
+ "code": "01,PPSB,PPS",
+ "pointstonote": [
+ {
+ "content": "Please take note of the transaction reference number or PRINT this page for making enquiry on the payment status when necessary.",
+ "order": 10,
+ "type": "INFO"
+ },
+ {
+ "content": "After pressing the 'Pay' button, please DO NOT leave this e-service until you receive the acknowledgement page, otherwise your transaction may not be successful.",
+ "order": 11,
+ "type": "INFO"
+ },
+ {
+ "content": "PPS Shop&Buy (PPS) does not support payment via browsers of mobile devices (including mobile phones and tablets) at the moment. If you wish to pay by PPS, please change to use desktop computer. ",
+ "order": 21,
+ "type": "INFO"
+ }
+ ],
+ "subtype": "PPS"
+ }
+ ]
+ };
+ let availableMethods = responseData.availablepaymentmethods;
+ setAvailableMethods(availableMethods);
}
useEffect(() => {
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 7581c20..8c61bd8 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -34,6 +34,8 @@ export default function SubmittedTab({ rows }) {
const [selectedCareOf, setSelectedCareOf] = React.useState(null);
const [expiryDateErrText, setExpiryDateErrText] = React.useState("");
const [expiryDateErr, setExpiryDateErr] = React.useState(false);
+ const [paymentHoldedErrText, setPaymentHoldedErrText] = React.useState("");
+ const [paymentHoldedErr, setPaymentHoldedErr] = React.useState(false);
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
const intl = useIntl();
@@ -103,7 +105,8 @@ export default function SubmittedTab({ rows }) {
},
onSuccess: (responData) => {
if (responData.success == true) {
- setIsPopUp(true);
+ // setIsPopUp(true);
+ handlePaymentCheck(appIdList)
return;
}
let str = "";
@@ -114,8 +117,45 @@ export default function SubmittedTab({ rows }) {
setExpiryDateErr(true);
}
});
+ };
+ const handlePaymentCheck = (appIdList) => {
+ HttpUtils.post({
+ url: UrlUtils.PAYMENT_CHECK,
+ params: {
+ appIds: appIdList
+ },
+ onSuccess: (responseData) => {
+ const latestData = {};
+ responseData.forEach(item => {
+ const { appId, timeDiff } = item;
+ if (latestData[appId] === undefined || timeDiff < latestData[appId].timeDiff) {
+ latestData[appId] = item;
+ }
+ });
+ const latestDataObjects = Object.values(latestData);
+
+ const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 && item.status !== "APPR");
+ const filteredAppIds = filteredData.map(item => item.appId);
+
+ const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));
+ const combinedAppIdsArray = [...appIdsNotInData, ...filteredAppIds];
+
+ const readyToPayment = appIdList.every(appId => combinedAppIdsArray.includes(appId));
+ if (readyToPayment){
+ setIsPopUp(true);
+ return;
+ }else{
+ const appIdsInData = appIdList.filter(appId => !combinedAppIdsArray.some(item => item === appId));
+ const HoldingApplication = latestDataObjects.filter(item => appIdsInData.includes(item.appId));
+ const resultString = HoldingApplication.map(item => item.appNo).join(' , ');
+ setPaymentHoldedErrText(resultString);
+ // setPaymentHoldedErrText(intl.formatMessage({ id: 'MSG.paymentHolded' }, { appNo: record.appNo }));
+ setPaymentHoldedErr(true);
+ }
+ }
+ });
};
const columns = [
@@ -405,6 +445,33 @@ export default function SubmittedTab({ rows }) {
+
+
+