Просмотр исходного кода

Revert "test payment"

This reverts commit 94a6cbd5eb.
uat
Jason Chuang 16 часов назад
Родитель
Сommit
b717f36709
5 измененных файлов: 8 добавлений и 20 удалений
  1. +2
    -4
      src/pages/Payment/MultiPaymentWindow.js
  2. +2
    -4
      src/pages/Proof/Payment/Pay.js
  3. +1
    -4
      src/pages/Proof/Payment/Pay_Online.js
  4. +2
    -4
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  5. +1
    -4
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

+ 2
- 4
src/pages/Payment/MultiPaymentWindow.js Просмотреть файл

@@ -217,10 +217,8 @@ const MultiPaymentWindow = (props) => {
}); });
const latestDataObjects = Object.values(latestData); const latestDataObjects = Object.values(latestData);
const filteredData = latestDataObjects.filter(item =>
item.status == "CANC" || item.status == "REJT"
|| (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
);
// const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");


const filteredAppIds = filteredData.map(item => item.appId); const filteredAppIds = filteredData.map(item => item.appId);


+ 2
- 4
src/pages/Proof/Payment/Pay.js Просмотреть файл

@@ -62,10 +62,8 @@ const Index = ({ record }) => {
}); });
const latestDataObjects = Object.values(latestData); const latestDataObjects = Object.values(latestData);
const filteredData = latestDataObjects.filter(item =>
item.status == "CANC" || item.status == "REJT"
|| (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
);
// const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");


const filteredAppIds = filteredData.map(item => item.appId); const filteredAppIds = filteredData.map(item => item.appId);




+ 1
- 4
src/pages/Proof/Payment/Pay_Online.js Просмотреть файл

@@ -140,10 +140,7 @@ const Index = () => {
}); });
const latestDataObjects = Object.values(latestData); const latestDataObjects = Object.values(latestData);


const filteredData = latestDataObjects.filter(item =>
item.status == "CANC" || item.status == "REJT"
|| (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
);
const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
const filteredAppIds = filteredData.map(item => item.appId); const filteredAppIds = filteredData.map(item => item.appId);


const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId)); const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));


+ 2
- 4
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js Просмотреть файл

@@ -156,10 +156,8 @@ const ApplicationDetailCard = (
}); });
const latestDataObjects = Object.values(latestData); const latestDataObjects = Object.values(latestData);


const filteredData = latestDataObjects.filter(item =>
item.status == "CANC" || item.status == "REJT"
|| (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
);
// const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");


const filteredAppIds = filteredData.map(item => item.appId); const filteredAppIds = filteredData.map(item => item.appId);




+ 1
- 4
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js Просмотреть файл

@@ -151,10 +151,7 @@ export default function SubmittedTab({ setCount, url }) {
}); });
const latestDataObjects = Object.values(latestData); const latestDataObjects = Object.values(latestData);
const filteredData = latestDataObjects.filter(item =>
item.status == "CANC" || item.status == "REJT"
|| (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
);
const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
const filteredAppIds = filteredData.map(item => item.appId); const filteredAppIds = filteredData.map(item => item.appId);


const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId)); const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));


Загрузка…
Отмена
Сохранить