PMCORE-3017-E

resources/assets/js/api/Api.js

@@ -30,11 +30,7 @@ const services = {
     CLAIM_CASE: "/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",
-<<<<<<< HEAD
-    ADD_NOTE: "/case/{app_uid}/note",
-=======
     POST_NOTE: "/case/{app_uid}/note",
->>>>>>> 032cd35bb... PMCORE-3017
     LAST_OPEN_INDEX: "/light/lastopenindex/case/{app_uid}",
     REGISTER_WITH_GOOGLE_FAKE_URL: "fakeurl",
     SIGN_IN_TO_PM_WITH_GOOGLE: "/authentication/gmail",
@@ -195,12 +191,8 @@ export default {
                 "Authorization": `Bearer ` + credentials.accessToken
             }, headers)
         });
-<<<<<<< HEAD
-    },   
-=======
     },
 
->>>>>>> 032cd35bb... PMCORE-3017
     delete(options) {
         let service = options.service || "",
             id = options.id || {},

resources/assets/js/api/CaseNotes.js

@@ -5,8 +5,8 @@ export let caseNotes = {
     post(data) {
         var params = new FormData();
         params.append('appUid', data.APP_UID);
-        params.append('noteText', data.COMMENT);
-        params.append('swSendMail', data.SEND_MAIL ? 1 : 0);
+        params.append('note_content', data.COMMENT);
+        params.append('send_mail', data.SEND_MAIL ? 1 : 0);
 
         _.each(data.FILES, (f) => {
             params.append("filesToUpload[]", f);
@@ -14,11 +14,7 @@ export let caseNotes = {
 
         return Api.postFiles({
             service: "POST_NOTE",
-            data: {
-                note_content: data.COMMENT,
-                send_mail: data.SEND_MAIL
-            },
-            params,
+            data: params,
             headers:{
                 'Content-Type': 'multipart/form-data'
             },

resources/assets/js/api/Cases.js

@@ -131,23 +131,12 @@ export let cases = {
             `cases/cases_Open?APP_UID=${data.APP_UID}&DEL_INDEX=${data.DEL_INDEX}&action=${data.ACTION}`);
     },
     cancel(data) {
-<<<<<<< HEAD
-        var params = new URLSearchParams();
-        params.append('action', 'cancelCase');
-        params.append('NOTE_REASON', data.COMMENT);
-        params.append('NOTIFY_CANCEL', data.SEND);
-
-        return Api.put({
-            service: "REQUEST_CANCEL_CASE",
-            params: {},
-=======
         return Api.update({
             service: "CANCEL_CASE",
             data: {
                 reason: data.COMMENT,
                 sendMail: data.SEND
             },
->>>>>>> 032cd35bb... PMCORE-3017
             keys: {
                 app_uid: data.APP_UID
             }