diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index d2559ba..584a4cb 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -212,8 +212,6 @@ export default () => {
}
const printHandler = async (division: string, application: string) => {
- let signed: boolean = false
- let forprinting: boolean = false
let updateOrderofpayment: boolean = false
setConnected(await checkConnection())
@@ -222,22 +220,28 @@ export default () => {
return
}
- // signed = await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT PRINTED', '171', 'ELECOPPRINTED', 1)
- // if (!signed) return
-
- // forprinting = await setNewStatus(division, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE', 0)
- // if (!forprinting) return
-
- // updateOrderofpayment = await updateOp(division)
-
- // if (updateOrderofpayment) {
- // postTransaction(application)
- setPrintedApplication(application)
- setPrinted(true)
if (division === 'electrical') {
- createPdf()
- } else createPdfOccupancy()
- // }
+ await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT PRINTED', '171', 'ELECOPPRINTED', 1)
+ await setNewStatus(division, 'ELECTRICAL ORDERPAYMENT RELEASED', '97', 'ELECRELEASED', 1)
+ await setNewStatus(division, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION', '98', 'ELECORVALIDATE', 0)
+ await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING')
+ } else if (division === 'occupancy') {
+ await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT PRINTED', '173', 'OCCOPPRINTED', 1)
+ await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT RELEASED', '174', 'OCCOPRELEASED', 1)
+ await setNewStatus(division, 'ORDER OF PAYMENT RELEASE FOR BUREAU OF FIRE', '24', 'OCOOPRELEASE', 0)
+ await updateDocflow(division, application, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT')
+ }
+
+ updateOrderofpayment = await updateOp(division)
+
+ if (updateOrderofpayment) {
+ postTransaction(application)
+ setPrintedApplication(application)
+ setPrinted(true)
+ if (division === 'electrical') {
+ createPdf()
+ } else createPdfOccupancy()
+ }
}
const updateOp = async (division: string) => {
@@ -254,6 +258,10 @@ export default () => {
return post
}
+ const updateDocflow = async (division: string, application: string, status: string) => {
+ await postApi(`update-docflow-${division}`, { data: status, data2: application })
+ }
+
const getSignatureImage = async (id: number) => {
try {
const response = await getApi('get-signatureimage', id)
@@ -490,7 +498,7 @@ export default () => {
Total Fee:
- {PESO} {totalOp().toFixed(2)}
+ {PESO} {totalOp().toLocaleString('en-US', { minimumFractionDigits: 2 })}
@@ -578,7 +586,7 @@ export default () => {
Total Fee:
- {PESO} {totalOp().toFixed(2)}
+ {PESO} {totalOp().toLocaleString('en-US', { minimumFractionDigits: 2 })}