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

src/layout/MainLayout/Header/index.js

@@ -127,7 +127,7 @@ function Header(props) {
               <Link className="downloadXML" onClick={getXML()} ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Download XML</Typography></Link>
             </li>
             <li>
-              <Link className="createDemandNote" to='/paymentPage/createDemandNote' ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Create DN</Typography></Link>
+              <Link className="createDemandNote" to='/paymentPage/createDemandNote' ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Create Demand Note</Typography></Link>
             </li>
             <li>
               <Link className="demandNote" to='/paymentPage/demandNote' ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Demand Note</Typography></Link>

src/pages/DemandNote/Create/index.js

@@ -84,7 +84,7 @@ const Index = () => {
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                            <Typography ml={15} color='#FFF' variant="h4">Create DN</Typography>
+                            <Typography ml={15} color='#FFF' variant="h4">Create Demand Note</Typography>
                         </Stack>
                     </div>
                 </Grid>

src/utils/statusUtils/PublicNoteStatusUtils.js

@@ -28,9 +28,9 @@ export function getStatusByText(status, creditor) {
         case "resubmit":
             return getStatusTag({ color: "#757373", text: "需重新提交" })
         case "cancelled":
-            return getStatusTag({ color: "#f5a83d", text: "已取消" })
+            return getStatusTag({ color: "#909497", text: "已取消" })
         case "withdrawn":
-            return getStatusTag({ color: "#8a8784", text: "已撤銷" })
+            return getStatusTag({ color: "#909497", text: "已撤銷" })
         default:
             return getStatusTag({ text: status })
     }
@@ -42,18 +42,18 @@ export function getStatusEng(params) {
 export function getStatusByTextEng(status, creditor) {
     switch (status) {
         case "submitted":
-            return getStatusTag({ color: "#f5a83d", text: "Submitted" })
+            return getStatusTag({ color: "#F1C40F", text: "Submitted" })
         case "reviewed":
             return getStatusTag({ color: "#0C489E", text: "Reviewed" })
         case "confirmed":
             if (creditor)
-                return getStatusTag({ color: "#22a13f", text: "Pending Publish" })
+                return getStatusTag({ color: "#3498DB", text: "Pending Publish" })
             else
-                return getStatusTag({ color: "#22a13f", text: "Pending Payment" })
+                return getStatusTag({ color: "#F39C12", text: "Pending Payment" })
         case "published":
-            return getStatusTag({ color: "#22a13f", text: "Pending Payment" })
+            return getStatusTag({ color: "#F39C12", text: "Pending Payment" })
         case "paid":
-            return getStatusTag({ color: "#22a13f", text: "Pending Publish" })
+            return getStatusTag({ color: "#3498DB", text: "Pending Publish" })
         case "complated":
             return getStatusTag({ color: "#8a8784", text: "Completed" })
         case "notAccepted":