From 42e3453d75a98696b90ff46e499d4738477fb3d4 Mon Sep 17 00:00:00 2001 From: Pilar Candia Date: Thu, 23 May 2024 10:43:42 -0400 Subject: [PATCH] [5.3] MSTR-300: Add support to Intrado when adding a e911 to a number (#536) * MSTR-300: Add support to intrado when adding a e911 to a number * Fix issue where address is not set --- i18n/en-US.json | 9 ++++++++- submodules/myOffice/myOffice.js | 14 +++++++++++--- submodules/myOffice/views/callerIdPopup.html | 8 ++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/i18n/en-US.json b/i18n/en-US.json index 364bc97d..f540570b 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -1299,10 +1299,17 @@ "emergencyCity": "City", "emergencyState": "State", "emergencyEmail": "Email Address(es)", + "emergencyCountry": "Country", "emergencyEmailError": "Invalid space separated address(es)", "emergencyHelp1": "This information will appear as your Caller ID information when you make outbound emergency call to a government agency (e.g. 911 in the US).", "emergencyHelp2": "Note: You can set this feature on users' numbers too if they do not share the same location as above.", - "mandatoryE911Alert": "You must specify e911 information for your company caller ID number." + "mandatoryE911Alert": "You must specify e911 information for your company caller ID number.", + "countries": { + "us": { + "value": "US", + "option": "United States" + } + } }, "others": "Others", "missingMainNumberForCallerId": "You need to add a main number to your office before configuring the Caller-ID!", diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 11043b05..14797ba0 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -912,8 +912,10 @@ define(function(require) { if (hasE911 && isE911Enabled) { if (_.has(numberData, 'e911')) { + var street_address = _.get(numberData, 'e911.legacy_data.house_number', '') + ' ' + _.get(numberData, 'e911.street_address', ''); + emergencyZipcodeInput.val(numberData.e911.postal_code); - emergencyAddress1Input.val(numberData.e911.street_address); + emergencyAddress1Input.val(street_address); emergencyAddress2Input.val(numberData.e911.extended_address); emergencyCityInput.val(numberData.e911.locality); emergencyStateInput.val(numberData.e911.region); @@ -994,7 +996,8 @@ define(function(require) { setNumberData = function(e911Data) { var callerIdName = callerIdNameInput.val(), setCNAM = popupTemplate.find('.number-feature[data-feature="cnam"]').is(':visible'), - setE911 = popupTemplate.find('.number-feature[data-feature="e911"]').is(':visible'); + setE911 = popupTemplate.find('.number-feature[data-feature="e911"]').is(':visible'), + splitAddress = e911Data.street_address.split(/\s/g); account.caller_id = $.extend(true, {}, account.caller_id, { external: { @@ -1031,7 +1034,12 @@ define(function(require) { .split(' ') .reject(_.isEmpty) .uniq() - .value() + .value(), + caller_name: monster.apps.auth.currentAccount.name, + legacy_data: { + house_number: _.head(splitAddress) + }, + street_address: splitAddress.slice(1).join(' ') }) }); } else { diff --git a/submodules/myOffice/views/callerIdPopup.html b/submodules/myOffice/views/callerIdPopup.html index 46893595..67594541 100644 --- a/submodules/myOffice/views/callerIdPopup.html +++ b/submodules/myOffice/views/callerIdPopup.html @@ -58,6 +58,14 @@ + {{#monsterText}}