Fixed notifications

This commit is contained in:
Patrick Alvin Alcala 2026-03-30 14:54:03 +08:00
parent 094dd08707
commit eeb13bcc56

View file

@ -190,6 +190,7 @@ export default () => {
const closeNotification = async () => { const closeNotification = async () => {
setPrinted(false) setPrinted(false)
setVoidNotification(false)
await checkDivision() await checkDivision()
if (isBuilding()) await getListForPrinting('building') if (isBuilding()) await getListForPrinting('building')
if (isOccupancy()) await getListForPrinting('occupancy') if (isOccupancy()) await getListForPrinting('occupancy')
@ -394,7 +395,7 @@ export default () => {
return return
} }
setLoadingText('Processing for Re-approval') setLoadingText('Processing for Re-approval Status')
if (division === 'electrical') { if (division === 'electrical') {
await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1) await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1)
await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0) await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0)
@ -403,15 +404,13 @@ export default () => {
if (checkOpPrinting) { if (checkOpPrinting) {
await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING') await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING')
} }
setLoadingText('Processing for Re-approval')
const checkOrValidation = await checkDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') const checkOrValidation = await checkDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
if (checkOrValidation) { if (checkOrValidation) {
await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
} }
// await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION') // await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
await updateOpForApproval(division, application) await updateOpForApproval(division, application)
setLoadingText('Processing for Re-approval') setLoadingText('Clearing transactions and locked data')
await clearEsignTransactions(application) await clearEsignTransactions(application)
await clearEsignLock(application) await clearEsignLock(application)
} else if (division === 'occupancy') { } else if (division === 'occupancy') {
@ -420,12 +419,13 @@ export default () => {
await updateDocflow(division, application, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT') await updateDocflow(division, application, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT')
} }
setLoadingText('Voiding POPS record')
const successVoid = BACKEND.includes('localhost') ? await voidPopsOpLocal(application) : await voidPopsOp(application) const successVoid = BACKEND.includes('localhost') ? await voidPopsOpLocal(application) : await voidPopsOp(application)
if (successVoid) { if (successVoid) {
await postTransaction(application) await postTransaction(application)
setIsLoading(false)
setPrintedApplication(application) setPrintedApplication(application)
setVoidNotification(true) setVoidNotification(true)
setIsLoading(false)
} else { } else {
setIsLoading(false) setIsLoading(false)
} }
@ -1186,7 +1186,7 @@ export default () => {
</Modal> </Modal>
</div> </div>
<div onClick={() => setVoidNotification(false)}> <div onClick={closeNotification}>
<Modal trigger={voidNotification() === true} background="#123220ff" color="#cdfbe1f0" opacity={0.8}> <Modal trigger={voidNotification() === true} background="#123220ff" color="#cdfbe1f0" opacity={0.8}>
<Padding top={1} bottom={1} left={2} right={2}> <Padding top={1} bottom={1} left={2} right={2}>
<Column> <Column>