From 0cb399846f08b10ce8044044f426e10fe07d5107 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 29 Jul 2024 12:45:14 +0800 Subject: [PATCH 1/3] update payment status display --- src/utils/statusUtils/PaymentStatus.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/utils/statusUtils/PaymentStatus.js b/src/utils/statusUtils/PaymentStatus.js index 08eae20..a7f0bc5 100644 --- a/src/utils/statusUtils/PaymentStatus.js +++ b/src/utils/statusUtils/PaymentStatus.js @@ -21,6 +21,10 @@ function getStatus(params) { if(status == "REJT") return REJT; if(status == "CANC") return CANC; if(status == "INPR") return INPR; + if(status == "PSTO") return CANC; + if(status == "NOTF") return CANC; + if(status == "PSER") return REJT; + if(status == "FIER") return REJT; return INPR; } From 428abdc670d2cef0ec016d06551ac76050275f69 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 29 Jul 2024 15:23:53 +0800 Subject: [PATCH 2/3] on iamsmart fail page --- src/pages/authentication/ForgotPassword/AuthCallback/index.js | 4 ++-- src/pages/authentication/ForgotUsername/AuthCallback/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/authentication/ForgotPassword/AuthCallback/index.js b/src/pages/authentication/ForgotPassword/AuthCallback/index.js index d458bcb..07cf5b1 100644 --- a/src/pages/authentication/ForgotPassword/AuthCallback/index.js +++ b/src/pages/authentication/ForgotPassword/AuthCallback/index.js @@ -115,11 +115,11 @@ const Index = () => { onFail: (response)=>{ console.log("Fail"); console.log(response); - // window.location.assign("/iamsmart/loginFail"); + window.location.assign("/iamsmart/loginFail"); }, onError:(error)=>{ console.log(error); - // window.location.assign("/iamsmart/loginFail"); + window.location.assign("/iamsmart/loginFail"); } }); } diff --git a/src/pages/authentication/ForgotUsername/AuthCallback/index.js b/src/pages/authentication/ForgotUsername/AuthCallback/index.js index 7aa9879..dbe9b55 100644 --- a/src/pages/authentication/ForgotUsername/AuthCallback/index.js +++ b/src/pages/authentication/ForgotUsername/AuthCallback/index.js @@ -119,11 +119,11 @@ const Index = () => { onFail: (response)=>{ console.log("Fail"); console.log(response); - // window.location.assign("/iamsmart/loginFail"); + window.location.assign("/iamsmart/loginFail"); }, onError:(error)=>{ console.log(error); - // window.location.assign("/iamsmart/loginFail"); + window.location.assign("/iamsmart/loginFail"); } }); } From 6e97e779d892c4315f55b7384e7bae8a63855205 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 29 Jul 2024 18:03:27 +0800 Subject: [PATCH 3/3] update payment status --- src/utils/statusUtils/PaymentStatus.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils/statusUtils/PaymentStatus.js b/src/utils/statusUtils/PaymentStatus.js index a7f0bc5..2e7d5fd 100644 --- a/src/utils/statusUtils/PaymentStatus.js +++ b/src/utils/statusUtils/PaymentStatus.js @@ -4,6 +4,7 @@ const APPR = {color:"#22a13f", eng:"Success", cht:"成功"} const REJT = {color:"#d9372b", eng:"Reject", cht:"拒絕"} const CANC = {color:"#8a8784", eng:"Cancelled", cht:"取消"} const INPR = {color:"#f5a83d", eng:"In Progress", cht:"進行中"} +const DUPA = {color:"#8a8784", eng:"", cht:""} export function getStatus_Cht(params) { let status = getStatus(params); @@ -23,8 +24,9 @@ function getStatus(params) { if(status == "INPR") return INPR; if(status == "PSTO") return CANC; if(status == "NOTF") return CANC; - if(status == "PSER") return REJT; - if(status == "FIER") return REJT; + if(status == "PSER") return INPR; + if(status == "FIER") return INPR; + if(status == "DUPA") return DUPA; return INPR; }