From b690d065ad4c31b57c6be9e72f4e7607028a6c1c Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Thu, 13 May 2021 14:45:40 +0000
Subject: [PATCH] PMCORE-3018

---
 resources/assets/js/api/Api.js                | 11 +++++-----
 resources/assets/js/api/CaseNotes.js          | 15 ++++++++-----
 resources/assets/js/api/Cases.js              | 22 ++++++++++++++-----
 resources/assets/js/home/CaseDetail.vue       |  2 +-
 .../assets/js/home/modal/ModalCancelCase.vue  |  6 ++---
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/resources/assets/js/api/Api.js b/resources/assets/js/api/Api.js
index e9fc8d637..d93b22025 100644
--- a/resources/assets/js/api/Api.js
+++ b/resources/assets/js/api/Api.js
@@ -22,15 +22,15 @@ const services = {
     UPLOAD_FILE: "/light/case/{app_uid}/upload/{app_doc_uid}",
     GET_CASE_INFO: "/light/{type}/case/{app_uid}",
     REQUEST_PAUSE_CASE: "/light/cases/{app_uid}/pause",
-    REQUEST_UNPAUSE_CASE: "/light/cases/{app_uid}/unpause",
-    REQUEST_CANCEL_CASE: "/light/cases/{app_uid}/cancel",
+    REQUEST_UNPAUSE_CASE: "/cases/{app_uid}/unpause",
+    REQUEST_CANCEL_CASE: "/cases/{app_uid}/cancel",
     REQUEST_SYS_CONFIG: "/light/config",
     REQUEST_SYS_CONFIG_V2: "/light/config?fileLimit=true",
     ROUTE_CASE: "/light/cases/{app_uid}/route-case",
     CLAIM_CASE: "/light/case/{app_uid}/claim",
     GET_FILE_VERSIONS: "/cases/{app_uid}/input-document/{app_doc_uid}/versions",
     REGISTER: "https:trial32.processmaker.com/syscolosa/en/neoclassic_pro/9893000714bdb2d52ecc317052629917/Trial_RequestPostMobile.php",
-    ADD_NOTE: "/light/case/{app_uid}/note",
+    ADD_NOTE: "/case/{app_uid}/note",
     LAST_OPEN_INDEX: "/light/lastopenindex/case/{app_uid}",
     REGISTER_WITH_GOOGLE_FAKE_URL: "fakeurl",
     SIGN_IN_TO_PM_WITH_GOOGLE: "/authentication/gmail",
@@ -166,8 +166,7 @@ export default {
                 "Authorization": `Bearer ` + credentials.accessToken
             }
         });
-    },
-    
+    },   
     delete(options) {
         let service = options.service || "",
             id = options.id || {},
@@ -202,7 +201,7 @@ export default {
 
         return axios({
             method: "put",
-            url: url + id,
+            url: url,
             params,
             data,
             headers: {
diff --git a/resources/assets/js/api/CaseNotes.js b/resources/assets/js/api/CaseNotes.js
index b99dbff1b..d9975f4f4 100644
--- a/resources/assets/js/api/CaseNotes.js
+++ b/resources/assets/js/api/CaseNotes.js
@@ -1,4 +1,5 @@
 import axios from "axios";
+import Api from "./Api.js";
 
 export let caseNotes = {
     post(data) {
@@ -10,12 +11,16 @@ export let caseNotes = {
         _.each(data.FILES, (f) => {
             params.append("filesToUpload[]", f);
         })
-        return axios.post(window.config.SYS_SERVER_AJAX +
-            window.config.SYS_URI +
-            `appProxy/postNote`, params, {
-            headers: {
-                "Content-Type": "multipart/form-data",
+
+        return Api.post({
+            service: "ADD_NOTE",
+            data:{
+                note_content: data.COMMENT,
+                send_mail: data.SEND_MAIL ? 1 : 0
             },
+            keys: {
+                app_uid: data.APP_UID
+            }
         });
     },
 };
diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js
index df0c3bf77..1d64f92e3 100644
--- a/resources/assets/js/api/Cases.js
+++ b/resources/assets/js/api/Cases.js
@@ -135,9 +135,14 @@ export let cases = {
         params.append('action', 'cancelCase');
         params.append('NOTE_REASON', data.COMMENT);
         params.append('NOTIFY_CANCEL', data.SEND);
-        return axios.post(window.config.SYS_SERVER_AJAX +
-            window.config.SYS_URI +
-            `cases/ajaxListener`, params);
+
+        return Api.put({
+            service: "REQUEST_CANCEL_CASE",
+            params: {},
+            keys: {
+                app_uid: data.APP_UID
+            }
+        });
     },
     actions(data) {
         var params = new URLSearchParams();
@@ -152,9 +157,14 @@ export let cases = {
         params.append('action', 'unpauseCase');
         params.append('sApplicationUID', data.APP_UID);
         params.append('iIndex', data.DEL_INDEX);
-        return axios.post(window.config.SYS_SERVER_AJAX +
-            window.config.SYS_URI +
-            `cases/cases_Ajax`, params);
+
+        return Api.put({
+            service: "REQUEST_UNPAUSE_CASE",
+            params: {},
+            keys: {
+                app_uid: data.APP_UID
+            }
+        });
     },
     claim(data) {
         var params = new URLSearchParams();
diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue
index 9d3fda6d1..87165768b 100644
--- a/resources/assets/js/home/CaseDetail.vue
+++ b/resources/assets/js/home/CaseDetail.vue
@@ -58,7 +58,7 @@
           :dataCaseStatus="dataCaseStatusTab"
           :dataCase="dataCase"
         ></TabsCaseDetail>
-        <ModalCancelCase ref="modal-cancel-case"></ModalCancelCase>
+        <ModalCancelCase ref="modal-cancel-case" :dataCase="dataCase"></ModalCancelCase>
       </div>
       <div class="col-sm-3">
         <case-summary
diff --git a/resources/assets/js/home/modal/ModalCancelCase.vue b/resources/assets/js/home/modal/ModalCancelCase.vue
index 69426c569..32cdb9d95 100644
--- a/resources/assets/js/home/modal/ModalCancelCase.vue
+++ b/resources/assets/js/home/modal/ModalCancelCase.vue
@@ -51,7 +51,7 @@ export default {
   name: "ModalCancelCase",
   components: {},
   props: {
-    data: Object,
+    dataCase: Object,
   },
   mounted() {},
   data() {
@@ -75,10 +75,10 @@ export default {
     cancelCase() {
       let that = this;
       api.cases
-        .cancel({
+        .cancel(_.extend({}, this.dataCase, {
           COMMENT: this.$refs["comment"].value,
           SEND: this.$refs["send"].checked ? 1 : 0,
-        })
+        }))
         .then((response) => {
           if (response.data && response.data.status) {
             that.$refs["modal-cancel-case"].hide();