Merge branch 'New_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into New_Enhancement

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");
             }
         });
     }

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");
             }
         });
     }

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);
@@ -21,6 +22,11 @@ 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 INPR;
+    if(status == "FIER") return INPR;
+    if(status == "DUPA") return DUPA;
     return INPR;
 }