Skip to content

Commit

Permalink
UI-3145: Conditionally show the buy numbers action (#80)
Browse files Browse the repository at this point in the history
* Conditionally show the buy numbers action for groups

* Conditionally show the buy numbers action for users

* Conditionally show the buy numbers action for strategy
  • Loading branch information
joristirado authored Aug 15, 2018
1 parent 0b7ee38 commit a5a37a7
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 4 deletions.
6 changes: 5 additions & 1 deletion submodules/groups/groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,11 @@ define(function(require) {
self.groupsFormatNumbersData(data, function(data) {
var template = $(self.getTemplate({
name: 'numbers',
data: data,
data: _.merge({
hideBuyNumbers: monster.config.whitelabel.hasOwnProperty('hideBuyNumbers')
? monster.config.whitelabel.hideBuyNumbers
: false
}, data),
submodule: 'groups'
}));

Expand Down
2 changes: 2 additions & 0 deletions submodules/groups/views/numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
<i class="fa fa-plus monster-green fa-lg"></i>{{ i18n.groups.addFromSpare }}
</a>
{{#unless hideBuyNumbers}}
<ul class="nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
Expand All @@ -40,6 +41,7 @@
</ul>
</li>
</ul>
{{/unless}}

<div class="pull-right">
<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
Expand Down
9 changes: 9 additions & 0 deletions submodules/strategy/strategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ define(function(require) {
var callflow = strategyData.callflows.MainCallflow,
numbers = callflow.numbers,
templateData = {
hideBuyNumbers: monster.config.whitelabel.hasOwnProperty('hideBuyNumbers')
? monster.config.whitelabel.hideBuyNumbers
: false,
numbers: $.map(numbers, function(val, key) {
if (val !== '0' && val !== 'undefinedMainNumber') {
var ret = {
Expand Down Expand Up @@ -536,6 +539,9 @@ define(function(require) {
var callflow = strategyData.callflows.MainConference,
numbers = callflow.numbers,
templateData = {
hideBuyNumbers: monster.config.whitelabel.hasOwnProperty('hideBuyNumbers')
? monster.config.whitelabel.hideBuyNumbers
: false,
numbers: $.map(numbers, function(val, key) {
if (val !== 'undefinedconf') {
return {
Expand Down Expand Up @@ -565,6 +571,9 @@ define(function(require) {
var callflow = strategyData.callflows.MainFaxing,
numbers = callflow.numbers,
templateData = {
hideBuyNumbers: monster.config.whitelabel.hasOwnProperty('hideBuyNumbers')
? monster.config.whitelabel.hideBuyNumbers
: false,
numbers: $.map(numbers, function(val, key) {
if (val !== 'undefinedfaxing') {
return {
Expand Down
4 changes: 3 additions & 1 deletion submodules/strategy/views/strategy-confnum.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<div class="action-links nav-bar clearfix">
<a href="#" class="greeting-link monster-link pull-left"><i class="fa fa-volume-up fa-lg"></i>{{ i18n.strategy.customConferenceGreeting.link }}</a>
<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="fa fa-file-text-o monster-orange fa-lg"></i>{{ i18n.strategy.numberLinks.spare }}</a>
{{#unless @root.hideBuyNumbers}}
<ul class="nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
Expand All @@ -27,5 +28,6 @@
</ul>
</li>
</ul>
{{/unless}}
</div>
</div>
</div>
4 changes: 3 additions & 1 deletion submodules/strategy/views/strategy-faxingnum.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
{{/unless}}
{{#if actionLinksEnabled}}
<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="fa fa-file-text-o monster-orange fa-lg"></i>{{ i18n.strategy.numberLinks.spare }}</a>
{{#unless @root.hideBuyNumbers}}
<ul class="nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
Expand All @@ -33,6 +34,7 @@
</ul>
</li>
</ul>
{{/unless}}
{{/if}}
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions submodules/strategy/views/strategy-numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<a href="#" class="cancel-link pull-right monster-link blue">{{ i18n.close }}</a>
<div class="action-links nav-bar clearfix">
<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="fa fa-file-text-o monster-orange fa-lg"></i>{{ i18n.strategy.numberLinks.spare }}</a>
{{#unless @root.hideBuyNumbers}}
<ul class="nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
Expand All @@ -34,6 +35,7 @@
</ul>
</li>
</ul>
{{/unless}}
</div>
</div>
</div>
6 changes: 5 additions & 1 deletion submodules/users/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -3345,7 +3345,11 @@ define(function(require) {
self.usersFormatNumbersData(userId, results, function(results) {
template = $(self.getTemplate({
name: 'numbers',
data: results,
data: _.merge({
hideBuyNumbers: monster.config.whitelabel.hasOwnProperty('hideBuyNumbers')
? monster.config.whitelabel.hideBuyNumbers
: false
}, results),
submodule: 'users'
}));

Expand Down
2 changes: 2 additions & 0 deletions submodules/users/views/numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
<i class="fa fa-list monster-green"></i>{{ i18n.users.addFromSpare }}
</a>
{{#unless hideBuyNumbers}}
<ul class="buy-dropdown nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
Expand All @@ -44,6 +45,7 @@
</ul>
</li>
</ul>
{{/unless}}

<div class="pull-right">
<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
Expand Down

0 comments on commit a5a37a7

Please sign in to comment.