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

src/pages/Proof/Reply_Public/ProofForm.js

@@ -76,11 +76,14 @@ const FormPanel = ({ formData }) => {
                 },
                 files: attachments ? attachments : [],
                 onSuccess: function () {
+                    notifyActionSuccess("提交成功!")
                     if (actionValue) {
-                        notifyActionSuccess("提交成功!")
-                        navigate("/proof/pay/" + params.id);
+                        if(data.creditor){
+                            navigate("/proof/search");
+                        }else{
+                            navigate("/proof/pay/" + params.id);
+                        }
                     } else {
-                        notifyActionSuccess("提交成功!")
                         navigate("/proof/search");
                     }
                 },

src/pages/authentication/IAmSmartRegister.js

@@ -56,6 +56,7 @@ const Register = () => {
   const [completed, setCompleted] = useState([false]);
   const [updateValid, setUpdateValid] = useState(false);
   const [base64Url, setBase64Url] = useState("")
+  const [checkCode, setCheckCode] = useState("")
   const [idNo, setIdNo] = useState("");
 
   const totalSteps = () => {

src/utils/statusUtils/PublicNoteStatusUtils.js

@@ -3,17 +3,17 @@
 import {getStatusTag} from "utils/statusUtils/Base";
 
 export function getStatus(params) {
-    return getStatusByText(params.row.status);
+    return getStatusByText(params.row.status,  params.row.creditor);
 }
 
-export function getStatusByText(status) {
+export function getStatusByText(status, creditor) {
     switch (status) {
         case "submitted":
             return getStatusTag({ color: "#f5a83d", text: "處理中" })
         case "reviewed":
             return getStatusTag({ color: "#f5a83d", text: "處理中" })
         case "confirmed":
-            if (localStorage.getItem('userData').creditor)
+            if (creditor)
                 return getStatusTag({ color: "#22a13f", text: "待發布" })
             else
                 return getStatusTag({ color: "#22a13f", text: "待付款" })
@@ -37,16 +37,16 @@ export function getStatusByText(status) {
 }
 
 export function getStatusEng(params) {
-    return getStatusByTextEng(params.row.status);
+    return getStatusByTextEng(params.row.status, params.row.creditor);
 }
-export function getStatusByTextEng(status) {
+export function getStatusByTextEng(status, creditor) {
     switch (status) {
         case "submitted":
             return getStatusTag({ color: "#f5a83d", text: "Submitted" })
         case "reviewed":
             return getStatusTag({ color: "#0C489E", text: "Reviewed" })
         case "confirmed":
-            if (localStorage.getItem('userData').creditor)
+            if (creditor)
                 return getStatusTag({ color: "#22a13f", text: "Pending Publish" })
             else
                 return getStatusTag({ color: "#22a13f", text: "Pending Payment" })