Revert "OOB: Remove device type selection for call forward (#429)" (#440

) This reverts commit b7f63c2.
2600hz · Jul 21, 2022 · 652db0a · 652db0a
1 parent fc88d48
commit 652db0a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 1 deletion.
diff --git a/i18n/de-DE.json b/i18n/de-DE.json
@@ -615,6 +615,9 @@
 			"headline": "Einstellungen zur Weiterleitung von Benutzeranrufen",
 			"keepCallerId": "Ursprüngliche Anrufer-ID speichern",
 			"label": "Alle Anrufe weiterleiten an" ,
+			"mobile": "Ein Mobiltelefon",
+			"deskphone": "Ein Festnetztelefon",
+			"number": "Diese Nummer",
 			"placeholder": "+49 123 4567890",
 			"requireKeyPress": "Sprachnachricht für weitergeleitete Rufnummern hinterlassen",
 			"title": "Anrufweiterleitung",

diff --git a/i18n/en-US.json b/i18n/en-US.json
@@ -620,6 +620,9 @@
 			"headline": "User Call Forwarding Settings",
 			"keepCallerId": "Keep Original Caller-ID",
 			"label": "Forward all calls to" ,
+			"mobile": "A Mobile Phone",
+			"deskphone": "A Desk Phone",
+			"number": "This number",
 			"placeholder": "+14157283992",
 			"requireKeyPress": "Leave voicemails on forwarded numbers",
 			"title": "Call Forwarding",

diff --git a/i18n/es-ES.json b/i18n/es-ES.json
@@ -505,6 +505,9 @@
 			"headline": "Configuración de Desvío de llamadas del usuario",
 			"keepCallerId": "Mantener su identificador de llamadas",
 			"label": "Desenvíar todas las llamadas a",
+			"mobile": "Un  teléfono móvil ",
+			"deskphone": "Un teléfono de escritorio ",
+			"number": "Este Numero",
 			"placeholder": "+14157283992",
 			"requireKeyPress": "Deja mensajes de voz en números desvíados ",
 			"title": "Desvío de llamadas",

diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
@@ -479,6 +479,9 @@
 			"headline": "Réglages du transfert d'appel",
 			"keepCallerId": "Garder le Caller-ID",
 			"label": "Transférer tous les appels vers",
+			"mobile": "Un Téléphone Portable",
+			"deskphone": "Un Téléphone de Bureau",
+			"number": "Ce numéro",
 			"placeholder": "+14157283992",
 			"requireKeyPress": "Laisser message sur le répondeur du numéro transferé",
 			"title": "Transfert d'appels",

diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json
@@ -476,6 +476,9 @@
 			"headline": "Настройка переадресации вызовов",
 			"keepCallerId": "Сохранить ваш АОН",
 			"label": "Перевести все вызовы" ,
+			"mobile": "Мобильный телефон",
+			"deskphone": "Настольный телефон",
+			"number": "Этот номер",
 			"placeholder": "+74157283992",
 			"requireKeyPress": "Оставить голосовые сообщения на переадресованных номерах",
 			"title": "Переадресация вызовов",

diff --git a/submodules/users/users.js b/submodules/users/users.js
@@ -2639,6 +2639,7 @@ define(function(require) {
 				if (monster.ui.valid(featureForm) && isValidPhoneNumber) {
 					formData.require_keypress = !formData.require_keypress;
 					formData.number = phoneNumber;
+					delete formData.phoneType;
 
 					var selectedType = featureTemplate.find('.feature-select-mode button.selected').data('value');
 					if (selectedType === 'off') {
@@ -2668,6 +2669,12 @@ define(function(require) {
 				}
 			});
 
+			if (currentUser.hasOwnProperty('call_forward') && currentUser.call_forward.number && /^(\+1)/.test(currentUser.call_forward.number)) {
+				featureTemplate.find('#phoneType').val('mobile');
+			} else {
+				featureTemplate.find('#phoneType').val('deskphone');
+			}
+
 			var popup = monster.ui.dialog(featureTemplate, {
 				title: currentUser.extra.mapFeatures.call_forward.title,
 				position: ['center', 20]

diff --git a/submodules/users/views/feature-call_forward.html b/submodules/users/views/feature-call_forward.html
@@ -31,7 +31,17 @@
 		</div>
 		<form id="call_forward_form" class="form form-horizontal">
 			<div class="control-group">
-				<label for="number" class="control-label">{{ i18n.users.call_forward.label }}</label>
+				<label class="control-label" for="phoneType">{{ i18n.users.call_forward.label }}</label>
+				<div class="controls">
+					<select class="span2" id="phoneType" name="phoneType">
+						<option value="mobile" selected>{{ i18n.users.call_forward.mobile }}</option>
+						<option value="deskphone">{{ i18n.users.call_forward.deskphone }}</option>
+					</select>
+				</div>
+			</div>
+
+			<div class="control-group">
+				<label for="number" class="control-label">{{ i18n.users.call_forward.number }}</label>
 				<div class="controls">
 					<input required id="number" type="text" name="number" class="span2" placeholder="{{ i18n.users.call_forward.placeholder }}" value="{{call_forward.number}}">
 				</div>