From 7bb2b489d067cf45d178e20216cf7d613d833268 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Thu, 8 Mar 2018 14:44:53 +0530
Subject: [PATCH] Fixes #621: Revised JS to be compatible for V7 layout api.
---
packages/vtiger/mandatory/PBXManager.zip | Bin 82557 -> 82475 bytes
.../PBXManager/resources/PBXManagerJS.js | 62 ++++++++----------
2 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index ca579a60f91349d27743b217af032d4021ae3f8f..af08bd71464808c42d33956cf88c425d018aa666 100644
GIT binary patch
delta 4122
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
G9`-+!pK&z+
delta 4153
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
ROweZyzy!g?cJOq7{TsHcT`~Xw
diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/resources/PBXManagerJS.js b/pkg/vtiger/modules/PBXManager/modules/PBXManager/resources/PBXManagerJS.js
index d7de2d9a0..c59c87298 100644
--- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/resources/PBXManagerJS.js
+++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/resources/PBXManagerJS.js
@@ -26,10 +26,10 @@ var Vtiger_PBXManager_Js = {
*/
requestPBXgetCalls : function() {
var url = 'index.php?module=PBXManager&action=IncomingCallPoll&mode=searchIncomingCalls';
- app.request.get(url).then(function(e, data){
- if(data && data.success && data.result) {
- for(i=0; i< data.result.length; i++) {
- var record = data.result[i];
+ app.request.get({url: url}).then(function(e, result){
+ if(result) {
+ for(i=0; i< result.length; i++) {
+ var record = result[i];
if(jQuery('#pbxcall_'+record.pbxmanagerid+'').size()== 0 )
Vtiger_PBXManager_Js.showPBXIncomingCallPopup(record);
else
@@ -46,22 +46,19 @@ var Vtiger_PBXManager_Js = {
showPBXIncomingCallPopup : function(record) {
var params = {
title: app.vtranslate('JS_PBX_INCOMING_CALL'),
- text: '<div class="row-fluid pbxcall" id="pbxcall_'+record.pbxmanagerid+'" callid='+record.pbxmanagerid+' style="color:black"><span class="span12" id="caller" value="'+record.customernumber+'">'+app.vtranslate('JS_PBX_CALL_FROM')+' : '+record.customernumber+'</span><span class="hide span12" id="contactsave_'+record.pbxmanagerid+'">\n\
+ message: '<div class="row-fluid pbxcall" id="pbxcall_'+record.pbxmanagerid+'" callid='+record.pbxmanagerid+' style="color:black"><span class="span12" id="caller" value="'+record.customernumber+'">'+app.vtranslate('JS_PBX_CALL_FROM')+' : '+record.customernumber+'</span><span class="hide span12" id="contactsave_'+record.pbxmanagerid+'">\n\
<span><input class="span3" id="email_'+record.pbxmanagerid+'" type="text" placeholder="Enter Email-id"></input> <select class="input-small" id="module_'+record.pbxmanagerid+'" placeholder="Select"><option>Select</option></select><h5 class="alert-danger hide span3" id="alert_msg">'+app.vtranslate('JS_PBX_FILL_ALL_FIELDS')+'</h5>\n\
<button class="btn btn-success pull-right" id="pbxcontactsave_'+record.pbxmanagerid+'" recordid="'+record.pbxmanagerid+'" type="submit">Save</button>\n\
</span></span><br/><span class="span12" style="display:none" id="answeredby"><i class="icon-headphones"></i> <span id="answeredbyname"></span></span></div>',
- width: '28%',
- min_height: '75px',
- addclass:'vtCall',
- icon: 'vtCall-icon',
- hide:false,
- closer:true,
- type:'info',
- after_open:function(p) {
- jQuery(p).data('info', record);
+ };
+ var settings = {
+ delay: 0,
+ placement: {
+ from: 'top',
+ align: 'right'
}
};
- Vtiger_Helper_Js.showPnotify(params);
+ jQuery.notify(params, settings);
//To remove the popup for all users except answeredby (existing record)
if(record.user) {
@@ -103,8 +100,8 @@ var Vtiger_PBXManager_Js = {
var number = jQuery('#caller','#pbxcall_'+pbxmanagerid+'').attr("value");
var url = 'index.php?module=PBXManager&action=IncomingCallPoll&mode=createRecord&number='+encodeURIComponent(number)+'&email='+encodeURIComponent(email)+'&callid='+record.sourceuuid+'&modulename='+moduleName;
- app.request.get(url).then(function(e, data){
- if(data && data.success && data.result) {
+ app.request.get({url: url}).then(function(e, result){
+ if(result) {
jQuery('#contactsave_'+pbxmanagerid+'').hide();
}
});
@@ -113,11 +110,10 @@ var Vtiger_PBXManager_Js = {
checkIfRelatedModuleRecordExist: function(record) {
switch(record.callername){
case null: var url = 'index.php?module=PBXManager&action=IncomingCallPoll&mode=checkModuleViewPermission&view=EditView';
- app.request.get(url).then(function(e, data){
+ app.request.get({url: url}).then(function(e, result){
if (e) return;
- var responsedata = (typeof data == 'object') ? data : JSON.parse(data);
var showSaveOption = false;
- var moduleList = responsedata.result.modules;
+ var moduleList = result.modules;
var contents = jQuery('#module_'+record.pbxmanagerid+'');
var newEle;
for(var module in moduleList){
@@ -129,7 +125,7 @@ var Vtiger_PBXManager_Js = {
}
}
}
- if(responsedata.success && showSaveOption)
+ if(showSaveOption)
jQuery('#contactsave_'+record.pbxmanagerid+'').show();
});
break;
@@ -167,9 +163,9 @@ var Vtiger_PBXManager_Js = {
for(var i=0; i<pbxcall.length;i++){
callid = pbxcall[i].getAttribute('callid');
var url = 'index.php?module=PBXManager&action=IncomingCallPoll&mode=getCallStatus&callid='+encodeURIComponent(callid)+'';
- app.request.get(url).then(function(e, data){
- if(data && data.result){
- if(data.result!='in-progress' && data.result!='ringing'){
+ app.request.get({url: url}).then(function(e, result){
+ if(result){
+ if(result!='in-progress' && result!='ringing'){
Vtiger_PBXManager_Js.removeCallPopup(callid);
}
}
@@ -181,7 +177,7 @@ var Vtiger_PBXManager_Js = {
* Function to remove call popup
*/
removeCallPopup: function(callid) {
- jQuery('#pbxcall_'+callid+'').parent().parent().parent().remove();
+ jQuery('#pbxcall_'+callid+'').closest('.vt-notification').remove();
},
/**
@@ -204,15 +200,15 @@ var Vtiger_PBXManager_Js = {
'module' : 'PBXManager',
'action' : 'OutgoingCall'
}
- app.request.get(params).then(function(e, data){
- if(data && data.result){
+ app.request.post({data: params}).then(function(e, result){
+ if(result){
params = {
- 'text' : app.vtranslate('JS_PBX_OUTGOING_SUCCESS'),
+ 'title' : app.vtranslate('JS_PBX_OUTGOING_SUCCESS'),
'type' : 'info'
}
}else{
params = {
- 'text' : app.vtranslate('JS_PBX_OUTGOING_FAILURE'),
+ 'title' : app.vtranslate('JS_PBX_OUTGOING_FAILURE'),
'type' : 'error'
}
}
@@ -227,10 +223,10 @@ var Vtiger_PBXManager_Js = {
var thisInstance = this;
//for polling
var url = 'index.php?module=PBXManager&action=IncomingCallPoll&mode=checkPermissionForPolling';
- app.request.get(url).then(function(e, data){
- if(data && data.result) {
+ app.request.get({url: url}).then(function(e, result){
+ if(result) {
Vtiger_PBXManager_Js.registerPBXCall();
- setInterval("Vtiger_PBXManager_Js.registerPBXCall()", 3000);
+ //setInterval("Vtiger_PBXManager_Js.registerPBXCall()", 3000);
}
});
}
@@ -238,6 +234,6 @@ var Vtiger_PBXManager_Js = {
}
//On Page Load
-jQuery(document).ready(function() {
+jQuery(window).load(function() {
Vtiger_PBXManager_Js.registerEvents();
});
--
GitLab