Merge branch 'master' into paymentApi

src/pages/DemandNote/Search/SearchForm.js

@@ -67,11 +67,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
     }, [maxDate]);
 
     React.useEffect(() => {
-        setFromDueDateValue(minDueDate);
+        setFromDueDateValue(minDueDate??"dd / mm / yyyy");
     }, [minDueDate]);
 
     React.useEffect(() => {
-        setToDueDateValue(maxDueDate);
+        setToDueDateValue(maxDueDate??"dd / mm / yyyy");
     }, [maxDueDate]);
 
     function FormDateInputComponent({ inputRef, ...props }) {
@@ -219,6 +219,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
         setOrgSelected({});
         setIssueSelected({});
         setSelectedStatus(ComboData.denmandNoteStatus[0]);
+        setFromDueDateValue("dd / mm / yyyy");
+        setToDueDateValue("dd / mm / yyyy");
         reset();
     }
 

src/pages/DemandNote/Search/index.js

@@ -38,8 +38,8 @@ const SearchPage_DemandNote = () => {
     const [searchCriteria, setSearchCriteria] = React.useState({
         dateTo: DateUtils.dateValue(new Date()),
         dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
-        dueDateTo: DateUtils.dateValue(new Date()),
-        dueDateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
+        // dueDateTo: DateUtils.dateValue(new Date()),
+        // dueDateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
     });
     const [onReady, setOnReady] = React.useState(false);
 

src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

@@ -8,7 +8,7 @@ import {
     Stack,
     Dialog, DialogTitle, DialogContent, DialogActions, InputAdornment,
 } from '@mui/material';
-import {delBugMode} from "auth/utils";
+import { delBugMode } from "auth/utils";
 const MainCard = Loadable(lazy(() => import('components/MainCard')));
 import { useForm } from "react-hook-form";
 import {
@@ -94,17 +94,17 @@ const ApplicationDetailCard = (
         setStatus("notAccepted")
     };
 
-    const setCompleteDisable=()=>{
-        if(delBugMode) return false;
+    const setCompleteDisable = () => {
+        if (delBugMode) return false;
         return (new Date()).getTime() < DateUtils.convertToDate(applicationDetailData.gazetteIssueDetail.issueDate).getTime();
     }
 
     const complatedClick = () => () => {
         let issueDate = DateUtils.convertToDate(applicationDetailData.gazetteIssueDetail.issueDate);
         let current = new Date();
-        if(delBugMode){
+        if (delBugMode) {
             setStatus("complete")
-        }else if(current.getTime() >= issueDate.getTime()){
+        } else if (current.getTime() >= issueDate.getTime()) {
             setStatus("complete")
         }
     };
@@ -113,7 +113,7 @@ const ApplicationDetailCard = (
         setStatus("withdraw")
     };
 
-    const doPublish =()=>()=>{
+    const doPublish = () => () => {
         setStatus("publish")
     }
 
@@ -231,24 +231,22 @@ const ApplicationDetailCard = (
                                                 <DoneIcon />
                                                 <Typography ml={1} variant="h5">Publish</Typography>
                                             </Button>
+                                            <Button
+                                                // size="large"
+                                                variant="contained"
+                                                onClick={withdrawnClick()}
+                                                sx={{
+                                                    textTransform: 'capitalize',
+                                                    alignItems: 'end',
+                                                    backgroundColor: '#ffa733'
+                                                }}>
+                                                <CloseIcon />
+                                                <Typography ml={1} variant="h5">Withdraw</Typography>
+                                            </Button>
                                         </>
                                         :
-                                        (currentApplicationDetailData.status == "paid" && currentApplicationDetailData.creditor == 0) ?
+                                        (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 0) ?
                                             <>
-                                                <Button
-                                                    // size="large"
-                                                    variant="contained"
-                                                    onClick={complatedClick()}
-                                                    disabled={setCompleteDisable()}
-                                                    sx={{
-                                                        textTransform: 'capitalize',
-                                                        alignItems: 'end',
-                                                        backgroundColor: '#52b202'
-                                                    }}>
-                                                    
-                                                    <DoneIcon />
-                                                    <Typography ml={1} variant="h5">Publish</Typography>
-                                                </Button>
                                                 <Button
                                                     // size="large"
                                                     variant="contained"
@@ -261,7 +259,40 @@ const ApplicationDetailCard = (
                                                     <CloseIcon />
                                                     <Typography ml={1} variant="h5">Withdraw</Typography>
                                                 </Button>
-                                            </> : null
+                                            </>
+                                            :
+                                            (
+                                                (currentApplicationDetailData.status == "paid" && currentApplicationDetailData.creditor == 0) ?
+                                                    <>
+                                                        <Button
+                                                            // size="large"
+                                                            variant="contained"
+                                                            onClick={complatedClick()}
+                                                            disabled={setCompleteDisable()}
+                                                            sx={{
+                                                                textTransform: 'capitalize',
+                                                                alignItems: 'end',
+                                                                backgroundColor: '#52b202'
+                                                            }}>
+
+                                                            <DoneIcon />
+                                                            <Typography ml={1} variant="h5">Publish</Typography>
+                                                        </Button>
+                                                        <Button
+                                                            // size="large"
+                                                            variant="contained"
+                                                            onClick={withdrawnClick()}
+                                                            sx={{
+                                                                textTransform: 'capitalize',
+                                                                alignItems: 'end',
+                                                                backgroundColor: '#ffa733'
+                                                            }}>
+                                                            <CloseIcon />
+                                                            <Typography ml={1} variant="h5">Withdraw</Typography>
+                                                        </Button>
+                                                    </> : null
+                                            )
+
                                 }
                             </Stack>
                         </Grid>
@@ -312,7 +343,7 @@ const ApplicationDetailCard = (
 
                                         <Grid item xs={12} md={8} lg={8}>
                                             <FormControl variant="outlined">
-                                                {StatusUtils.getStatusByTextEng(currentApplicationDetailData.status)}
+                                                {StatusUtils.getStatusByTextEng(currentApplicationDetailData.status, currentApplicationDetailData.creditor)}
                                             </FormControl>
                                         </Grid>
                                     </Grid>

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -212,10 +212,16 @@ const ApplicationDetailCard = (
                                     color="edit"
                                     disabled={currentApplicationDetailData.status == "rejected"
                                         || currentApplicationDetailData.status == "cancelled"
+                                        || currentApplicationDetailData.status == "withdrawn"
+                                        || currentApplicationDetailData.status == "completed"
+                                        || currentApplicationDetailData.status == "notAccepted"
+                                        || currentApplicationDetailData.status == "resubmit"
                                         || (!currentApplicationDetailData.creditor
                                             && currentApplicationDetailData.status == "paid")
                                         || (currentApplicationDetailData.creditor
                                             && currentApplicationDetailData.status == "confirmed")
+                                        || (currentApplicationDetailData.creditor
+                                            && currentApplicationDetailData.status == "published")
                                     }
                                     title={intl.formatMessage({ id: 'cancel' })}
                                     startIcon={<CloseIcon />}
@@ -276,7 +282,7 @@ const ApplicationDetailCard = (
 
                                         <Grid item xs={12} md={9} lg={9}>
                                             <FormControl variant="outlined">
-                                                {currentApplicationDetailData.status ? StatusUtils.getStatusByTextIntl(currentApplicationDetailData.status, false, intl) : ""}
+                                                {currentApplicationDetailData.status ? StatusUtils.getStatusByTextIntl(currentApplicationDetailData.status, currentApplicationDetailData.creditor, intl) : ""}
                                             </FormControl>
                                         </Grid>