diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index a33a5c9..f96e036 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -9,7 +9,7 @@ import { Stack, Dialog, DialogTitle, DialogContent, DialogActions, InputAdornment, } from '@mui/material'; -import {isGranted, delBugMode } from "auth/utils"; +import { isGranted, delBugMode } from "auth/utils"; const MainCard = Loadable(lazy(() => import('components/MainCard'))); import { useForm } from "react-hook-form"; import { @@ -23,7 +23,7 @@ import Loadable from 'components/Loadable'; const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); import * as HttpUtils from "utils/HttpUtils" import * as DateUtils from "utils/DateUtils" -import {CHECK_CREATE_PROOF,UPDATE_GLDREMARKS } from "utils/ApiPathConst" +import { CHECK_CREATE_PROOF, UPDATE_GLDREMARKS } from "utils/ApiPathConst" import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; import DoneIcon from '@mui/icons-material/Done'; @@ -43,15 +43,16 @@ const ApplicationDetailCard = ( const [currentApplicationDetailData, setCurrentApplicationDetailData] = useState({}); const [companyName, setCompanyName] = useState({}); + const [orgDetail, setOrgDetail] = useState({}); const [verified, setVerified] = useState(null); const [fileDetail, setfileDetail] = useState({}); const [onReady, setOnReady] = useState(false); - const { register,handleSubmit } = useForm() + const { register, handleSubmit } = useForm() const [isWarningPopUp, setIsWarningPopUp] = useState(false); const [warningText, setWarningText] = useState(""); - + const [remarksPopUp, setRemarksPopUp] = useState(false); useEffect(() => { @@ -72,6 +73,7 @@ const ApplicationDetailCard = ( const loadApplicationDetail = () => { setCurrentApplicationDetailData(applicationDetailData.data); + setOrgDetail(applicationDetailData.orgDetail?.data); setCompanyName(applicationDetailData.companyName); setVerified(applicationDetailData.userData.verifiedBy ? true : false) setfileDetail(applicationDetailData.fileDetail); @@ -97,6 +99,11 @@ const ApplicationDetailCard = ( setStatus("notAccepted") }; + const paidClick = () => () => { + setStatus("paid") + }; + + const setCompleteDisable = () => { if (delBugMode) return false; return (new Date()).getTime() < DateUtils.convertToDate(applicationDetailData.gazetteIssueDetail.issueDate).getTime(); @@ -159,7 +166,7 @@ const ApplicationDetailCard = ( const onSubmit = (data) => { // console.log(data) const gldRemarks = data.makeRemarks - if (gldRemarks!=null&&gldRemarks!=currentApplicationDetailData.gldRemarks){ + if (gldRemarks != null && gldRemarks != currentApplicationDetailData.gldRemarks) { HttpUtils.post({ url: UPDATE_GLDREMARKS + "/" + currentApplicationDetailData.id, params: { @@ -172,7 +179,7 @@ const ApplicationDetailCard = ( alert(error) } }); - }else{ + } else { setRemarksPopUp(false) } @@ -220,6 +227,23 @@ const ApplicationDetailCard = ( spacing={2} mb={2} > + { + !(orgDetail?.creditor) && currentApplicationDetailData.creditor && currentApplicationDetailData.status === "published" ? + <> + + + : + <> + } {currentApplicationDetailData.status === "submitted" || currentApplicationDetailData.status == "reviewed" ? <> @@ -376,7 +400,7 @@ const ApplicationDetailCard = ( - + @@ -653,7 +677,7 @@ const ApplicationDetailCard = ( - + - +