From 5b66bdeb077b96247ba4e87e03b424745c4bac28 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Thu, 3 Sep 2015 15:44:03 -0700 Subject: [PATCH] UI-1210: Display the Main Faxbox number on the dashboard --- i18n/en-US.json | 5 ++++- i18n/fr-FR.json | 3 ++- submodules/myOffice/myOffice.js | 5 ++++- views/myOffice-layout.html | 21 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/i18n/en-US.json b/i18n/en-US.json index 725eab96..9620ca0f 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -966,7 +966,10 @@ "3": "Once you have created enough users, create user groups. This is extremely useful if you have users that work in the same department, such as a sales team.", "4": "Create a main number for your business. Manage call handling with Virtual Receptionist, and route calls depending on Office Hours and Holidays" } - } + }, + "__comment": "UI-1210: Display the Main Faxbox number on the dashboard", + "__version": "3.22", + "faxingNumberLabel": "Faxbox Number" }, "__comment": "UI-299, v3.19_s2: Added the Feature Codes tab to SmartPBX.", diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json index b992bb50..9674e7be 100644 --- a/i18n/fr-FR.json +++ b/i18n/fr-FR.json @@ -895,7 +895,8 @@ "3": "Une fois les utilisateurs créés, dirigez-vous vers la section \"Groupes\". Ceci est très pratique pour les utilisateurs travaillant dans une même section (Marketing, Ventes...) afin de définir un répondeur global etc...", "4": "Créer votre numéro d'entreprise dans cette section. Vous pourrez gérer les appels entrants et les router differemment en fonction de vos réglages d'horaires ou de vacances..." } - } + }, + "faxingNumberLabel": "Numéro de Fax" }, "__comment": "UI-299, v3.19_s2: Added the Feature Codes tab to SmartPBX.", diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 8b6539c4..6fe31679 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -41,6 +41,7 @@ define(function(require){ totalChannels: myOfficeData.totalChannels, mainNumbers: myOfficeData.mainNumbers || [], confNumbers: myOfficeData.confNumbers || [], + faxingNumbers: myOfficeData.faxingNumbers || [], faxNumbers: myOfficeData.faxNumbers || [], topMessage: myOfficeData.topMessage, devicesList: _.toArray(myOfficeData.devicesData).sort(function(a, b) { return b.count - a.count ; }), @@ -457,12 +458,14 @@ define(function(require){ numberArrayName = 'mainNumbers'; } else if(val.type === "conference" && val.name === "MainConference") { numberArrayName = 'confNumbers'; + } else if (val.type === "faxing" && val.name === "MainFaxing") { + numberArrayName = "faxingNumbers"; } if(numberArrayName.length > 0) { if(!(numberArrayName in data)) { data[numberArrayName] = []; } _.each(val.numbers, function(num) { - if(num !== '0' && num !== 'undefined' && num !== 'undefinedconf') { + if(num !== '0' && num !== 'undefined' && num !== 'undefinedconf' && num !== 'undefinedfaxing') { var number = { number: num, features: $.extend(true, {}, data.numberFeatures) diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html index 4ddcce05..f4738628 100644 --- a/views/myOffice-layout.html +++ b/views/myOffice-layout.html @@ -123,6 +123,27 @@ +