diff --git a/i18n/en-US.json b/i18n/en-US.json index d414933..ab15550 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -856,7 +856,7 @@ "featuresToRemove": "Check the feature(s) to remove :", "features": { "cnam": "Caller-ID", - "dash_e911": "e911" + "e911": "e911" } }, diff --git a/i18n/es-ES.json b/i18n/es-ES.json index 10e2c72..3e9874a 100644 --- a/i18n/es-ES.json +++ b/i18n/es-ES.json @@ -803,7 +803,7 @@ "featuresToRemove": "Verificar la característica(s) para eliminar:", "features": { "cnam": "Caller-ID", - "dash_e911": "e911" + "e911": "e911" } }, diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json index dc65014..7929df1 100644 --- a/i18n/fr-FR.json +++ b/i18n/fr-FR.json @@ -765,7 +765,7 @@ "featuresToRemove": "Sélectionner les fonctionnalité(s) à supprimer :", "features": { "cnam": "Caller-ID", - "dash_e911": "Adresse d'urgence (e911)" + "e911": "Adresse d'urgence (e911)" } }, "__comment": "UI-1604: Walkthrough dashboard", diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json index deab6b5..6a241c8 100644 --- a/i18n/ru-RU.json +++ b/i18n/ru-RU.json @@ -793,7 +793,7 @@ "featuresToRemove": "Функции для удаления :", "features": { "cnam": "Caller-ID", - "dash_e911": "Экстренные службы" + "e911": "Экстренные службы" } }, "__comment": "UI-1604: Walkthrough dashboard", diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index dd2e35a..f397e88 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -992,7 +992,7 @@ define(function(require){ monster.pub('common.numbers.getListFeatures', function(viewFeatures) { var e911Numbers = {}; _.each(data.data.numbers, function(val, key) { - if(val.features.indexOf('dash_e911') >= 0) { + if(val.features.indexOf('e911') >= 0) { e911Numbers[key] = self.devicesFormatNumber(val, viewFeatures); } }); @@ -1191,13 +1191,13 @@ define(function(require){ phoneNumber: encodeURIComponent(number) }, success: function(_data, status) { - var street_address = _data.data.dash_e911.street_address, - locality = _data.data.dash_e911.locality, - postal_code = _data.data.dash_e911.postal_code, - region = _data.data.dash_e911.region; + var street_address = _data.data.e911.street_address, + locality = _data.data.e911.locality, + postal_code = _data.data.e911.postal_code, + region = _data.data.e911.region; - if ( typeof _data.data.dash_e911.extended_address !== 'undefined' ) { - callback(street_address + ', ' + _data.data.dash_e911.extended_address + '
' + locality + ', ' + region + ' ' + postal_code); + if ( typeof _data.data.e911.extended_address !== 'undefined' ) { + callback(street_address + ', ' + _data.data.e911.extended_address + '
' + locality + ', ' + region + ' ' + postal_code); } else { callback(street_address + ', ' + '
' + locality + ', ' + region + ' ' + postal_code); } diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index 90c17eb..717202c 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -1073,11 +1073,11 @@ define(function(require){ phoneNumber: phoneNumber, callbacks: { success: function(data) { - if(!($.isEmptyObject(data.data.dash_e911))) { - e911Cell.find('.features i.feature-dash_e911').addClass('active'); + if(!($.isEmptyObject(data.data.e911))) { + e911Cell.find('.features i.feature-e911').addClass('active'); } else { - e911Cell.find('.features i.feature-dash_e911').removeClass('active'); + e911Cell.find('.features i.feature-e911').removeClass('active'); } } } diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 49a6c1f..eeb3728 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -556,7 +556,7 @@ define(function(require){ if( data.mainNumbers && data.mainNumbers.length > 0 ) { var hasValidCallerId = monster.util.isNumberFeatureEnabled('cnam') === false || data.account.hasOwnProperty('caller_id') && data.account.caller_id.hasOwnProperty('emergency') && data.account.caller_id.emergency.hasOwnProperty('number') && data.numbers.hasOwnProperty(data.account.caller_id.emergency.number), - hasValidE911 = monster.util.isNumberFeatureEnabled('e911') === false || data.account.hasOwnProperty('caller_id') && data.account.caller_id.hasOwnProperty('emergency') && data.account.caller_id.emergency.hasOwnProperty('number') && data.numbers.hasOwnProperty(data.account.caller_id.emergency.number) && data.numbers[data.account.caller_id.emergency.number].features.indexOf('dash_e911') >= 0; + hasValidE911 = monster.util.isNumberFeatureEnabled('e911') === false || data.account.hasOwnProperty('caller_id') && data.account.caller_id.hasOwnProperty('emergency') && data.account.caller_id.emergency.hasOwnProperty('number') && data.numbers.hasOwnProperty(data.account.caller_id.emergency.number) && data.numbers[data.account.caller_id.emergency.number].features.indexOf('e911') >= 0; if (!hasValidCallerId && !hasValidE911) { data.topMessage = { @@ -859,12 +859,12 @@ define(function(require){ if (monster.util.isNumberFeatureEnabled('e911')) { allowedFeatures.push('e911'); - if("dash_e911" in numberData) { - emergencyZipcodeInput.val(numberData.dash_e911.postal_code); - emergencyAddress1Input.val(numberData.dash_e911.street_address); - emergencyAddress2Input.val(numberData.dash_e911.extended_address); - emergencyCityInput.val(numberData.dash_e911.locality); - emergencyStateInput.val(numberData.dash_e911.region); + if("e911" in numberData) { + emergencyZipcodeInput.val(numberData.e911.postal_code); + emergencyAddress1Input.val(numberData.e911.street_address); + emergencyAddress2Input.val(numberData.e911.extended_address); + emergencyCityInput.val(numberData.e911.locality); + emergencyStateInput.val(numberData.e911.region); } else { emergencyZipcodeInput.val(""); emergencyAddress1Input.val(""); @@ -955,7 +955,7 @@ define(function(require){ if(e911Data) { $.extend(true, numberData, { - dash_e911: e911Data + e911: e911Data }); } diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index cb523af..0b50b1d 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -826,7 +826,7 @@ define(function(require){ }; _.each(dataNumber, function(val, idx) { - if ( idx === 'cnam' || idx === 'dash_e911' ) { + if ( idx === 'cnam' || idx === 'e911' ) { featureList.push({ name: idx, friendlyName: self.i18n.active().strategy.popupRemoveFeatures.features[idx] @@ -907,11 +907,11 @@ define(function(require){ phoneNumber: phoneNumber, callbacks: { success: function(data) { - if(!($.isEmptyObject(data.data.dash_e911))) { - e911Cell.find('.features i.feature-dash_e911').addClass('active'); + if(!($.isEmptyObject(data.data.e911))) { + e911Cell.find('.features i.feature-e911').addClass('active'); } else { - e911Cell.find('.features i.feature-dash_e911').removeClass('active'); + e911Cell.find('.features i.feature-e911').removeClass('active'); } } } diff --git a/submodules/users/users.js b/submodules/users/users.js index 273f674..d993d4b 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -1242,11 +1242,11 @@ define(function(require){ phoneNumber: phoneNumber, callbacks: { success: function(data) { - if(!($.isEmptyObject(data.data.dash_e911))) { - e911Cell.find('.features i.feature-dash_e911').addClass('active'); + if(!($.isEmptyObject(data.data.e911))) { + e911Cell.find('.features i.feature-e911').addClass('active'); } else { - e911Cell.find('.features i.feature-dash_e911').removeClass('active'); + e911Cell.find('.features i.feature-e911').removeClass('active'); } } } diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html index f0b076b..79d0847 100644 --- a/views/strategy-numbers.html +++ b/views/strategy-numbers.html @@ -1,7 +1,7 @@ {{#each numbers}}
- {{formatPhoneNumber this.number}}