Skip to content

Commit

Permalink
UI-1210: Display the Main Faxbox number on the dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
joristirado committed Sep 3, 2015
1 parent ee23202 commit 5b66bde
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 3 deletions.
5 changes: 4 additions & 1 deletion i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
3 changes: 2 additions & 1 deletion i18n/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
5 changes: 4 additions & 1 deletion submodules/myOffice/myOffice.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; }),
Expand Down Expand Up @@ -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)
Expand Down
21 changes: 21 additions & 0 deletions views/myOffice-layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,27 @@
</ul>
</div>
</div>
<div class="dashboard-box-row faxing-number-row link-box" data-category="strategy" data-subcategory="strategy-faxingnum">
<div class="row-title">
<div>{{i18n.myOffice.faxingNumberLabel}}</div>
</div>
<div class="row-content">
<ul class="number-list">
{{#each faxingNumbers}}
<li>
<div class="features pull-right">
{{#each this.features}}
<i class="{{icon}} {{active}} help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{ help }}"></i>
{{/each}}
</div>
<div class="number-div">{{formatPhoneNumber number}}</div>
</li>
{{else}}
<li>-</li>
{{/each}}
</ul>
</div>
</div>
<div class="dashboard-box-row fax-number-row link-box" data-category="strategy" data-subcategory="strategy-faxnum">
<div class="row-title">
<div>{{i18n.myOffice.faxNumberLabel}}</div>
Expand Down

0 comments on commit 5b66bde

Please sign in to comment.