zet-lib 1.5.24 → 1.5.25

package/lib/zAppRouter.js

@@ -840,10 +840,10 @@ router.post("/zzapproval", async (req, res) => {
 
 router.get("/za/:token", csrfProtection, async (req, res) => {
   let token = req.params.token;
-  let data = {},
-      data2 = {};
+  let data = {};
+  let data2 = {};
   let template = "";
-  let result;
+  let result = {}
   let isClosed = false;
   let footers = "";
   let details = [];
@@ -868,11 +868,10 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
       ],
       where: { "zapprovals_details.token": token },
     });
-
-    if(!result.length){
-      return res.send("Not Found");
+    //console.log(results)
+    if(!result.id){
+      return res.send("Not Found!");
     }
-    result = result[0];
     let approvers = result.approvers;
     knowings = result.knowings ? result.knowings : [];
 
@@ -1058,6 +1057,8 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
     let status_stats = [];
     let approversSigned = [];
     //{"stats":"0/2","status":[{"user":"12","status":2},{"user":"35","status":2}]}
+    //3 approve
+    //4 reject
     let last_status;
     details.map((item) => {
       if (item.type == 1) {
@@ -1096,7 +1097,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
     });
     // 6 comment 4 reject
     //update ke table data yang dipakai
-    let status_approval_table = 2
+    let status_approval_table = 2;
     if(req.body.status == 4){
       status_approval_table = 22
     } else {
@@ -1120,7 +1121,16 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
 
     //send notification
     if (status == 3 || status == 4) {
-      let message = `Document ${titleEmail} has ${MYMODEL.widgets.status[status]};`;
+      await connection.update({
+        table : result.table,
+        data:{
+          approval_status: status == 3 ? 21 : 22
+        },
+        where : {
+          id: result.id_data
+        }
+      })
+      let message = `Document ${titleEmail} has been ${status == 3 ? "Approved" : "Rejected"};`;
       approvers.forEach(function (item) {
         io.to(users[item].token).emit("message", message);
       });
@@ -1218,7 +1228,6 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
               },
             });
 
-
             //send toastr using socket.io
             io.to(users[item].token).emit(
                 "message",
@@ -1260,6 +1269,7 @@ router.post('/get_approval_comments', async(req,res) => {
     //{"{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"yayayay\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"kurang\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"oke\"}","{\"status\": \"4\", \"user_id\": \"192\", \"comments\": \"reject\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"dsfsdf\"}"}
     let zuser = myCache.get('zuser') || {};
     let approval_history = result.approval_history || [];
+    //console.log(approval_history)
     approval_history.forEach((item) => {
       // Safe access dengan optional chaining dan fallback
       const user = zuser[item.user_id];