From d4299760e32db886f3e98178353155d3ad030ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Tue, 11 Dec 2018 15:23:28 -0600
Subject: [PATCH 01/35] UI-3273: Update main callflow on user save only if
 exists (#108)

---
 submodules/users/users.js | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 723b76c..d0f23be 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1003,29 +1003,40 @@ define(function(require) {
 								}
 							},
 							callflow: function(callback) {
-								if (isUserNameDifferent || shouldUpdateTimeout) {
-									self.usersGetMainCallflow(userToSave.id, function(mainCallflow) {
+								if (!isUserNameDifferent && !shouldUpdateTimeout) {
+									callback(null, null);
+									return;
+								}
+
+								monster.waterfall([
+									function(waterfallCallback) {
+										self.usersGetMainCallflow(userToSave.id, function(mainCallflow) {
+											waterfallCallback(null, mainCallflow);
+										});
+									},
+									function(mainCallflow, waterfallCallback) {
+										if (_.isNil(mainCallflow)) {
+											waterfallCallback(null, null);
+											return;
+										}
+
 										if (isUserNameDifferent) {
 											mainCallflow.name = newName + self.appFlags.users.smartPBXCallflowString;
 										}
 
-										if (shouldUpdateTimeout) {
-											if ('flow' in mainCallflow) {
-												var flow = mainCallflow.flow;
-												while (flow.module !== 'user' && '_' in flow.children) {
-													flow = flow.children._;
-												}
-												flow.data.timeout = parseInt(userToSave.extra.ringingTimeout);
+										if (shouldUpdateTimeout && 'flow' in mainCallflow) {
+											var flow = mainCallflow.flow;
+											while (flow.module !== 'user' && '_' in flow.children) {
+												flow = flow.children._;
 											}
+											flow.data.timeout = parseInt(userToSave.extra.ringingTimeout);
 										}
 
 										self.usersUpdateCallflow(mainCallflow, function(updatedCallflow) {
 											callback(null, updatedCallflow);
 										});
-									});
-								} else {
-									callback(null, null);
-								}
+									}
+								], callback);
 							}
 						}, function(error, results) {
 							monster.ui.toast({

From cb785bdc8380dd522b1ef528f82200f9b5a01fc0 Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Thu, 20 Dec 2018 14:39:25 -0600
Subject: [PATCH 02/35] UI-3269: Update "add user" form and add new section
 "add device" (#109)

* Remove this

* Update add user modal to show labels instead of icons

* Fill brand field on add device section

* add device form

* Save user device

* Binding form events from single function

* Add extra button Create User and Add Device

* Code style

* Create user and device form based on mockup

* Handling form validation

* Create User and Add another button

* Revert "Remove this"

This reverts commit 7102cf9b4a087321ac2d8ac7dc2b97a44311ed18.

* Styled notification email

* Use single chosen field to select device model

* improvements

* Improve form validation message

* Delete unused template

* Code style improvements

* Fix typo on lodash flatMap statement
Device family as argument

* code style improvements

* Create function to render add user modal

* Handle error on user creation to prevent form buttons state

* Render users list without auto scroll when save and new btn is clicked

* Fix device data validation
---
 i18n/en-US.json                      |  20 +-
 submodules/users/users.js            | 383 +++++++++++++++++++--------
 submodules/users/users.scss          |  91 +++++--
 submodules/users/views/creation.html | 175 +++++++-----
 4 files changed, 464 insertions(+), 205 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index d9d4ec9..0e6a2ff 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -483,6 +483,7 @@
 		},
 		"dialogCreationUser": {
 			"createUser": "Create User",
+			"createUserAndAddAnother": "Create User and Add Another",
 			"createVmbox": "Create a voicemail box for this user",
 			"errorOnCreation": "An error occured while trying to create this user:",
 			"extension": "Main Extension Number",
@@ -491,14 +492,27 @@
 			"lastName": "Last Name",
 			"loginEmail": "Email used for Login",
 			"notificationEmail": "Notification E-mail",
-			"password": "Password (Min. 6 characters)",
+			"password": "Password",
+			"passwordPlaceholder": "Password (Min. 6 characters)",
 			"sendToDifferentEmail": "Send emails to an alternate address",
-			"title": "Create User",
+			"title": "Add User and Device",
 			"vmboxAlreadyExist": "VMBox Number is already taken, please choose a different Voicemail Box Number.",
 			"vmboxNumber": "VM Box #",
 			"__comment": "UI-814: Adding the option to automatically send email on user creation",
 			"__version": "3.20_s3",
-			"sendWelcomeEmail": "Send credentials to this user"
+			"sendWelcomeEmail": "Send credentials to this user",
+			"addDevice": {
+				"deviceMake": {
+					"label": "Device Make",
+					"none": "None"
+				},
+				"deviceModel": {
+					"label": "Device Model"
+				},
+				"macAddress": "MAC Address",
+				"name": "Device Name",
+				"title": "Add Device"
+			}
 		},
 		"editionForm": {
 			"changePIN": "Change PIN",
diff --git a/submodules/users/users.js b/submodules/users/users.js
index d0f23be..389c39e 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -6,7 +6,14 @@ define(function(require) {
 
 	var app = {
 
-		requests: {},
+		requests: {
+			/* Provisioner */
+			'common.chooseModel.getProvisionerData': {
+				apiRoot: monster.config.api.provisioner,
+				url: 'phones',
+				verb: 'GET'
+			}
+		},
 
 		subscribe: {
 			'voip.users.render': 'usersRender'
@@ -677,106 +684,7 @@ define(function(require) {
 			});
 
 			template.find('.users-header .add-user').on('click', function() {
-				monster.parallel({
-					callflows: function(callback) {
-						self.usersListCallflows(function(callflows) {
-							callback(null, callflows);
-						});
-					},
-					vmboxes: function(callback) {
-						self.usersListVMBoxes({
-							success: function(vmboxes) {
-								callback(null, vmboxes);
-							}
-						});
-					}
-				}, function(err, results) {
-					var originalData = self.usersFormatAddUser(results),
-						userTemplate = $(self.getTemplate({
-							name: 'creation',
-							data: originalData,
-							submodule: 'users'
-						})),
-						userCreationForm = userTemplate.find('#form_user_creation'),
-						validationOptions = {
-							ignore: ':hidden:not(select)',
-							rules: {
-								'callflow.extension': {
-									checkList: originalData.listExtensions
-								},
-								'vmbox.number': {
-									checkList: originalData.listVMBoxes
-								},
-								'user.password': {
-									minlength: 6
-								}
-							},
-							messages: {
-								'user.first_name': {
-									required: self.i18n.active().validation.required
-								},
-								'user.last_name': {
-									required: self.i18n.active().validation.required
-								},
-								'callflow.extension': {
-									required: self.i18n.active().validation.required
-								}
-							}
-						};
-
-					if (originalData.licensedUserRoles) {
-						validationOptions.rules['user.extra.licensedRole'] = {
-							checkList: [ 'none' ]
-						};
-						validationOptions.messages['user.extra.licensedRole'] = {
-							checkList: self.i18n.active().validation.required
-						};
-					}
-
-					monster.ui.mask(userTemplate.find('#extension'), 'extension');
-
-					monster.ui.chosen(userTemplate.find('#licensed_role'));
-
-					monster.ui.validate(userCreationForm, validationOptions);
-
-					// Force select element validation on change event
-					// (Not handled by jQuery Validation plugin because the select
-					// element is hidden by the Chosen jQuery plugin. For more info, see:
-					// https://github.com/jquery-validation/jquery-validation/issues/997)
-					userCreationForm.find('select').on('change', function() {
-						userCreationForm.validate().element(this);
-					});
-
-					monster.ui.showPasswordStrength(userTemplate.find('#password'));
-
-					userTemplate.find('#create_user').on('click', function() {
-						if (monster.ui.valid(userTemplate.find('#form_user_creation'))) {
-							var $this = $(this),
-								dataForm = monster.ui.getFormData('form_user_creation'),
-								formattedData = self.usersFormatCreationData(dataForm);
-
-							$this
-								.prop('disabled', true);
-
-							self.usersCreate(formattedData, function(data) {
-								popup.dialog('close').remove();
-
-								self.usersRender({ userId: data.user.id });
-							}, function() {
-								$this
-									.prop('disabled', false);
-							});
-						}
-					});
-
-					userTemplate.find('#notification_email').on('change', function() {
-						userTemplate.find('.email-group').toggleClass('hidden');
-					});
-
-					var popup = monster.ui.dialog(userTemplate, {
-						title: self.i18n.active().users.dialogCreationUser.title
-					});
-				});
+				self.usersRenderAddModalDialog();
 			});
 
 			template.on('click', '.cancel-link', function() {
@@ -1738,6 +1646,198 @@ define(function(require) {
 			});
 		},
 
+		usersBindAddUserEvents: function(args) {
+			var self = this,
+				template = args.template,
+				data = args.data,
+				popup = args.popup;
+
+			template.find('.create_user').on('click', function() {
+				var action = $(this).data('action');
+
+				if (monster.ui.valid(template.find('#form_user_creation'))) {
+					var $buttons = template.find('.create_user'),
+						dataForm = _.merge(monster.ui.getFormData('form_user_creation'), {
+							user: {
+								device: {
+									family: template.find('#device_model').find(':selected').data('family')
+								}
+							}
+						}),
+						formattedData = self.usersFormatCreationData(dataForm);
+
+					$buttons.prop('disabled', true);
+
+					self.usersCreate(formattedData, function(data) {
+						popup.dialog('close').remove();
+
+						switch (action) {
+							case 'add_new':
+								self.usersRender();
+								self.usersRenderAddModalDialog();
+								break;
+							default:
+								self.usersRender({ userId: data.user.id });
+								break;
+						}
+					}, function() {
+						$buttons.prop('disabled', false);
+					});
+				}
+			});
+
+			template.find('#notification_email').on('change', function() {
+				template.find('.email-group').toggleClass('hidden');
+			});
+
+			template.find('#device_brand').on('change', function() {
+				var brand = $(this).val(),
+					selectedBrand = [],
+					$deviceModel = template.find('.device-model'),
+					$deviceName = template.find('.device-name'),
+					$deviceMac = template.find('.device-mac'),
+					$deviceModelSelect = template.find('#device_model');
+
+				if (brand !== 'none') {
+					self.usersDeviceFormReset(template);
+					$deviceModel.slideDown();
+					$deviceName.slideDown();
+					$deviceMac.slideDown();
+
+					selectedBrand = _.find(data.listProvisioners, function(provisioner) {
+						return provisioner.name === brand;
+					});
+
+					$deviceModelSelect
+						.find('option')
+						.remove()
+						.end();
+
+					selectedBrand.models.map(function(model) {
+						var option = $('<option>', {
+							value: model.name,
+							text: model.name
+						}).attr('data-family', model.family);
+
+						$deviceModelSelect.append(option);
+					});
+
+					$deviceModelSelect.trigger('chosen:updated');
+
+					return;
+				}
+
+				self.usersDeviceFormReset(template);
+			});
+		},
+
+		usersRenderAddModalDialog: function() {
+			var self = this;
+
+			monster.parallel({
+				callflows: function(callback) {
+					self.usersListCallflows(function(callflows) {
+						callback(null, callflows);
+					});
+				},
+				vmboxes: function(callback) {
+					self.usersListVMBoxes({
+						success: function(vmboxes) {
+							callback(null, vmboxes);
+						}
+					});
+				},
+				provisioners: function(callback) {
+					monster.request({
+						resource: 'common.chooseModel.getProvisionerData',
+						data: {},
+						success: function(provisionerData) {
+							callback(null, provisionerData.data);
+						}
+					});
+				}
+			}, function(err, results) {
+				var originalData = self.usersFormatAddUser(results),
+					userTemplate = $(self.getTemplate({
+						name: 'creation',
+						data: originalData,
+						submodule: 'users'
+					})),
+					userCreationForm = userTemplate.find('#form_user_creation'),
+					validationOptions = {
+						ignore: ':hidden:not(select)',
+						rules: {
+							'callflow.extension': {
+								checkList: originalData.listExtensions
+							},
+							'vmbox.number': {
+								checkList: originalData.listVMBoxes
+							},
+							'user.password': {
+								minlength: 6
+							}
+						},
+						messages: {
+							'user.first_name': {
+								required: self.i18n.active().validation.required
+							},
+							'user.last_name': {
+								required: self.i18n.active().validation.required
+							},
+							'callflow.extension': {
+								required: self.i18n.active().validation.required
+							}
+						}
+					};
+
+				if (originalData.licensedUserRoles) {
+					validationOptions.rules['user.extra.licensedRole'] = {
+						checkList: [ 'none' ]
+					};
+					validationOptions.messages['user.extra.licensedRole'] = {
+						checkList: self.i18n.active().validation.required
+					};
+				}
+
+				monster.ui.mask(userTemplate.find('#extension'), 'extension');
+				monster.ui.chosen(userTemplate.find('#licensed_role'));
+				monster.ui.mask(userTemplate.find('#mac_address'), 'macAddress');
+				monster.ui.validate(userCreationForm, validationOptions);
+
+				// Force select element validation on change event
+				// (Not handled by jQuery Validation plugin because the select
+				// element is hidden by the Chosen jQuery plugin. For more info, see:
+				// https://github.com/jquery-validation/jquery-validation/issues/997)
+				userCreationForm.find('select').on('change', function() {
+					userCreationForm.validate().element(this);
+				});
+
+				monster.ui.showPasswordStrength(userTemplate.find('#password'));
+				monster.ui.chosen(userTemplate.find('#device_brand'));
+				monster.ui.chosen(userTemplate.find('#device_model'));
+
+				var popup = monster.ui.dialog(userTemplate, {
+					title: self.i18n.active().users.dialogCreationUser.title
+				});
+
+				self.usersBindAddUserEvents({
+					template: userTemplate,
+					data: originalData,
+					popup: popup
+				});
+			});
+		},
+
+		usersDeviceFormReset: function(template) {
+			var $deviceModel = template.find('.device-model'),
+				$deviceName = template.find('.device-name'),
+				$deviceMac = template.find('.device-mac');
+
+			$deviceModel.slideUp();
+			$deviceName.slideUp();
+			$deviceMac.slideUp();
+		},
+
 		usersGetCallRecordingData: function(userId, globalCallback) {
 			var self = this;
 
@@ -1883,6 +1983,20 @@ define(function(require) {
 			// If for some reason a vmbox number exist without an extension, we still don't want to let them set their extension number to that number.
 			allNumbers = arrayExtensions.concat(arrayVMBoxes);
 			formattedData.nextExtension = parseInt(monster.util.getNextExtension(allNumbers)) + '';
+			formattedData.listProvisioners = _.map(data.provisioners, function(brand) {
+				var models = _.flatMap(brand.families, function(family) {
+					return _.map(family.models, function(model) {
+						model.family = family.name;
+						return model;
+					});
+				});
+
+				return {
+					id: brand.id,
+					name: brand.name,
+					models: models
+				};
+			});
 
 			return formattedData;
 		},
@@ -3720,6 +3834,35 @@ define(function(require) {
 
 			delete formattedData.user.extra;
 
+			if (
+				_.get(data, 'user.device.brand', 'none') === 'none'
+				&& _.get(data, 'user.device.model', 'none') === 'none'
+				&& _.isEmpty(_.get(data, 'user.device.name'))
+				&& _.isEmpty(_.get(data, 'user.device.mac_address'))
+				) {
+				delete formattedData.user.device;
+				return formattedData;
+			}
+
+			formattedData.user.device = {
+				device_type: 'sip_device',
+				enabled: true,
+				mac_address: data.user.device.mac_address,
+				name: data.user.device.name,
+				provision: {
+					endpoint_brand: data.user.device.brand,
+					endpoint_family: data.user.device.family,
+					endpoint_model: data.user.device.model
+				},
+				sip: {
+					password: monster.util.randomString(12),
+					realm: monster.apps.auth.currentAccount.realm,
+					username: 'user_' + monster.util.randomString(10)
+				},
+				suppress_unregister_notifications: false,
+				family: data.user.device.family
+			};
+
 			return formattedData;
 		},
 
@@ -3781,6 +3924,11 @@ define(function(require) {
 							callback(null, _dataUser);
 						},
 						error: function(parsedError) {
+							if (parsedError.error === '402') {
+								error();
+								return;
+							}
+
 							callback(true);
 						},
 						onChargesCancelled: function() {
@@ -3817,11 +3965,23 @@ define(function(require) {
 				},
 				function(_dataUser, _dataCF, callback) {
 					if (!data.extra.includeInDirectory) {
-						callback(null);
+						callback(null, _dataUser);
 						return;
 					}
 
 					self.usersAddUserToMainDirectory(_dataUser, _dataCF.id, function(dataDirectory) {
+						callback(null, _dataUser);
+					});
+				},
+				function(_dataUser, callback) {
+					if (!data.user.device) {
+						callback(null);
+						return;
+					}
+
+					var deviceData = data.user.device;
+					deviceData.owner_id = _dataUser.id;
+					self.usersAddUserDevice(deviceData, function(_device) {
 						callback(null);
 					});
 				}
@@ -3831,6 +3991,7 @@ define(function(require) {
 					error();
 					return;
 				}
+
 				success(data);
 			});
 		},
@@ -4031,6 +4192,20 @@ define(function(require) {
 			});
 		},
 
+		usersAddUserDevice: function(dataDevice, callback) {
+			var self = this;
+			self.callApi({
+				resource: 'device.create',
+				data: {
+					accountId: self.accountId,
+					data: dataDevice
+				},
+				success: function(device) {
+					callback && callback(device);
+				}
+			});
+		},
+
 		usersGetMainCallflow: function(userId, callback) {
 			var self = this;
 
@@ -5206,10 +5381,6 @@ define(function(require) {
 					args.hasOwnProperty('success') && args.success(data.data);
 				},
 				error: function(parsedError) {
-					if (parsedError.error === '402') {
-						return;
-					}
-
 					args.hasOwnProperty('error') && args.error(parsedError);
 				},
 				onChargesCancelled: function() {
diff --git a/submodules/users/users.scss b/submodules/users/users.scss
index 7001d28..f78d291 100644
--- a/submodules/users/users.scss
+++ b/submodules/users/users.scss
@@ -591,10 +591,70 @@
 	background: #FFF;
 /*	box-shadow: 1px 1px 15px #ddd inset;*/
 }
-
-#creation_user_dialog form > div {
-	padding: 20px 40px 0px 60px;
-	border-bottom: 1px solid #c1c1c1;
+#creation_user_dialog {
+	width: 600px;
+	padding: 10px;
+	#form_user_creation {
+		margin: 0;
+	}
+	.row-fluid {
+		margin-bottom: 8px;
+		&.user-section-title {
+			h3 {
+				padding-left: 30px;
+				font-weight: normal;
+				font-size: 20px;
+				margin: 0;
+			}
+		}
+		&.separator {
+			border-bottom: 1px solid #c1c1c1;
+			margin: 20px 0;
+		}
+		.chosen-drop {
+			top: auto !important;
+			bottom: 100% !important;
+		}
+		.control-label {
+			margin: 0;
+			text-align: left;
+		}
+		input {
+			margin: 0;
+		}
+		.user-email-icon {
+			margin-right: 10px;
+		}
+		.monster-password-strength {
+			width: 220px;
+		}
+		div.to-left {
+			padding-left: 50px;
+		}
+		div.to-right {
+			padding-left: 20px;
+		}
+		.device-model,
+		.device-name,
+		.device-mac {
+			display: none;
+		}
+	}
+	.user-options-area {
+		padding-left: 150px;
+		.email-group {
+			padding-left: 10px;
+			#email {
+				margin-left: 10px;
+			}
+		}
+	}
+	.add-user-actions {
+		margin-top: 30px;
+		button:not(:first-child) {
+			margin-left: 10px;
+		}
+	}
 }
 
 #creation_user_dialog i {
@@ -606,10 +666,6 @@
 	text-align: center;
 }
 
-#creation_user_dialog .control-group .controls {
-	margin-left: 36px;
-}
-
 #creation_user_dialog input.same-line {
 	margin-left: 6px;
 }
@@ -624,14 +680,6 @@
 }
 
 #creation_user_dialog label.monster-invalid{
-	&[for="user.last_name"] {
-		margin-left: 113px;
-	}
-
-	&[for="extension"] {
-		margin-left: 160px;
-	}
-
 	&[for="password"] {
 		margin-top: 25px;
 	}
@@ -677,17 +725,6 @@
 	width: 74px;
 }
 
-#creation_user_dialog #extension {
-	width: 47px;
-	margin-left: 5px;
-}
-
-#creation_user_dialog .extension-label {
-	display: inline-block;
-	white-space: nowrap;
-	width: 153px;
-}
-
 /* Change Password Popup */
 .change-password-popup label.monster-invalid[for="inputPassword"] {
 	margin-top: 25px;
diff --git a/submodules/users/views/creation.html b/submodules/users/views/creation.html
index 3017a8a..bfd8e74 100644
--- a/submodules/users/views/creation.html
+++ b/submodules/users/views/creation.html
@@ -1,34 +1,38 @@
 <div id="creation_user_dialog">
-	<form class="form-horizontal small-labels" id="form_user_creation">
-	<div>
-		<div class="control-group">
-			<label class="control-label" for="first_name"><i class="fa fa-user"></i></label>
-			<div class="controls">
-				<input required class="input-small" type="text" id="first_name" name="user.first_name" placeholder="{{i18n.users.dialogCreationUser.firstName}}"></input>
-				<input required class="same-line input-small" type="text" name="user.last_name" placeholder="{{i18n.users.dialogCreationUser.lastName}}"></input>
-			</div>
+	<form class="form-horizontal clearfix" id="form_user_creation">
+		<div class="row-fluid user-section-title">
+			<h3>{{i18n.users.dialogCreationUser.createUser}}</h3>
 		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="email"><i class="fa fa-key"></i></label>
-			<div class="controls">
+		<div class="row-fluid">
+			<div class="span6 to-left">
+				<label class="control-label" for="first_name">{{i18n.users.dialogCreationUser.firstName}}</label>
+				<input required type="text" id="first_name" name="user.first_name" placeholder="{{i18n.users.dialogCreationUser.firstName}}" />
+			</div>
+			<div class="span6 to-right">
+				<label class="control-label" for="username">{{i18n.users.dialogCreationUser.loginEmail}}</label>
 				<input required type="email" name="user.username" id="username" placeholder="{{i18n.users.dialogCreationUser.loginEmail}}"/>
 			</div>
 		</div>
-
-		{{#unless _whitelabel.hide_user_passwords}}
-			<div class="control-group">
-				<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
-				<div class="controls">
-					<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
+		<div class="row-fluid">
+			<div class="span6 to-left">
+				<label class="control-label" for="last_name">{{i18n.users.dialogCreationUser.lastName}}</label>
+				<input required type="text" id="last_name" name="user.last_name" placeholder="{{i18n.users.dialogCreationUser.lastName}}" />
+			</div>
+			{{#unless _whitelabel.hide_user_passwords}}
+				<div class="span6 to-right">
+					<label class="control-label" for="password">{{i18n.users.dialogCreationUser.password}}</label>
+					<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.passwordPlaceholder}}"/>
 				</div>
+			{{/unless}}
+		</div>
+		<div class="row-fluid">
+			<div class="span6 to-left">
+				<label class="control-label" for="extension">{{ i18n.users.dialogCreationUser.extension }}</label>
+				<input required type="text" maxlength="6" name="callflow.extension" id="extension" value="{{nextExtension}}"/>
 			</div>
-		{{/unless}}
-
-		{{#if licensedUserRoles}}
-			<div class="control-group">
-				<label for="licensed_role" class="control-label"><i class="fa fa-user"></i></label>
-				<div class="controls">
+			{{#if licensedUserRoles}}
+				<div class="span6 to-right">
+					<label class="control-label" for="licensed_role">{{ i18n.users.licensedUserRoles.selectPlaceholder }}</label>
 					<select id="licensed_role" name="user.extra.licensedRole" data-placeholder="{{ i18n.users.licensedUserRoles.selectPlaceholder }}">
 						<option value="none">
 							{{ i18n.users.licensedUserRoles.licensedUserRoles.none }}
@@ -38,62 +42,95 @@
 						{{/each}}
 					</select>
 				</div>
-			</div>
-		{{/if}}
-	</div>
+			{{/if}}
+		</div>
 
-	<div>
-		<div class="control-group">
-			<label class="control-label" for="extension"><i class="icon-telicon-extensions"></i></label>
-			<div class="controls">
-				<span class="extension-label">{{ i18n.users.dialogCreationUser.extension }}</span>
-				<input required maxlength="6" type="text" name="callflow.extension" id="extension" value="{{nextExtension}}"/>
+		<div class="row-fluid separator"></div>
+
+		<div class="user-options-area">
+			<div class="control-group hack-left">
+				<label class="control-label" for="create_vmbox"></label>
+				<div class="controls">
+					{{#monsterCheckbox i18n.users.dialogCreationUser.createVmbox }}
+						<input id="create_vmbox" type="checkbox" name="extra.createVmbox"{{#if createVmbox}} checked="checked"{{/if}}></input>
+					{{/monsterCheckbox}}
+				</div>
+			</div>
+			<div class="control-group hack-left">
+				<label class="control-label" for="include_directory"></label>
+				<div class="controls">
+					{{#monsterCheckbox i18n.users.includeInDirectory }}
+						<input id="include_directory" type="checkbox" name="extra.includeInDirectory"{{#if includeInDirectory}} checked="checked"{{/if}}></input>
+					{{/monsterCheckbox}}
+				</div>
+			</div>
+			<div class="control-group hack-left">
+				<label class="control-label" for="notification_email"></label>
+				<div class="controls">
+					{{#monsterCheckbox i18n.users.dialogCreationUser.sendToDifferentEmail }}
+						<input id="notification_email" type="checkbox" name="extra.differentEmail"{{#if sendToDifferentEmail}} checked{{/if}}></input>
+					{{/monsterCheckbox}}
+				</div>
+			</div>
+			<div class="control-group email-group{{#unless sendToDifferentEmail}} hidden{{/unless}}">
+				<i class="fa fa-envelope"></i>
+				<input type="email" name="extra.email" id="email" placeholder="{{i18n.users.dialogCreationUser.notificationEmail}}">
+			</div>
+			<div class="control-group hack-left">
+				<label class="control-label" for="send_email_on_creation"></label>
+				<div class="controls">
+					{{#monsterCheckbox i18n.users.dialogCreationUser.sendWelcomeEmail }}
+						<input id="send_email_on_creation" type="checkbox" name="user.send_email_on_creation"></input>
+					{{/monsterCheckbox}}
+				</div>
 			</div>
 		</div>
-	</div>
 
-	<div>
-		<div class="control-group hack-left">
-			<label class="control-label" for="create_vmbox"></label>
-			<div class="controls">
-				{{#monsterCheckbox i18n.users.dialogCreationUser.createVmbox }}
-					<input id="create_vmbox" type="checkbox" name="extra.createVmbox"{{#if createVmbox}} checked="checked"{{/if}}></input>
-				{{/monsterCheckbox}}
-			</div>
+		<div class="row-fluid separator"></div>
+
+		<div class="row-fluid user-section-title">
+			<h3>{{ i18n.users.dialogCreationUser.addDevice.title }}</h3>
 		</div>
-		<div class="control-group hack-left">
-			<label class="control-label" for="include_directory"></label>
-			<div class="controls">
-				{{#monsterCheckbox i18n.users.includeInDirectory }}
-					<input id="include_directory" type="checkbox" name="extra.includeInDirectory"{{#if includeInDirectory}} checked="checked"{{/if}}></input>
-				{{/monsterCheckbox}}
+
+		<div class="row-fluid">
+			<div class="span6 to-left">
+				<label class="control-label" for="device_brand">{{ i18n.users.dialogCreationUser.addDevice.deviceMake.label }}</i></label>
+				<select id="device_brand" name="user.device.brand">
+					<option value="none">
+						{{ i18n.users.dialogCreationUser.addDevice.deviceMake.none }}
+					</option>
+					{{#each listProvisioners}}
+						<option value="{{name}}">{{name}}</option>
+					{{/each}}
+				</select>
 			</div>
-		</div>
-		<div class="control-group hack-left">
-			<label class="control-label" for="notification_email"></label>
-			<div class="controls">
-				{{#monsterCheckbox i18n.users.dialogCreationUser.sendToDifferentEmail }}
-					<input id="notification_email" type="checkbox" name="extra.differentEmail"{{#if sendToDifferentEmail}} checked{{/if}}></input>
-				{{/monsterCheckbox}}
+			<div class="span6 device-name to-right">
+				<label for="device-name" class="control-label">{{ i18n.users.dialogCreationUser.addDevice.name }}</label>
+				<input required type="text" id="device-name" name="user.device.name" placeholder="{{ i18n.users.dialogCreationUser.addDevice.name }}">
 			</div>
 		</div>
-		<div class="control-group email-group{{#unless sendToDifferentEmail}} hidden{{/unless}}">
-			<label class="control-label" for="email"><i class="fa fa-envelope"></i></label>
-			<div class="controls">
-				<input type="email" name="extra.email" id="email" placeholder="{{i18n.users.dialogCreationUser.notificationEmail}}">
+
+		<div class="row-fluid">
+			<div class="span6 to-left device-model">
+				<label class="control-label" for="device_model">{{ i18n.users.dialogCreationUser.addDevice.deviceModel.label }}</label>
+				<select id="device_model" name="user.device.model">
+					<option value="none">
+						{{ i18n.users.dialogCreationUser.addDevice.deviceMake.none }}
+					</option>
+				</select>
+			</div>
+			<div class="span6 device-mac to-right">
+				<label for="mac_address" class="control-label">{{ i18n.users.dialogCreationUser.addDevice.macAddress }}</label>
+				<input required type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
 			</div>
 		</div>
-		<div class="control-group hack-left">
-			<label class="control-label" for="send_email_on_creation"></label>
-			<div class="controls">
-				{{#monsterCheckbox i18n.users.dialogCreationUser.sendWelcomeEmail }}
-					<input id="send_email_on_creation" type="checkbox" name="user.send_email_on_creation"></input>
-				{{/monsterCheckbox}}
+
+		<div>
+			<div class="dialog-buttons-wrapper add-user-actions">
+				<button class="monster-button monster-button-success create_user">{{ i18n.users.dialogCreationUser.createUser }}</button>
+				<button class="monster-button monster-button-success create_user" data-action="add_new">{{ i18n.users.dialogCreationUser.createUserAndAddAnother }}</button>
 			</div>
 		</div>
-	</div>
 	</form>
-	<div class="dialog-buttons-wrapper">
-		<button id="create_user" class="monster-button monster-button-success">{{ i18n.users.dialogCreationUser.createUser }}</button>
-	</div>
 </div>
+

From d38251e65315d4134e8a03a754c5ff5dda871f17 Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Wed, 26 Dec 2018 12:49:15 -0600
Subject: [PATCH 03/35] UI-3275:  Feature codes configured as patterns instead
 of single numbers (#110)

* Flatten and use declarative style to refactor feature code creation

* Fix incorrect path to get/set feature code

* Remove unnecessary feature code defaults and callback

* feature codes configured as patterns instead of single numbers

* Update feature codes patterns

* Code style

* Verify if needed pattern is given by feature codes

* Fix wrong pattern
---
 submodules/strategy/strategy.js | 153 +++++++++++++++++++++-----------
 1 file changed, 101 insertions(+), 52 deletions(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 0dda43a..b4ada89 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -94,14 +94,14 @@ define(function(require) {
 			{
 				name: 'voicemail[action=check]',
 				number: '97',
-				callflowNumber: '*97',
+				pattern: '^\\*97([0-9]*)$',
 				moduleName: 'voicemail',
 				actionName: 'check'
 			},
 			{
 				name: 'voicemail[single_mailbox_login]',
 				number: '98',
-				callflowNumber: '*98',
+				pattern: '^\\*98([0-9]*)$',
 				moduleName: 'voicemail',
 				actionName: 'check',
 				extraData: {
@@ -242,7 +242,7 @@ define(function(require) {
 				callback && callback();
 			});
 
-			self.strategyCreateFeatureCodes();
+			self.strategyHandleFeatureCodes();
 		},
 
 		strategyCheckFirstWalkthrough: function() {
@@ -3203,61 +3203,96 @@ define(function(require) {
 			});
 		},
 
-		strategyCreateFeatureCodes: function(callback) {
-			var self = this;
-
-			/* To complete with all feature codes */
-			self.strategyGetFeatureCodes(function(listFeatureCodes) {
-				var existingFeatureCodes = $.map(listFeatureCodes, function(val) { return val.featurecode.name; }),
-					listRequests = [];
-
-				_.each(self.featureCodes, function(featureCode) {
-					if (existingFeatureCodes.indexOf(featureCode.name) === -1) {
-						var callflow = {
-							flow: {
-								children: {},
-								data: featureCode.extraData || {},
-								module: featureCode.moduleName
-							},
-							featurecode: {
-								name: featureCode.name,
-								number: featureCode.number
-							}
-						};
-
-						if (featureCode.hasOwnProperty('actionName')) {
-							callflow.flow.data = $.extend(callflow.flow.data, {
-								action: featureCode.actionName
-							});
-						}
-
-						if ('pattern' in featureCode) {
-							callflow.patterns = [ featureCode.pattern ];
-						} else {
-							callflow.numbers = [ featureCode.callflowNumber ];
-						}
+		strategyHandleFeatureCodes: function() {
+			var self = this,
+				featureCodesToUpdate = [
+					'voicemail[action=check]',
+					'voicemail[single_mailbox_login]'
+				],
+				expectedFeaturedCodes = _.keyBy(self.featureCodes, 'name');
 
-						listRequests.push(function(localCallback) {
-							self.strategyCreateCallflow({
-								data: {
-									data: callflow
+			monster.waterfall([
+				function(callback) {
+					self.strategyGetFeatureCodes(function(featureCodes) {
+						callback(null, featureCodes);
+					});
+				},
+				function(featureCodes, callback) {
+					var featureCodeNames = _.map(featureCodes, 'featurecode.name');
+
+					monster.parallel(_
+						.chain(self.featureCodes)
+						.reject(function(featureCode) {
+							return _.includes(featureCodeNames, featureCode.name);
+						})
+						.map(function(featureCode) {
+							var newCallflow = {
+								flow: {
+									children: {},
+									data: _.get(featureCode, 'extraData', {}),
+									module: featureCode.moduleName
 								},
-								success: function(data) {
-									localCallback && localCallback(null, data);
+								featurecode: {
+									name: featureCode.name,
+									number: featureCode.number
 								}
-							});
-						});
-					}
-				});
+							};
 
-				if (listRequests.length > 0) {
-					monster.parallel(listRequests, function(err, results) {
-						callback && callback();
+							if (_.has(featureCode, 'actionName')) {
+								_.set(newCallflow, 'flow.data.action', featureCode.actionName);
+							}
+							if (_.has(featureCode, 'pattern')) {
+								_.set(newCallflow, 'patterns', [featureCode.pattern]);
+							} else {
+								_.set(newCallflow, 'numbers', [featureCode.callflowNumber]);
+							}
+
+							return function(parallelCallback) {
+								self.strategyCreateCallflow({
+									data: {
+										data: newCallflow
+									},
+									success: function() {
+										parallelCallback(null);
+									}
+								});
+							};
+						})
+						.value()
+					, function() {
+						callback(null, featureCodes);
 					});
-				} else {
-					callback && callback();
+				},
+				function(featureCodes, callback) {
+					monster.parallel(
+						_.chain(featureCodes)
+						.filter(function(featureCode) {
+							return !_.includes(
+								_.get(featureCode, 'patterns', []),
+								_.get(expectedFeaturedCodes, [featureCode.featurecode.name, 'pattern'])
+							) && _.includes(featureCodesToUpdate, featureCode.featurecode.name);
+						})
+						.map(function(featureCode) {
+							return function(parallelCallback) {
+								self.strategyPatchCallflow({
+									data: {
+										callflowId: featureCode.id,
+										data: {
+											patterns: [_.get(expectedFeaturedCodes, [featureCode.featurecode.name, 'pattern'])],
+											numbers: []
+										}
+									},
+									callback: function() {
+										parallelCallback(null);
+									}
+								});
+							};
+						})
+						.value(),
+						callback
+					);
 				}
-			});
+			]);
 		},
 
 		strategyGetFeatureCodes: function(callback) {
@@ -3761,6 +3796,20 @@ define(function(require) {
 			});
 		},
 
+		strategyPatchCallflow: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'callflow.patch',
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
+				success: function(data) {
+					args.callback(data.data);
+				}
+			});
+		},
+
 		strategyListDirectories: function(callbackSuccess, callbackError) {
 			var self = this;
 

From 9f923c135ceaabf5edf1118d37882a10c1521bbe Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Mon, 7 Jan 2019 10:33:56 -0600
Subject: [PATCH 04/35] UI-3269-fixes: Fix form submit and improve device form
 validations (#112)

* Move buttons aout to prevent form submit

* Add device form validations
---
 submodules/users/users.js            | 22 ++++++++++++++++------
 submodules/users/views/creation.html | 15 +++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 389c39e..632b255 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1775,6 +1775,12 @@ define(function(require) {
 							},
 							'user.password': {
 								minlength: 6
+							},
+							'user.device.name': 'required',
+							'user.device.model': 'required',
+							'user.device.mac_address': {
+								required: true,
+								mac: true
 							}
 						},
 						messages: {
@@ -1786,6 +1792,15 @@ define(function(require) {
 							},
 							'callflow.extension': {
 								required: self.i18n.active().validation.required
+							},
+							'user.device.model': {
+								required: self.i18n.active().validation.required
+							},
+							'user.device.name': {
+								required: self.i18n.active().validation.required
+							},
+							'user.device.mac_address': {
+								required: self.i18n.active().validation.required
 							}
 						}
 					};
@@ -3834,12 +3849,7 @@ define(function(require) {
 
 			delete formattedData.user.extra;
 
-			if (
-				_.get(data, 'user.device.brand', 'none') === 'none'
-				&& _.get(data, 'user.device.model', 'none') === 'none'
-				&& _.isEmpty(_.get(data, 'user.device.name'))
-				&& _.isEmpty(_.get(data, 'user.device.mac_address'))
-				) {
+			if (_.get(data, 'user.device.brand', 'none') === 'none') {
 				delete formattedData.user.device;
 				return formattedData;
 			}
diff --git a/submodules/users/views/creation.html b/submodules/users/views/creation.html
index bfd8e74..845a802 100644
--- a/submodules/users/views/creation.html
+++ b/submodules/users/views/creation.html
@@ -121,16 +121,15 @@
 			</div>
 			<div class="span6 device-mac to-right">
 				<label for="mac_address" class="control-label">{{ i18n.users.dialogCreationUser.addDevice.macAddress }}</label>
-				<input required type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
-			</div>
-		</div>
-
-		<div>
-			<div class="dialog-buttons-wrapper add-user-actions">
-				<button class="monster-button monster-button-success create_user">{{ i18n.users.dialogCreationUser.createUser }}</button>
-				<button class="monster-button monster-button-success create_user" data-action="add_new">{{ i18n.users.dialogCreationUser.createUserAndAddAnother }}</button>
+				<input type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
 			</div>
 		</div>
 	</form>
+	<div>
+		<div class="dialog-buttons-wrapper add-user-actions">
+			<button class="monster-button monster-button-success create_user">{{ i18n.users.dialogCreationUser.createUser }}</button>
+			<button class="monster-button monster-button-success create_user" data-action="add_new">{{ i18n.users.dialogCreationUser.createUserAndAddAnother }}</button>
+		</div>
+	</div>
 </div>
 

From 0df57c914aed4976807ecdd283aaddf7293a1ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Tue, 15 Jan 2019 09:43:14 -0600
Subject: [PATCH 05/35] UI-3285: Set main menus to their default values upon
 strategies reset (#111)

* Update sub callflows and menus on incoming strategies reset

* Add more details to reset dialog message

* Fix parameter for callback on main sub callflow creation
---
 i18n/en-US.json                 |   2 +-
 submodules/strategy/strategy.js | 281 +++++++++++++++++++++++++-------
 2 files changed, 221 insertions(+), 62 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index 0e6a2ff..46a7d37 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -941,7 +941,7 @@
 		"confirmMessages": {
 			"deleteHoliday": "This holiday will be permanently deleted. Continue?",
 			"disableHolidays": "All existing holidays will be permanently deleted. Continue?",
-			"resetCalls": "All incoming call handling strategies will be reset. Continue?"
+			"resetCalls": "All incoming call handling strategies will be reset to their default values. Continue?"
 		},
 		"alertMessages": {
 			"uniqueHoliday": "Every holiday must have a unique name.",
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index b4ada89..7776b23 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -2397,13 +2397,12 @@ define(function(require) {
 				monster.ui.confirm(self.i18n.active().strategy.confirmMessages.resetCalls, function() {
 					monster.waterfall([
 						function(callback) {
-							self.strategyGetSubCallflows(callback);
+							self.strategyGetSubCallStrategiesData(callback);
 						},
-						function(mainSubCallflows, callback) {
-							self.strategyResetSubCallStrategies({
-								mainSubCallflows: mainSubCallflows,
+						function(currentStrategiesData, callback) {
+							self.strategyResetSubCallStrategies(_.merge({
 								callback: callback
-							});
+							}, currentStrategiesData));
 						}
 					], function(err, callflows) {
 						if (err) {
@@ -3982,6 +3981,31 @@ define(function(require) {
 			});
 		},
 
+		/**
+		 * Gets a menu list from the API
+		 * @param  {Object}   args
+		 * @param  {Object}   [args.filters]  Filters to be applied to query the menus
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Function} [args.error]    Error callback
+		 */
+		strategyListMenus: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'menu.list',
+				data: {
+					accountId: self.accountId,
+					filters: _.get(args, 'filters', {})
+				},
+				success: function(data) {
+					args.hasOwnProperty('success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					args.hasOwnProperty('error') && args.error(parsedError);
+				}
+			});
+		},
+
 		/**
 		 * Request the creation of a menu to the API
 		 * @param  {Object}   args
@@ -4007,6 +4031,32 @@ define(function(require) {
 			});
 		},
 
+		/**
+		 * Requests a menu update in the API
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data
+		 * @param  {String}   args.data.menuId  ID of the menu to be updated
+		 * @param  {Object}   args.data.data    Menu object to update
+		 * @param  {Function} [args.success]    Success callback
+		 * @param  {Function} [args.error]      Error callback
+		 */
+		strategyUpdateMenu: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'menu.update',
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
+				success: function(data) {
+					args.hasOwnProperty('success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					args.hasOwnProperty('error') && args.error(parsedError);
+				}
+			});
+		},
+
 		/**
 		 * Gets a main sub menu for call handling strategies, with the default structure
 		 * @param  {String} menuName  Menu name
@@ -4077,82 +4127,191 @@ define(function(require) {
 		},
 
 		/**
-		 * Get main callflows for call handling strategies
+		 * Get callflows and menus for call handling strategies
 		 * @param  {Function} callback  Callback function for monster async tasks
 		 */
-		strategyGetSubCallflows: function(callback) {
+		strategyGetSubCallStrategiesData: function(callback) {
 			var self = this;
 
-			self.strategyListCallflows({
-				filters: {
-					paginate: false,
-					has_value: 'type',
-					filter_type: 'main',
-					key_missing: [
-						'owner_id',
-						'group_id'
-					],
-					'filter_ui_metadata.origin': [
-						'voip'
-					]
+			monster.parallel({
+				callflows: function(parallelCallback) {
+					self.strategyListCallflows({
+						filters: {
+							paginate: false,
+							has_value: 'type',
+							filter_type: 'main',
+							key_missing: [
+								'owner_id',
+								'group_id'
+							],
+							'filter_ui_metadata.origin': [
+								'voip'
+							]
+						},
+						success: function(data) {
+							// Convert callflows array to map object, then send to next step
+							parallelCallback(null,
+								_.reduce(data, function(obj, callflow) {
+									var label = callflow.name || callflow.numbers[0];
+									obj[label] = callflow;
+									return obj;
+								}, {}));
+						},
+						error: function(parsedError) {
+							parallelCallback(parsedError);
+						}
+					});
 				},
-				success: function(data) {
-					// Convert callflows array to map object, then send to next step
-					callback(null,
-						_.reduce(data, function(obj, callflow) {
-							var label = callflow.name || callflow.numbers[0];
-							obj[label] = callflow;
-							return obj;
-						}, {}));
+				menus: function(parallelCallback) {
+					self.strategyListMenus({
+						filters: {
+							paginate: false,
+							has_value: 'type',
+							filter_type: 'main'
+						},
+						success: function(data) {
+							parallelCallback(null,
+								_.reduce(data, function(obj, menu) {
+									obj[menu.name] = menu;
+									return obj;
+								}, {}));
+						},
+						error: function(parsedError) {
+							parallelCallback(parsedError);
+						}
+					});
+				}
+			}, callback);
+		},
+
+		/**
+		 * Helper function to create or update a main menu
+		 * @param  {Object}   args
+		 * @param  {Object}   args.mainMenus  Map object that contains the main menus
+		 * @param  {String}   args.menuLabel  Label of the menu to be saved
+		 * @param  {Function} args.callback   Callback function for monster async tasks
+		 */
+		strategySaveMainSubMenu: function(args) {
+			var self = this,
+				mainMenus = args.mainMenus,
+				menuLabel = args.menuLabel,
+				callback = args.callback;
+
+			var menuArgs = {
+				data: {
+					data: self.strategyGetDefaultMainSubMenu(menuLabel)
+				},
+				success: function(menu) {
+					callback(null, menu);
 				},
 				error: function(parsedError) {
 					callback(parsedError);
 				}
+			};
+
+			if (!mainMenus.hasOwnProperty(menuLabel)) {
+				self.strategyCreateMenu(menuArgs);
+				return;
+			}
+
+			var menuToUpdate = mainMenus[menuLabel];
+			menuArgs.data.menuId = menuArgs.data.data.id = menuToUpdate.id;
+			self.strategyUpdateMenu(menuArgs);
+		},
+
+		/**
+		 * Helper function to create or update a main sub callflow
+		 * @param  {Object}   args
+		 * @param  {Object}   args.mainCallflows     Map object that contains the main callflows
+		 * @param  {String}   args.callflowLabel     Label of the callflow to be saved
+		 * @param  {String}   [args.savedCallflows]  Map object to which append the saved callflow
+		 * @param  {Object}   args.callflow          Default callflow to be saved
+		 * @param  {Function} args.callback          Callback function for monster async tasks
+		 */
+		strategySaveMainSubCallflow: function(args) {
+			var self = this,
+				mainCallflows = args.mainCallflows,
+				callflowLabel = args.callflowLabel,
+				savedCallflows = _.get(args, 'savedCallflows', {}),
+				callflow = args.callflow,
+				callback = args.callback;
+
+			if (!mainCallflows.hasOwnProperty(callflowLabel)) {
+				self.strategyCreateCallflow({
+					data: {
+						data: callflow
+					},
+					success: function(savedCallflow) {
+						savedCallflows[callflowLabel] = savedCallflow;
+						callback(null, savedCallflows);
+					},
+					error: function(parsedError) {
+						callback(parsedError);
+					}
+				});
+				return;
+			}
+
+			callflow.id = mainCallflows[callflowLabel].id;
+			self.strategyUpdateCallflow(callflow, function(savedCallflow) {
+				savedCallflows[callflowLabel] = savedCallflow;
+				callback(null, savedCallflows);
 			});
 		},
 
 		/**
 		 * Reset call handling strategies
-		 * @param  {Object}   args.mainSubCallflows  Account main callflows
-		 * @param  {Function} args.callback          Callback function for monster async tasks
+		 * @param  {Object}   args
+		 * @param  {Object}   args.callflows  Sub callflows for strategies
+		 * @param  {Object}   args.menus      Sub menus for strategies
+		 * @param  {Function} args.callback   Callback function for monster async tasks
 		 */
 		strategyResetSubCallStrategies: function(args) {
 			var self = this;
 
 			monster.parallel(
-				_.reduce(self.subCallflowsLabel, function(callflowRequests, label) {
-					callflowRequests[label] = function(callback) {
-						var mainSubCallflows = args.mainSubCallflows,
-							callflow = self.strategyGetDefaultMainSubCallflow({
-								label: label,
-								subMenuCallflowId: mainSubCallflows[label + 'Menu'].id
-							}),
-							callflowArgs = {
-								data: {
-									data: callflow
-								},
-								success: function(savedCallflow) {
-									callback(null, savedCallflow);
-								},
-								error: function(parsedError) {
-									callback(parsedError);
-								}
-							};
-
-						if (!mainSubCallflows.hasOwnProperty(label)) {
-							self.strategyCreateCallflow(callflowArgs);
-							return;
-						}
-
-						var callflowToUpdate = mainSubCallflows[label];
-						callflow.id = callflowToUpdate.id;
-						self.strategyUpdateCallflow(callflow, function(savedCallflow) {
-							callback(null, savedCallflow);
-						});
+				_.map(self.subCallflowsLabel, function(label) {
+					var menuLabel = label + 'Menu';
+
+					// Pack the waterfall process, and call for the outer parallel process
+					return function(parallelCallback) {
+						monster.waterfall([
+							function(waterfallCallback) {
+								// Update or create sub menu
+								self.strategySaveMainSubMenu({
+									mainMenus: args.menus,
+									menuLabel: menuLabel,
+									callback: waterfallCallback
+								});
+							},
+							function(savedMenu, waterfallCallback) {
+								// Update or create sub menu callflow
+								self.strategySaveMainSubCallflow({
+									mainCallflows: args.callflows,
+									callflowLabel: menuLabel,
+									callflow: self.strategyGetDefaultMainSubMenuCallflow(savedMenu),
+									callback: waterfallCallback
+								});
+							},
+							function(savedCallflows, waterfallCallback) {
+								// Update or create sub callflow
+								self.strategySaveMainSubCallflow({
+									mainCallflows: args.callflows,
+									callflowLabel: label,
+									savedCallflows: savedCallflows,
+									callflow: self.strategyGetDefaultMainSubCallflow({
+										label: label,
+										subMenuCallflowId: savedCallflows[menuLabel].id
+									}),
+									callback: waterfallCallback
+								});
+							}
+						], parallelCallback);
 					};
-
-					return callflowRequests;
-				}, {}), args.callback);
+				}),
+				function(err, results) {
+					args.callback(err, _.reduce(results, _.assign));
+				});
 		}
 	};
 

From 41d9f6932379dee67d0c9dee6b5c0cdb8362ad86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Wed, 16 Jan 2019 08:39:05 -0600
Subject: [PATCH 06/35] UI-3286: Set default option on select main extension
 pop-up (#115)

---
 submodules/users/users.js                         | 15 ++++-----------
 submodules/users/views/changePresenceIDPopup.html |  8 ++++----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 632b255..07ad49d 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1946,20 +1946,13 @@ define(function(require) {
 			var self = this;
 
 			if (user.presence_id) {
-				var found = false,
-					formattedPresenceID = '' + user.presence_id;
+				var formattedPresenceID = '' + user.presence_id;
 
-				_.each(listNumbers, function(number) {
-					if (number === formattedPresenceID) {
-						found = true;
-					}
+				return _.some(listNumbers, function(number) {
+					return number === formattedPresenceID;
 				});
-
-				return found;
-			} else if (listNumbers.length) {
-				return false;
 			} else {
-				return true;
+				return _.isEmpty(listNumbers);
 			}
 		},
 
diff --git a/submodules/users/views/changePresenceIDPopup.html b/submodules/users/views/changePresenceIDPopup.html
index cf34e47..1eec87c 100644
--- a/submodules/users/views/changePresenceIDPopup.html
+++ b/submodules/users/views/changePresenceIDPopup.html
@@ -4,10 +4,10 @@
 	</div>
 
 	<div class="list-choices">
-		{{#each numbers}} 
-			<div class="presence-id-option" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
+		{{#each numbers}}
+			<div class="presence-id-option{{#if @first}} active{{/if}}" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
 		{{/each}}
-		<div class="presence-id-option" data-number="none"> 
+		<div class="presence-id-option{{#unless numbers.length}} active{{/unless}}" data-number="none">
 			{{ i18n.users.presenceIDPopup.none}}
 		</div>
 	</div>
@@ -18,4 +18,4 @@
 			<button type="button" class="monster-button monster-button-success save-presence-id">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From a59bf13e9e3ed129be0ebde423e87b187092c2f8 Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Wed, 16 Jan 2019 13:55:20 -0600
Subject: [PATCH 07/35] UI-3269-fix: Remove unused device data on user creation
 and handle device creation error (#114)

* Remove this

* Don't store device data inside user data, on user creation

* user creationg, prevent device error

* Revert "Remove this"

This reverts commit 7102cf9b4a087321ac2d8ac7dc2b97a44311ed18.
---
 submodules/users/users.js | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 07ad49d..ed7f192 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -3914,7 +3914,10 @@ define(function(require) {
 		},
 
 		usersCreate: function(data, success, error) {
-			var self = this;
+			var self = this,
+				deviceData = _.get(data, 'user.device');
+
+			delete data.user.device;
 
 			monster.waterfall([
 				function(callback) {
@@ -3977,15 +3980,26 @@ define(function(require) {
 					});
 				},
 				function(_dataUser, callback) {
-					if (!data.user.device) {
+					if (!deviceData) {
 						callback(null);
 						return;
 					}
 
-					var deviceData = data.user.device;
 					deviceData.owner_id = _dataUser.id;
-					self.usersAddUserDevice(deviceData, function(_device) {
-						callback(null);
+
+					self.usersAddUserDevice({
+						data: deviceData,
+						success: function(_device) {
+							callback(null);
+						},
+						error: function(parsedError) {
+							if (parsedError.error === '402') {
+								error();
+								return;
+							}
+
+							callback(true);
+						}
 					});
 				}
 			],
@@ -4195,8 +4209,10 @@ define(function(require) {
 			});
 		},
 
-		usersAddUserDevice: function(dataDevice, callback) {
-			var self = this;
+		usersAddUserDevice: function(args) {
+			var self = this,
+				dataDevice = args.data;
+
 			self.callApi({
 				resource: 'device.create',
 				data: {
@@ -4204,7 +4220,10 @@ define(function(require) {
 					data: dataDevice
 				},
 				success: function(device) {
-					callback && callback(device);
+					args.hasOwnProperty('success') && args.success(device);
+				},
+				error: function(error) {
+					args.hasOwnProperty('error') && args.error(error);
 				}
 			});
 		},

From 3e1b26e8293c52355b492371c7f9777a4bf80701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Thu, 17 Jan 2019 16:41:12 -0600
Subject: [PATCH 08/35] UI-3274: Clean up HTTP 402 error guards on callApi
 error callbacks (#113)

* Remove guard for 402 error status

* Continue user creation w/o vmbox or device, if charges are declined

* Fix typo
---
 i18n/en-US.json           |   2 +-
 submodules/users/users.js | 128 ++++++++++++++++++++++++--------------
 2 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index 46a7d37..27e7fe6 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -536,7 +536,7 @@
 			"nameHelp": "Type the User's First Name in the first input, and the User's Last Name in the second one",
 			"loginHelp": "This is the Username of this user, used to login to the application",
 			"vmboxHelp": "This is the Voicemail Box Number of this user, click on Change PIN to reset the PIN of the Voicemail box of this user",
-			"roleHelp": "The \"Admin\" will have rights to access the App Exchange and add apps to this accoutn, whereas the \"User\" will only be able to access the apps that are enabled for them",
+			"roleHelp": "The \"Admin\" will have rights to access the App Exchange and add apps to this account, whereas the \"User\" will only be able to access the apps that are enabled for them",
 			"languageHelp": "This will change the language of the text displayed in the UI",
 			"timezoneHelp": "This will set the Timezone used for this User's devices and Voicemail Box",
 			"ringingHelp": "This will set the Ringing Timeout for this User and his Devices. For example, if you set it to 20, this user will be rung for 20 seconds before the system moves to his Voicemail Box",
diff --git a/submodules/users/users.js b/submodules/users/users.js
index ed7f192..42740fa 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1653,22 +1653,26 @@ define(function(require) {
 				popup = args.popup;
 
 			template.find('.create_user').on('click', function() {
-				var action = $(this).data('action');
-
-				if (monster.ui.valid(template.find('#form_user_creation'))) {
-					var $buttons = template.find('.create_user'),
-						dataForm = _.merge(monster.ui.getFormData('form_user_creation'), {
-							user: {
-								device: {
-									family: template.find('#device_model').find(':selected').data('family')
-								}
+				if (!monster.ui.valid(template.find('#form_user_creation'))) {
+					return;
+				}
+
+				var action = $(this).data('action'),
+					$buttons = template.find('.create_user'),
+					dataForm = _.merge(monster.ui.getFormData('form_user_creation'), {
+						user: {
+							device: {
+								family: template.find('#device_model').find(':selected').data('family')
 							}
-						}),
-						formattedData = self.usersFormatCreationData(dataForm);
+						}
+					}),
+					formattedData = self.usersFormatCreationData(dataForm);
 
-					$buttons.prop('disabled', true);
+				$buttons.prop('disabled', true);
 
-					self.usersCreate(formattedData, function(data) {
+				self.usersCreate({
+					data: formattedData,
+					success: function(data) {
 						popup.dialog('close').remove();
 
 						switch (action) {
@@ -1680,10 +1684,11 @@ define(function(require) {
 								self.usersRender({ userId: data.user.id });
 								break;
 						}
-					}, function() {
+					},
+					error: function() {
 						$buttons.prop('disabled', false);
-					});
-				}
+					}
+				});
 			});
 
 			template.find('#notification_email').on('change', function() {
@@ -3913,8 +3918,16 @@ define(function(require) {
 			});
 		},
 
-		usersCreate: function(data, success, error) {
+		/**
+		 * Creates an user, with all its related components
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data     User formatted data
+		 * @param  {Function} args.success  Success callback
+		 * @param  {Function} args.error    Error callback
+		 */
+		usersCreate: function(args) {
 			var self = this,
+				data = args.data,
 				deviceData = _.get(data, 'user.device');
 
 			delete data.user.device;
@@ -3929,12 +3942,7 @@ define(function(require) {
 							data.user.id = _dataUser.id;
 							callback(null, _dataUser);
 						},
-						error: function(parsedError) {
-							if (parsedError.error === '402') {
-								error();
-								return;
-							}
-
+						error: function() {
 							callback(true);
 						},
 						onChargesCancelled: function() {
@@ -3956,6 +3964,16 @@ define(function(require) {
 						success: function(_dataVM) {
 							data.callflow.flow.children._.data.id = _dataVM.id;
 							callback(null, _dataUser);
+						},
+						error: function() {
+							callback(true);
+						},
+						onChargesCancelled: function() {
+							// VMBox won't be created, so let's remove its data
+							data.extra.createVmbox = false;
+							delete data.vmbox;
+							delete data.callflow.flow.children._;
+							callback(null, _dataUser);
 						}
 					});
 				},
@@ -3986,30 +4004,30 @@ define(function(require) {
 					}
 
 					deviceData.owner_id = _dataUser.id;
-
 					self.usersAddUserDevice({
-						data: deviceData,
+						data: {
+							data: deviceData
+						},
 						success: function(_device) {
 							callback(null);
 						},
-						error: function(parsedError) {
-							if (parsedError.error === '402') {
-								error();
-								return;
-							}
-
+						error: function() {
 							callback(true);
+						},
+						onChargesCancelled: function() {
+							// Allow to complete without errors, although the device won't be created
+							callback(null);
 						}
 					});
 				}
 			],
 			function(err) {
 				if (err) {
-					error();
+					args.error();
 					return;
 				}
 
-				success(data);
+				args.success(data);
 			});
 		},
 
@@ -4209,21 +4227,31 @@ define(function(require) {
 			});
 		},
 
+		/**
+		 * Creates a device for a user
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data                  Data to be sent by the SDK to the API
+		 * @param  {Object}   args.data.data             Data provided for the device to be created
+		 * @param  {Function} [args.success]             Success callback
+		 * @param  {Function} [args.error]               Error callback
+		 * @param  {Function} [args.onChargesCancelled]  Callback to be executed when charges are
+		 *                                               not accepted
+		 */
 		usersAddUserDevice: function(args) {
-			var self = this,
-				dataDevice = args.data;
-
+			var self = this;
 			self.callApi({
 				resource: 'device.create',
-				data: {
-					accountId: self.accountId,
-					data: dataDevice
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
+				success: function(data) {
+					args.hasOwnProperty('success') && args.success(data.data);
 				},
-				success: function(device) {
-					args.hasOwnProperty('success') && args.success(device);
+				error: function(parsedError) {
+					args.hasOwnProperty('error') && args.error(parsedError);
 				},
-				error: function(error) {
-					args.hasOwnProperty('error') && args.error(error);
+				onChargesCancelled: function() {
+					args.hasOwnProperty('onChargesCancelled') && args.onChargesCancelled();
 				}
 			});
 		},
@@ -4438,10 +4466,13 @@ define(function(require) {
 		/**
 		 * Creates a Voicemail Box
 		 * @param  {Object}   args
-		 * @param  {Object}   args.data       Data to be sent by the SDK to the API
-		 * @param  {Object}   args.data.data  Data provided for the Voicemail Box to be created
-		 * @param  {Function} args.success    Success callback
-		 * @param  {Function} args.error      Error callback
+		 * @param  {Object}   args.data                  Data to be sent by the SDK to the API
+		 * @param  {Object}   args.data.data             Data provided for the Voicemail Box to be
+		 *                                               created
+		 * @param  {Function} [args.success]             Success callback
+		 * @param  {Function} [args.error]               Error callback
+		 * @param  {Function} [args.onChargesCancelled]  Callback to be executed when charges are
+		 *                                               not accepted
 		 */
 		usersCreateVMBox: function(args) {
 			var self = this;
@@ -4456,6 +4487,9 @@ define(function(require) {
 				},
 				error: function(parsedError) {
 					args.hasOwnProperty('error') && args.error(parsedError);
+				},
+				onChargesCancelled: function() {
+					args.hasOwnProperty('onChargesCancelled') && args.onChargesCancelled();
 				}
 			});
 		},

From 3b10c3a45c6a3ea1db7c654b1f194cf884dac40d Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Thu, 17 Jan 2019 17:48:19 -0800
Subject: [PATCH 09/35] UI-3293: Use correct prop to set lunch hour rule upper
 bound (#116)

---
 submodules/strategy/strategy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 7776b23..cebb7ac 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -1650,7 +1650,7 @@ define(function(require) {
 										.value();
 								}),
 								time_window_start: monster.util.timeToSeconds(customHours.lunchbreak.from),
-								time_window_end: monster.util.timeToSeconds(customHours.lunchbreak.to)
+								time_window_stop: monster.util.timeToSeconds(customHours.lunchbreak.to)
 							});
 
 							tmpRulesRequests.lunchbreak = function(callback) {

From 1b07a6f2d7c05f25afe81bdf046efb1d3fc90220 Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Mon, 21 Jan 2019 14:15:29 -0600
Subject: [PATCH 10/35] UI-3294: Display validation message properly on user
 creation (#117)

* Remove this

* Create User: Increase margin top to show validation error propertly

* Revert "Remove this"

This reverts commit 7102cf9b4a087321ac2d8ac7dc2b97a44311ed18.
---
 submodules/users/users.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/users/users.scss b/submodules/users/users.scss
index f78d291..271b1e7 100644
--- a/submodules/users/users.scss
+++ b/submodules/users/users.scss
@@ -685,7 +685,7 @@
 	}
 
 	&[for="licensed_role"] {
-		margin-top: 30px;
+		margin-top: 55px;
 	}
 }
 

From a84185d568be8055367004dbd1b059e35f72de0e Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Thu, 24 Jan 2019 15:15:04 -0600
Subject: [PATCH 11/35] UI-3298: Hide device form on user creation if there
 aren't provisioners (#118)

* Hide device form on user creation if there aren't provisioners

* Prevent request if there no provisioner API

* use appFlags to looks for valid provisioner
---
 app.js                               | 3 +++
 submodules/users/users.js            | 6 ++++++
 submodules/users/views/creation.html | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/app.js b/app.js
index c12dd2f..0278ddd 100644
--- a/app.js
+++ b/app.js
@@ -36,6 +36,7 @@ define(function(require) {
 		subscribe: {},
 		appFlags: {
 			common: {
+				hasProvisioner: false,
 				outboundPrivacy: [
 					'default',
 					'none',
@@ -60,6 +61,8 @@ define(function(require) {
 		initApp: function(callback) {
 			var self = this;
 
+			self.appFlags.common.hasProvisioner = _.isString(monster.config.api.provisioner);
+
 			monster.pub('auth.initApp', {
 				app: self,
 				callback: callback
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 42740fa..13b9b84 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1753,6 +1753,11 @@ define(function(require) {
 					});
 				},
 				provisioners: function(callback) {
+					if (!self.appFlags.common.hasProvisioner) {
+						callback(null);
+						return;
+					}
+
 					monster.request({
 						resource: 'common.chooseModel.getProvisionerData',
 						data: {},
@@ -1964,6 +1969,7 @@ define(function(require) {
 		usersFormatAddUser: function(data) {
 			var self = this,
 				formattedData = {
+					hasProvisioner: self.appFlags.common.hasProvisioner,
 					sendToSameEmail: true,
 					nextExtension: '',
 					listExtensions: {},
diff --git a/submodules/users/views/creation.html b/submodules/users/views/creation.html
index 845a802..fc7b33c 100644
--- a/submodules/users/views/creation.html
+++ b/submodules/users/views/creation.html
@@ -86,6 +86,7 @@
 			</div>
 		</div>
 
+		{{#if hasProvisioner}}
 		<div class="row-fluid separator"></div>
 
 		<div class="row-fluid user-section-title">
@@ -124,6 +125,7 @@
 				<input type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
 			</div>
 		</div>
+		{{/if}}
 	</form>
 	<div>
 		<div class="dialog-buttons-wrapper add-user-actions">

From 2f10b6c8b72c93eb6ccc651a82f50c37db5bb0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Mon, 25 Feb 2019 08:37:33 -0600
Subject: [PATCH 12/35] UI-3301: Load main number's E911 dialog on top
 notification click at Smart PBX (#119)

* Change styles file extension from .css to .scss, to use SASS

* Set style for e911 information banner

* Show main company numbers section and E911 popup on banner click

* Refactor strategyRefreshTemplate to receive arguments via object wrapper

* Pass action from myOffice layout to strategy.strategyRefreshTemplate

* Check e911 number availability and show edit dialog or toast

* Fix typo in property name

* Extract main numbers refresh template process into separate function

* Refactor to use Lodash instead of jQuery utility functions

* Pass action to banner via topMessage object

* Refactor checkMissingE911 function

* Convert action to object, to include more parameters

* Add action callback for e911 at numbers strategy

* Fixes on flow to check if update Emergency Caller ID

* Request current account from API, when checking to update E911 caller ID

* Fix e911 phone number filter

* Use current authenticated account instead of requesting it from API
---
 i18n/en-US.json                               |   3 +-
 submodules/myOffice/myOffice.js               |  17 +-
 .../myOffice/{myOffice.css => myOffice.scss}  |  35 +-
 submodules/myOffice/views/layout.html         |   4 +-
 submodules/strategy/strategy.js               | 516 +++++++++++++-----
 5 files changed, 436 insertions(+), 139 deletions(-)
 rename submodules/myOffice/{myOffice.css => myOffice.scss} (95%)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index 27e7fe6..8f52345 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -958,7 +958,8 @@
 			"resetCallSuccess": "Call strategy successfully reset.",
 			"buyNumbersSuccess": "The numbers have been purchased.",
 			"buyNumbersError": "An error occured while purchasing numbers.",
-			"removeNumberSuccess": "Number successfully removed from the main callflow."
+			"removeNumberSuccess": "Number successfully removed from the main callflow.",
+			"noE911NumberAvailable": "There are no main numbers with e911 feature available. Please assign a main number with the e911 feature."
 		},
 		"popupRemoveFeatures": {
 			"title": "Features",
diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index 2b09ba8..d3c5f38 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -661,7 +661,8 @@ define(function(require) {
 				if (!hasValidCallerId && !hasValidE911) {
 					data.topMessage = {
 						cssClass: 'btn-danger',
-						message: self.i18n.active().myOffice.missingCnamE911Message
+						message: self.i18n.active().myOffice.missingCnamE911Message,
+						action: 'checkMissingE911'
 					};
 				} else if (!hasValidCallerId) {
 					data.topMessage = {
@@ -671,7 +672,8 @@ define(function(require) {
 				} else if (!hasValidE911) {
 					data.topMessage = {
 						cssClass: 'btn-danger',
-						message: self.i18n.active().myOffice.missingE911Message
+						message: self.i18n.active().myOffice.missingE911Message,
+						action: 'checkMissingE911'
 					};
 				}
 			}
@@ -700,7 +702,8 @@ define(function(require) {
 			template.find('.link-box').on('click', function(e) {
 				var $this = $(this),
 					category = $this.data('category'),
-					subcategory = $this.data('subcategory');
+					subcategory = $this.data('subcategory'),
+					actionType = $this.data('action');
 
 				$('.category').removeClass('active');
 				switch (category) {
@@ -718,7 +721,13 @@ define(function(require) {
 						break;
 					case 'strategy':
 						$('.category#strategy').addClass('active');
-						monster.pub('voip.strategy.render', { parent: parent, openElement: subcategory });
+						monster.pub('voip.strategy.render', {
+							parent: parent,
+							openElement: subcategory,
+							action: {
+								type: actionType
+							}
+						});
 						break;
 				}
 			});
diff --git a/submodules/myOffice/myOffice.css b/submodules/myOffice/myOffice.scss
similarity index 95%
rename from submodules/myOffice/myOffice.css
rename to submodules/myOffice/myOffice.scss
index 858372c..f68a424 100644
--- a/submodules/myOffice/myOffice.css
+++ b/submodules/myOffice/myOffice.scss
@@ -1,3 +1,5 @@
+@import '../../../../css/partials/base';
+
 /********** Header **********/
 #myoffice_container .dashboard-header {
 	height: 62px;
@@ -60,14 +62,29 @@
 }
 
 /********** Content **********/
-#myoffice_container .dashboard-content .dashboard-top-message {
-	padding: 10px;
-	margin-bottom: 10px;
-	border-radius: 2px;
-	opacity: 0.8;
-}
-#myoffice_container .dashboard-content .dashboard-top-message i {
-	margin-right: 10px;
+#myoffice_container .dashboard-content {
+	.dashboard-top-message {
+		padding: 10px;
+		margin-bottom: 10px;
+		border-radius: 2px;
+		opacity: 0.8;
+	}
+	.dashboard-top-message{
+		&.link-box[data-action] {
+			cursor: pointer;
+			&:hover {
+				background-color: #ff3b29;
+				background-image: -moz-linear-gradient(top, #ff3a28, #ff6161);
+				background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff3a28), to(#ff6161));
+				background-image: -webkit-linear-gradient(top, #ff3a28, #ff6161);
+				background-image: -o-linear-gradient(top, #ff3a28, #ff6161);
+				background-image: linear-gradient(to bottom, #ff3a28, #ff6161);
+			}
+		}
+		i {
+			margin-right: 10px;
+		}
+	}
 }
 
 #myoffice_container .dashboard-content-div {
@@ -473,4 +490,4 @@
 @keyframes warning-pulse-box {
 	0% { box-shadow: 0px 0px 5px #fbb450 inset, 0px 0px 5px #f89406; }
 	100% { box-shadow: 0px 0px 30px #fbb450 inset, 0px 0px 10px #f89406; }
-}
\ No newline at end of file
+}
diff --git a/submodules/myOffice/views/layout.html b/submodules/myOffice/views/layout.html
index f785073..770fe50 100644
--- a/submodules/myOffice/views/layout.html
+++ b/submodules/myOffice/views/layout.html
@@ -23,7 +23,7 @@
 
 	<div class="dashboard-content">
 		{{#if topMessage}}
-		<div class="dashboard-top-message {{topMessage.cssClass}}">
+		<div class="dashboard-top-message {{topMessage.cssClass}} link-box" data-category="strategy" data-subcategory="main-number"{{#if topMessage.action}} data-action="{{topMessage.action}}"{{/if}}>
 			<i class="fa fa-exclamation-triangle"></i>{{topMessage.message}}<!-- {{i18n.myOffice.missingE911Message}} -->
 		</div>
 		{{/if}}
@@ -123,7 +123,7 @@
 				{{else}}
 				<div class="dashboard-warning-row main-number-row link-box" data-category="strategy" data-subcategory="main-number">
 					<i class="fa fa-exclamation-triangle"></i>{{@root.i18n.myOffice.missingMainNumberMessage}}
-				</div>	
+				</div>
 				{{/if}}
 				<div class="dashboard-box-row conf-number-row link-box" data-category="strategy" data-subcategory="strategy-confnum">
 					<div class="row-title">
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index cebb7ac..7abfe43 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -158,11 +158,23 @@ define(function(require) {
 			}
 		],
 
+		/**
+		 * Render main layout
+		 * @param  {Object}   args
+		 * @param  {jQuery}   args.parent                      Parent template
+		 * @param  {String}   [args.openElement]               Name of the element to display on render
+		 * @param  {Object}   [args.action]                    Action to execute on render
+		 * @param  {String}   [args.action.type]               Type of action to execute
+		 * @param  {Object}   [args.action.callbacks]          Action callbacks
+		 * @param  {Function} [args.action.callbacks.success]  Action success callback
+		 * @param  {Function} [args.callback]                  Callback to execute after render
+		 */
 		strategyRender: function(args) {
 			var self = this,
 				args = args || {},
 				parent = args.parent || $('.right-content'),
 				openElement = args.openElement,
+				action = args.action,
 				callback = args.callback;
 
 			monster.parallel({
@@ -232,9 +244,14 @@ define(function(require) {
 				if (openElement) {
 					var element = template.find('.element-container.' + openElement + ':visible');
 					if (element.length > 0) {
-						self.strategyRefreshTemplate(element, results, function() {
-							element.addClass('open');
-							element.find('.element-content').show();
+						self.strategyRefreshTemplate({
+							container: element,
+							strategyData: results,
+							action: action,
+							callback: function() {
+								element.addClass('open');
+								element.find('.element-content').show();
+							}
 						});
 					}
 				}
@@ -337,13 +354,23 @@ define(function(require) {
 			});
 		},
 
-		strategyShowE911Choices: function(oldNumber, newNumbers) {
+		/**
+		 * Show e911 number choices
+		 * @param  {Object}   args
+		 * @param  {String}   args.oldNumber   Old E911 number
+		 * @param  {String[]} args.newNumbers  New E911 numbers
+		 * @param  {Function} [args.success]   Success callback
+		 * @param  {Function} [args.error]     Error callback
+		 * @param  {Function} [args.cancel]    Cancel callback
+		 */
+		strategyShowE911Choices: function(args) {
 			var self = this,
+				oldNumber = args.oldNumber,
 				template = $(self.getTemplate({
 					name: 'changeE911Popup',
 					data: {
 						oldNumber: oldNumber,
-						newNumbers: newNumbers
+						newNumbers: args.newNumbers
 					},
 					submodule: 'strategy'
 				})),
@@ -361,23 +388,33 @@ define(function(require) {
 				if (number === oldNumber) {
 					popup.dialog('close');
 				} else {
-					self.strategyChangeEmergencyCallerId(number, function() {
-						monster.ui.toast({
-							type: 'success',
-							message: self.getTemplate({
-								name: '!' + self.i18n.active().startegy.updateE911Dialog.success,
-								data: {
-									number: monster.util.formatPhoneNumber(number)
-								}
-							})
-						});
-						popup.dialog('close');
+					self.strategyChangeEmergencyCallerId({
+						number: number,
+						success: function(number) {
+							monster.ui.toast({
+								type: 'success',
+								message: self.getTemplate({
+									name: '!' + self.i18n.active().strategy.updateE911Dialog.success,
+									data: {
+										number: monster.util.formatPhoneNumber(number)
+									}
+								})
+							});
+							popup.dialog('close');
+
+							_.has(args, 'success') && args.success(number);
+						},
+						error: function(parsedError) {
+							_.has(args, 'error') && args.error(parsedError);
+						}
 					});
 				}
 			});
 
 			template.find('.cancel-link').on('click', function() {
 				popup.dialog('close');
+
+				_.has(args, 'cancel') && args.cancel();
 			});
 
 			var popup = monster.ui.dialog(template, {
@@ -411,9 +448,13 @@ define(function(require) {
 						}
 					});
 
-					self.strategyRefreshTemplate(element, strategyData, function() {
-						element.addClass('open');
-						element.find('.element-content').slideDown();
+					self.strategyRefreshTemplate({
+						container: element,
+						strategyData: strategyData,
+						callback: function() {
+							element.addClass('open');
+							element.find('.element-content').slideDown();
+						}
 					});
 				}
 			});
@@ -434,105 +475,127 @@ define(function(require) {
 			self.strategyCallsBindEvents(strategyCallsContainer, strategyData);
 		},
 
-		strategyCheckIfUpdateEmergencyCallerID: function(templateNumbers, features, number) {
-			var self = this;
+		/**
+		 *
+		 * @param  {Object}   args
+		 * @param  {Object[]} args.templateNumbers      Template numbers
+		 * @param  {String[]} args.features             Number features
+		 * @param  {String}   args.number               Number ID
+		 * @param  {Object}   [args.callbacks]          Function callbacks
+		 * @param  {Function} [args.callbacks.success]  Successs callback
+		 */
+		strategyCheckIfUpdateEmergencyCallerID: function(args) {
+			var self = this,
+				templateNumbers = args.templateNumbers,
+				features = args.features,
+				number = args.number;
 
 			// Update data we have about features for main numbers
-			_.each(templateNumbers, function(dataLoop, index) {
+			_.each(templateNumbers, function(dataLoop) {
 				if (dataLoop.number.id === number) {
 					dataLoop.number.features = features;
 				}
 			});
 
-			var e911Numbers = _.map(_.filter(templateNumbers, function(number) {
-				return (number.number.features || []).indexOf('e911') >= 0;
-			}), function(number) {
-				return number.number.id;
-			});
+			monster.waterfall([
+				function(callback) {
+					var currAcc = monster.apps.auth.currentAccount,
+						hasEmergencyCallerId = _.get(currAcc, 'caller_id.emergency.number', '') !== '',
+						hasE911Feature = _.includes(features || [], 'e911');
+
+					if (hasE911Feature && !hasEmergencyCallerId) {
+						self.strategyChangeEmergencyCallerId({
+							number: number,
+							success: function() {
+								callback({});
+							},
+							error: function(parsedError) {
+								callback(_.merge({
+									isError: true
+								}, parsedError));
+							}
+						});
+					} else {
+						callback(null, currAcc, hasEmergencyCallerId, hasE911Feature);
+					}
+				},
+				function(currAcc, hasEmergencyCallerId, hasE911Feature, callback) {
+					if (!hasEmergencyCallerId) {
+						callback({});
+						return;
+					}
+
+					var e911ChoicesArgs;
 
-			var currAcc = monster.apps.auth.currentAccount,
-				hasEmergencyCallerId = currAcc.hasOwnProperty('caller_id') && currAcc.caller_id.hasOwnProperty('emergency') && currAcc.caller_id.emergency.hasOwnProperty('number') && currAcc.caller_id.emergency.number !== '',
-				hasE911Feature = (features || []).indexOf('e911') >= 0;
+					if (hasE911Feature) {
+						if (currAcc.caller_id.emergency.number !== number) {
+							e911ChoicesArgs = {
+								oldNumber: currAcc.caller_id.emergency.number,
+								newNumbers: [ number ]
+							};
+						}
+					} else {
+						if (currAcc.caller_id.emergency.number === number) {
+							e911ChoicesArgs = {
+								newNumbers: _.chain(templateNumbers)
+									.filter(function(number) {
+										return _.includes(number.number.features || [], 'e911');
+									}).map(function(number) {
+										return number.number.id;
+									}).value()
+							};
+						}
+					}
 
-			if (hasE911Feature) {
-				if (hasEmergencyCallerId) {
-					if (currAcc.caller_id.emergency.number !== number) {
-						self.strategyShowE911Choices(currAcc.caller_id.emergency.number, [ number ]);
+					if (_.isUndefined(e911ChoicesArgs)) {
+						callback({});
+					} else {
+						callback(null, e911ChoicesArgs);
 					}
-				} else {
-					self.strategyChangeEmergencyCallerId(number);
+				},
+				function(e911ChoicesArgs, callback) {
+					var executeCallback = function() {
+						callback();
+					};
+
+					self.strategyShowE911Choices(_.merge({
+						success: executeCallback,
+						cancel: executeCallback
+					}, e911ChoicesArgs));
 				}
-			} else {
-				// If they removed e911 from their current emergency caller id number, then we let them select the new one from the list of numbers with e911 configured
-				if (hasEmergencyCallerId && currAcc.caller_id.emergency.number === number) {
-					self.strategyShowE911Choices(undefined, e911Numbers);
+			], function(err) {
+				if (!err || _.isEmpty(err)) {
+					_.has(args, 'callbacks.success') && args.callbacks.success();
 				}
-			}
+			});
 		},
 
-		strategyRefreshTemplate: function(container, strategyData, callback) {
+		/**
+		 * Refresh a strategy template
+		 * @param  {Object}   args
+		 * @param  {jQuery}   args.container                   Container template
+		 * @param  {Object}   args.strategyData                Strategy data
+		 * @param  {Object}   [args.action]                    Action to execute
+		 * @param  {String}   [args.action.type]               Type of action to execute
+		 * @param  {Object}   [args.action.callbacks]          Action callbacks
+		 * @param  {Function} [args.action.callbacks.success]  Action success callback
+		 * @param  {Function} [args.callback]                  Optional callback to execute after refresh
+		 */
+		strategyRefreshTemplate: function(args) {
 			var self = this,
-				templateName = container.data('template');
+				$container = args.container,
+				strategyData = args.strategyData,
+				callback = args.callback,
+				templateName = $container.data('template');
 
 			switch (templateName) {
 				case 'numbers':
-					self.strategyListAccountNumbers(function(accountNumbers) {
-						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 = {
-											number: {
-												id: val
-											}
-										};
-
-										if (accountNumbers.hasOwnProperty(val)) {
-											ret.number = $.extend(true, accountNumbers[val], ret.number);
-										}
-
-										return ret;
-									}
-								}),
-								spareLinkEnabled: (_.countBy(accountNumbers, function(number) { return number.used_by ? 'assigned' : 'spare'; }).spare > 0)
-							},
-							template = $(self.getTemplate({
-								name: 'strategy-' + templateName,
-								data: templateData,
-								submodule: 'strategy'
-							}));
-
-						_.each(templateData.numbers, function(data) {
-							data.number.phoneNumber = data.number.id;
-
-							var numberDiv = template.find('[data-phonenumber="' + data.number.id + '"]'),
-								args = {
-									target: numberDiv.find('.edit-features'),
-									numberData: data.number,
-									afterUpdate: function(features) {
-										monster.ui.paintNumberFeaturesIcon(features, numberDiv.find('.features'));
-
-										self.strategyCheckIfUpdateEmergencyCallerID(templateData.numbers, features, data.number.id);
-									}
-								};
-
-							monster.pub('common.numberFeaturesMenu.render', args);
-						});
-
-						monster.ui.tooltips(template);
-
-						container
-							.find('.element-content')
-								.empty()
-								.append(template);
-
-						callback && callback();
-					});
-
+					self.strategyRefreshTemplateNumbers(
+						_.merge(
+							{
+								templateName: templateName
+							}, args)
+					);
 					break;
 				case 'confnum':
 					self.strategyListAccountNumbers(function(accountNumbers) {
@@ -557,7 +620,7 @@ define(function(require) {
 								submodule: 'strategy'
 							}));
 
-						container
+						$container
 							.find('.element-content')
 								.empty()
 								.append(template);
@@ -590,7 +653,7 @@ define(function(require) {
 								submodule: 'strategy'
 							}));
 
-						container
+						$container
 							.find('.element-content')
 								.empty()
 								.append(template);
@@ -697,7 +760,7 @@ define(function(require) {
 
 					monster.ui.validate(template.find('#strategy_custom_hours_form'), validationOptions);
 
-					container
+					$container
 						.find('.element-content')
 							.empty()
 							.append(template);
@@ -718,7 +781,7 @@ define(function(require) {
 						})),
 						holidayList = template.find('.holidays-list');
 
-					container
+					$container
 						.find('.element-content')
 							.empty()
 							.append(template);
@@ -786,7 +849,7 @@ define(function(require) {
 						submodule: 'strategy'
 					}));
 
-					container
+					$container
 						.find('.element-content')
 							.empty()
 							.append(template);
@@ -863,19 +926,190 @@ define(function(require) {
 			}
 		},
 
-		strategyChangeEmergencyCallerId: function(number, callback) {
-			var self = this;
+		/**
+		 * Refresh main numbers strategy template
+		 * @param  {Object}   args
+		 * @param  {jQuery}   args.container                   Container template
+		 * @param  {Object}   args.strategyData                Strategy data
+		 * @param  {Object}   args.templateName                Template name
+		 * @param  {Object}   [args.action]                    Action to execute
+		 * @param  {String}   [args.action.type]               Type of action to execute
+		 * @param  {Object}   [args.action.callbacks]          Action callbacks
+		 * @param  {Function} [args.action.callbacks.success]  Action success callback
+		 * @param  {Function} [args.callback]                  Optional callback to execute after refresh
+		 */
+		strategyRefreshTemplateNumbers: function(args) {
+			var self = this,
+				$container = args.container,
+				strategyData = args.strategyData,
+				templateName = args.templateName,
+				action = args.action,
+				actionType = _.get(action, 'type'),
+				callback = args.callback;
 
-			self.strategyGetAccount({
-				success: function(data) {
+			self.strategyListAccountNumbers(function(accountNumbers) {
+				var callflow = strategyData.callflows.MainCallflow,
+					numbers = callflow.numbers,
+					templateData = {
+						hideBuyNumbers: _.has(monster.config.whitelabel, 'hideBuyNumbers')
+							? monster.config.whitelabel.hideBuyNumbers
+							: false,
+						numbers: _.chain(numbers)
+							.filter(function(val) {
+								return val !== '0' && val !== 'undefinedMainNumber';
+							}).map(function(val) {
+								var ret = {
+									number: {
+										id: val
+									}
+								};
+
+								if (_.has(accountNumbers, val)) {
+									ret.number = _.merge(accountNumbers[val], ret.number);
+								}
+
+								return ret;
+							}).value(),
+						spareLinkEnabled: (_.countBy(accountNumbers, function(number) { return number.used_by ? 'assigned' : 'spare'; }).spare > 0)
+					},
+					template = $(self.getTemplate({
+						name: 'strategy-' + templateName,
+						data: templateData,
+						submodule: 'strategy'
+					})),
+					afterFeatureUpdate = function afterFeatureUpdate(numberId, numberFeatures, callbacks) {
+						monster.ui.paintNumberFeaturesIcon(numberFeatures, template.find('[data-phonenumber="' + numberId + '"] .features'));
+
+						self.strategyCheckIfUpdateEmergencyCallerID({
+							templateNumbers: templateData.numbers,
+							features: numberFeatures,
+							number: numberId,
+							callbacks: callbacks
+						});
+					},
+					actions = {
+						checkMissingE911: function(numbers) {
+							if (!monster.util.isNumberFeatureEnabled('e911')) {
+								// E911 feature is not enabled for the account, so there is
+								// nothing to do here
+								return;
+							}
+
+							// Cases:
+							// - Render popup for first number in list with E911 feature enabled,
+							//   if no number has this feature set
+							// - If no number has E911 feature enabled, show a warning toast to
+							//   inform the user of that fact
+
+							var isE911Active = _.some(numbers, function(numberData) {
+									return _.includes(numberData.number.features, 'e911');
+								}),
+								e911NumberData;
+
+							if (!isE911Active) {
+								e911NumberData = _.chain(numbers)
+									.find(function(numberData) {
+										var availableFeatures = monster.util.getNumberFeatures(numberData.number);
+										return _.includes(availableFeatures, 'e911');
+									}).get('number').value();
+
+								if (_.isUndefined(e911NumberData)) {
+									monster.ui.toast({
+										type: 'warning',
+										message: self.i18n.active().strategy.toastrMessages.noE911NumberAvailable
+									});
+								} else {
+									monster.pub('common.e911.renderPopup', {
+										phoneNumber: _.get(e911NumberData, 'phoneNumber', e911NumberData.id),
+										callbacks: {
+											success: function(data) {
+												afterFeatureUpdate(e911NumberData.id, data.data.features, action.callbacks);
+											},
+											error: function() {
+												_.has(action, 'callbacks.error')
+													&& action.callbacks.error();
+											}
+										}
+									});
+								}
+							}
+						}
+					};
+
+				_.each(templateData.numbers, function(data) {
+					data.number.phoneNumber = data.number.id;
+
+					var numberData = data.number,
+						args = {
+							target: template.find('[data-phonenumber="' + numberData.id + '"] .edit-features'),
+							numberData: numberData,
+							afterUpdate: function(features) {
+								afterFeatureUpdate(numberData.id, features);
+							}
+						};
+
+					monster.pub('common.numberFeaturesMenu.render', args);
+				});
+
+				monster.ui.tooltips(template);
+
+				$container
+					.find('.element-content')
+					.empty()
+					.append(template);
+
+				// Execute any additional action that has been requested
+				if (_.has(actions, actionType)) {
+					actions[actionType](templateData.numbers);
+				}
+
+				callback && callback();
+			});
+		},
+
+		/**
+		 * Change the emergency caller ID for the current account
+		 * @param  {Object}   args
+		 * @param  {String}   args.number     Number to be set for emergency calls
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Function} [args.error]    Error callback
+		 */
+		strategyChangeEmergencyCallerId: function(args) {
+			var self = this,
+				number = args.number;
+
+			monster.waterfall([
+				function(callback) {
+					self.strategyGetAccount({
+						success: function(data) {
+							callback(null, data);
+						},
+						error: function(parsedError) {
+							callback(parsedError);
+						}
+					});
+				},
+				function(data, callback) {
 					data.caller_id = data.caller_id || {};
 					data.caller_id.emergency = data.caller_id.emergency || {};
 					data.caller_id.emergency.number = number;
 
-					self.strategyUpdateAccount(data, function() {
-						callback && callback(number);
+					self.strategyUpdateAccount({
+						data: data,
+						success: function() {
+							callback(null);
+						},
+						error: function(parsedError) {
+							callback(parsedError);
+						}
 					});
 				}
+			], function(err) {
+				if (err) {
+					_.has(args, 'error') && args.error(err);
+				} else {
+					_.has(args, 'success') && args.success(number);
+				}
 			});
 		},
 
@@ -896,7 +1130,10 @@ define(function(require) {
 							var parentContainer = container.parents('.element-container');
 							strategyData.callflows.MainCallflow = updatedCallflow;
 							refreshNumbersHeader(parentContainer);
-							self.strategyRefreshTemplate(parentContainer, strategyData);
+							self.strategyRefreshTemplate({
+								container: parentContainer,
+								strategyData: strategyData
+							});
 						});
 					}
 				},
@@ -1001,7 +1238,10 @@ define(function(require) {
 									});
 									strategyData.callflows.MainCallflow = updatedCallflow;
 									refreshNumbersHeader(parentContainer);
-									self.strategyRefreshTemplate(parentContainer, strategyData);
+									self.strategyRefreshTemplate({
+										container: parentContainer,
+										strategyData: strategyData
+									});
 
 									//Updating Company Caller ID if this was the selected number
 									self.callApi({
@@ -1095,7 +1335,10 @@ define(function(require) {
 							var parentContainer = container.parents('.element-container');
 							strategyData.callflows.MainConference = updatedCallflow;
 							refreshConfNumHeader(parentContainer);
-							self.strategyRefreshTemplate(parentContainer, strategyData);
+							self.strategyRefreshTemplate({
+								container: parentContainer,
+								strategyData: strategyData
+							});
 						});
 					}
 				},
@@ -1276,7 +1519,10 @@ define(function(require) {
 						});
 						strategyData.callflows.MainConference = updatedCallflow;
 						refreshConfNumHeader(parentContainer);
-						self.strategyRefreshTemplate(parentContainer, strategyData);
+						self.strategyRefreshTemplate({
+							container: parentContainer,
+							strategyData: strategyData
+						});
 					});
 				}
 			});
@@ -1327,7 +1573,10 @@ define(function(require) {
 									var parentContainer = container.parents('.element-container');
 									strategyData.callflows.MainFaxing = updatedCallflow;
 									refreshFaxingNumHeader(parentContainer);
-									self.strategyRefreshTemplate(parentContainer, strategyData);
+									self.strategyRefreshTemplate({
+										container: parentContainer,
+										strategyData: strategyData
+									});
 								});
 							};
 
@@ -1561,7 +1810,10 @@ define(function(require) {
 								});
 								strategyData.callflows.MainFaxing = updatedCallflow;
 								refreshFaxingNumHeader(parentContainer);
-								self.strategyRefreshTemplate(parentContainer, strategyData);
+								self.strategyRefreshTemplate({
+									container: parentContainer,
+									strategyData: strategyData
+								});
 							});
 						}
 					});
@@ -3861,8 +4113,17 @@ define(function(require) {
 			});
 		},
 
-		strategyUpdateAccount: function(data, callback) {
-			var self = this;
+		/**
+		 * Updates an account
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data       Account data
+		 * @param  {String}   args.data.id    Account ID
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Function} [args.error]    Error callback
+		 */
+		strategyUpdateAccount: function(args) {
+			var self = this,
+				data = args.data;
 
 			self.callApi({
 				resource: 'account.update',
@@ -3870,12 +4131,21 @@ define(function(require) {
 					accountId: data.id,
 					data: data
 				},
-				success: function(data, status) {
-					callback && callback(data.data);
+				success: function(data) {
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					_.has(args, 'error') && args.error(parsedError);
 				}
 			});
 		},
 
+		/**
+		 * Request the current account information
+		 * @param  {Object}   args
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Fucntion} [args.error]    Error callback
+		 */
 		strategyGetAccount: function(args) {
 			var self = this;
 
@@ -3885,10 +4155,10 @@ define(function(require) {
 					accountId: self.accountId
 				},
 				success: function(data, status) {
-					args.hasOwnProperty('success') && args.success(data.data);
+					_.has(args, 'success') && args.success(data.data);
 				},
 				error: function(data, status) {
-					args.hasOwnProperty('error') && args.error();
+					_.has(args, 'error') && args.error();
 				}
 			});
 		},

From 56c033113e3b6644ceca11fc962fd935b01a88cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Mon, 25 Feb 2019 09:11:23 -0600
Subject: [PATCH 13/35] UI-3307: Set Account External Caller ID number when
 adding main numbers, if not set already (#120)

* Change styles file extension from .css to .scss, to use SASS

* Set style for e911 information banner

* Show main company numbers section and E911 popup on banner click

* Refactor strategyRefreshTemplate to receive arguments via object wrapper

* Pass action from myOffice layout to strategy.strategyRefreshTemplate

* Check e911 number availability and show edit dialog or toast

* Fix typo in property name

* Extract main numbers refresh template process into separate function

* Refactor to use Lodash instead of jQuery utility functions

* Pass action to banner via topMessage object

* Refactor checkMissingE911 function

* Convert action to object, to include more parameters

* Add action callback for e911 at numbers strategy

* Fixes on flow to check if update Emergency Caller ID

* Request current account from API, when checking to update E911 caller ID

* Fix e911 phone number filter

* Use current authenticated account instead of requesting it from API

* Modify strategyNumbersBindEvents to use Lodash and reduce duplicated code

* Refactor updateCallflow to use waterfall flow, and helper functions

* Modifications to E911 functions

To prevent invoking strategyChangeEmergencyCallerId from multiple places

* Generalize popup to choose numbers + function to check if external caller ID needs to be set

* Fixes on update e911 waterfall tasks

* Set active choice on caller ID popup

* Remove log entry
---
 i18n/de-DE.json                               |  24 +-
 i18n/en-US.json                               |  31 +-
 i18n/ru-RU.json                               |  22 +-
 submodules/strategy/strategy.js               | 354 +++++++++++-------
 .../strategy/views/changeCallerIdPopup.html   |  26 ++
 .../strategy/views/changeE911Popup.html       |  26 --
 6 files changed, 293 insertions(+), 190 deletions(-)
 create mode 100644 submodules/strategy/views/changeCallerIdPopup.html
 delete mode 100644 submodules/strategy/views/changeE911Popup.html

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index c041c40..eef13f0 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -1010,14 +1010,22 @@
 			}
 		},
 
-		"__comment": "UI-2629: Optionen zum Anpassen der e911-Funktion hinzugefügt",
-		"__version": "4.0",
-		"updateE911Dialog": {
-			"title": "Anrufer-ID des Accounts für Notfälle",
-			"headerNewE911": "Sie haben gerade e911 für eine Ihrer Hauptnummern aktiviert. Bitte wählen Sie eine Nummer aus, die Sie für diesen Account als Ihre Anrufer-ID für Notfälle verwenden möchten.",
-			"headerNoE911": "Sie haben e911 für die Nummer deaktiviert, die als Ihre Anrufer-ID für Notfälle verwendet wurde. Bitte wählen Sie eine neue Nummer aus, die für diesen Account als Anrufer-ID für Notfälle dienen soll.",
-			"success": "e911 wurde für den Account erfolgreich geändert und lautet nun {{ number }}.",
-			"current": "Aktuelle"
+		"updateCallerIdDialog": {
+			"title": {
+				"emergency": "Anrufer-ID des Accounts für Notfälle"
+			},
+			"headerNewNumber": {
+				"emergency": "Sie haben gerade e911 für eine Ihrer Hauptnummern aktiviert. Bitte wählen Sie eine Nummer aus, die Sie für diesen Account als Ihre Anrufer-ID für Notfälle verwenden möchten."
+			},
+			"headerNoNumber": {
+				"emergency": "Sie haben e911 für die Nummer deaktiviert, die als Ihre Anrufer-ID für Notfälle verwendet wurde. Bitte wählen Sie eine neue Nummer aus, die für diesen Account als Anrufer-ID für Notfälle dienen soll."
+			},
+			"success": {
+				"emergency": "e911 wurde für den Account erfolgreich geändert und lautet nun {{ number }}."
+			},
+			"current": {
+				"emergency": "Aktuelle"
+			}
 		}
 	},
 
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 8f52345..5aed47c 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1029,18 +1029,29 @@
 			}
 		},
 
-		"__comment": "UI-2629: add options to customize e911",
-		"__version": "4.0",
-		"updateE911Dialog": {
-			"title": "Account Emergency Caller-ID",
-			"headerNewE911": "You've just turned E911 on one of your main number, please select which number you would like to use for your Account Emergency Caller-ID.",
-			"headerNoE911": "You've disabled E911 on the number that was used for your Emergency Caller-ID, please select a new number to use as this Account Emergency Caller-ID.",
-			"success": "You successfully updated the E911 on the account to be {{ number }}.",
-			"current": "Current one"
-		},
-
 		"buttons": {
 			"reset": "Reset"
+		},
+
+		"updateCallerIdDialog": {
+			"title": {
+				"emergency": "Account Emergency Caller-ID",
+				"external": "Account External Caller-ID"
+			},
+			"headerNewNumber": {
+				"emergency": "You've just turned E911 on one of your main number, please select which number you would like to use for your Account Emergency Caller-ID."
+			},
+			"headerNoNumber": {
+				"emergency": "You've disabled E911 on the number that was used for your Emergency Caller-ID, please select a new number to use as this Account Emergency Caller-ID.",
+				"external": "You've not set the external number for the account yet, please select a new number to use as this Account External Caller-ID."
+			},
+			"success": {
+				"emergency": "You successfully updated the E911 on the account to be {{ number }}.",
+				"external": "You successfully updated the external caller ID on the account to be {{ number }}."
+			},
+			"current": {
+				"emergency": "Current one"
+			}
 		}
 	},
 
diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json
index 160e5e9..607387c 100644
--- a/i18n/ru-RU.json
+++ b/i18n/ru-RU.json
@@ -815,12 +815,22 @@
 			}
 		},
 
-		"updateE911Dialog": {
-			"title": "АОН учетной записи для экстренных служб",
-			"headerNewE911": "Вы только-что активировали использование E911 для одного из выших основных номеров. Пожалуйста выберете какой номер Вы желаете использовать как АОН для экстренных служб.",
-			"headerNoE911": "Вы отключили использование E911 для номера который ранее использовался как АОН для экстренных служб. Пожалуйста выберете новый номер для использования в качестве АОНа для экстренных служб.",
-			"success": "Вы успешно обновили значение E911 учетной записи. Новое значение {{ number }}.",
-			"current": "Один текущий"
+		"updateCallerIdDialog": {
+			"title": {
+				"emergency": "АОН учетной записи для экстренных служб"
+			},
+			"headerNewNumber": {
+				"emergency": "Вы только-что активировали использование E911 для одного из выших основных номеров. Пожалуйста выберете какой номер Вы желаете использовать как АОН для экстренных служб."
+			},
+			"headerNoNumber": {
+				"emergency": "Вы отключили использование E911 для номера который ранее использовался как АОН для экстренных служб. Пожалуйста выберете новый номер для использования в качестве АОНа для экстренных служб."
+			},
+			"success": {
+				"emergency": "Вы успешно обновили значение E911 учетной записи. Новое значение {{ number }}."
+			},
+			"current": {
+				"emergency": "Один текущий"
+			}
 		}
 	},
 
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 7abfe43..03c898a 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -357,20 +357,22 @@ define(function(require) {
 		/**
 		 * Show e911 number choices
 		 * @param  {Object}   args
+		 * @param  {('emergency'|'external')}  args.callerIdType  Caller ID type: emergency, external
 		 * @param  {String}   args.oldNumber   Old E911 number
 		 * @param  {String[]} args.newNumbers  New E911 numbers
-		 * @param  {Function} [args.success]   Success callback
-		 * @param  {Function} [args.error]     Error callback
+		 * @param  {Function} [args.save]      Save callback
 		 * @param  {Function} [args.cancel]    Cancel callback
 		 */
-		strategyShowE911Choices: function(args) {
+		strategyShowNumberChoices: function(args) {
 			var self = this,
+				callerIdType = args.callerIdType,
 				oldNumber = args.oldNumber,
 				template = $(self.getTemplate({
-					name: 'changeE911Popup',
+					name: 'changeCallerIdPopup',
 					data: {
 						oldNumber: oldNumber,
-						newNumbers: args.newNumbers
+						newNumbers: args.newNumbers,
+						callerIdType: callerIdType
 					},
 					submodule: 'strategy'
 				})),
@@ -386,29 +388,12 @@ define(function(require) {
 				var number = template.find('.active').data('number');
 
 				if (number === oldNumber) {
-					popup.dialog('close');
+					_.has(args, 'cancel') && args.cancel();
 				} else {
-					self.strategyChangeEmergencyCallerId({
-						number: number,
-						success: function(number) {
-							monster.ui.toast({
-								type: 'success',
-								message: self.getTemplate({
-									name: '!' + self.i18n.active().strategy.updateE911Dialog.success,
-									data: {
-										number: monster.util.formatPhoneNumber(number)
-									}
-								})
-							});
-							popup.dialog('close');
-
-							_.has(args, 'success') && args.success(number);
-						},
-						error: function(parsedError) {
-							_.has(args, 'error') && args.error(parsedError);
-						}
-					});
+					_.has(args, 'save') && args.save(number);
 				}
+
+				popup.dialog('close');
 			});
 
 			template.find('.cancel-link').on('click', function() {
@@ -418,7 +403,7 @@ define(function(require) {
 			});
 
 			var popup = monster.ui.dialog(template, {
-				title: self.i18n.active().strategy.updateE911Dialog.title
+				title: self.i18n.active().strategy.updateCallerIdDialog.title[callerIdType]
 			});
 		},
 
@@ -476,7 +461,62 @@ define(function(require) {
 		},
 
 		/**
-		 *
+		 * Check if it is necessary to set the external caller ID for the account
+		 * @param  {Object}   args
+		 * @param  {String[]} args.numbers  Available phone numbers
+		 */
+		strategyCheckIfSetExternalCallerID: function(args) {
+			var self = this,
+				numbers = args.numbers,
+				currAcc = monster.apps.auth.currentAccount,
+				hasExternalCallerId = _.get(currAcc, 'caller_id.external.number', '') !== '';
+
+			if (hasExternalCallerId || _.isEmpty(numbers)) {
+				return;
+			}
+
+			monster.waterfall([
+				function(callback) {
+					if (numbers.length > 1) {
+						self.strategyShowNumberChoices({
+							callerIdType: 'external',
+							newNumbers: numbers,
+							save: function(number) {
+								callback(null, number);
+							},
+							cancel: function() {
+								callback(null);
+							}
+						});
+					} else {
+						callback(null, numbers[0]);
+					}
+				}
+			], function(err, number) {
+				if (err || !number) {
+					return;
+				}
+
+				self.strategyChangeCallerId({
+					callerIdType: 'external',
+					number: number,
+					success: function() {
+						monster.ui.toast({
+							type: 'success',
+							message: self.getTemplate({
+								name: '!' + self.i18n.active().strategy.updateCallerIdDialog.success.external,
+								data: {
+									number: monster.util.formatPhoneNumber(number)
+								}
+							})
+						});
+					}
+				});
+			});
+		},
+
+		/**
+		 * Check if it is necessary to update the emergency caller ID for the account
 		 * @param  {Object}   args
 		 * @param  {Object[]} args.templateNumbers      Template numbers
 		 * @param  {String[]} args.features             Number features
@@ -504,27 +544,14 @@ define(function(require) {
 						hasE911Feature = _.includes(features || [], 'e911');
 
 					if (hasE911Feature && !hasEmergencyCallerId) {
-						self.strategyChangeEmergencyCallerId({
-							number: number,
-							success: function() {
-								callback({});
-							},
-							error: function(parsedError) {
-								callback(_.merge({
-									isError: true
-								}, parsedError));
-							}
-						});
+						callback('OK', number);
+					} else if (!hasEmergencyCallerId) {
+						callback('OK');
 					} else {
-						callback(null, currAcc, hasEmergencyCallerId, hasE911Feature);
+						callback(null, currAcc, hasE911Feature);
 					}
 				},
-				function(currAcc, hasEmergencyCallerId, hasE911Feature, callback) {
-					if (!hasEmergencyCallerId) {
-						callback({});
-						return;
-					}
-
+				function(currAcc, hasE911Feature, callback) {
 					var e911ChoicesArgs;
 
 					if (hasE911Feature) {
@@ -548,25 +575,44 @@ define(function(require) {
 					}
 
 					if (_.isUndefined(e911ChoicesArgs)) {
-						callback({});
+						callback('OK');
 					} else {
 						callback(null, e911ChoicesArgs);
 					}
 				},
 				function(e911ChoicesArgs, callback) {
-					var executeCallback = function() {
-						callback();
-					};
-
-					self.strategyShowE911Choices(_.merge({
-						success: executeCallback,
-						cancel: executeCallback
+					self.strategyShowNumberChoices(_.merge({
+						callerIdType: 'emergency',
+						save: function(number) {
+							callback(null, number);
+						},
+						cancel: function() {
+							callback('OK');
+						}
 					}, e911ChoicesArgs));
 				}
-			], function(err) {
-				if (!err || _.isEmpty(err)) {
-					_.has(args, 'callbacks.success') && args.callbacks.success();
+			], function(err, number) {
+				if ((err && err !== 'OK') || !number) {
+					return;
 				}
+
+				self.strategyChangeCallerId({
+					callerIdType: 'emergency',
+					number: number,
+					success: function() {
+						monster.ui.toast({
+							type: 'success',
+							message: self.getTemplate({
+								name: '!' + self.i18n.active().strategy.updateCallerIdDialog.success.emergency,
+								data: {
+									number: monster.util.formatPhoneNumber(number)
+								}
+							})
+						});
+
+						_.has(args, 'callbacks.success') && args.callbacks.success();
+					}
+				});
 			});
 		},
 
@@ -949,27 +995,25 @@ define(function(require) {
 
 			self.strategyListAccountNumbers(function(accountNumbers) {
 				var callflow = strategyData.callflows.MainCallflow,
-					numbers = callflow.numbers,
 					templateData = {
 						hideBuyNumbers: _.has(monster.config.whitelabel, 'hideBuyNumbers')
 							? monster.config.whitelabel.hideBuyNumbers
 							: false,
-						numbers: _.chain(numbers)
-							.filter(function(val) {
-								return val !== '0' && val !== 'undefinedMainNumber';
-							}).map(function(val) {
-								var ret = {
-									number: {
-										id: val
-									}
-								};
-
-								if (_.has(accountNumbers, val)) {
-									ret.number = _.merge(accountNumbers[val], ret.number);
+						numbers: _.map(self.strategyExtractMainNumbers({
+							mainCallflow: callflow
+						}), function(val) {
+							var ret = {
+								number: {
+									id: val
 								}
+							};
 
-								return ret;
-							}).value(),
+							if (_.has(accountNumbers, val)) {
+								ret.number = _.merge(accountNumbers[val], ret.number);
+							}
+
+							return ret;
+						}),
 						spareLinkEnabled: (_.countBy(accountNumbers, function(number) { return number.used_by ? 'assigned' : 'spare'; }).spare > 0)
 					},
 					template = $(self.getTemplate({
@@ -1068,14 +1112,16 @@ define(function(require) {
 		},
 
 		/**
-		 * Change the emergency caller ID for the current account
+		 * Changes a caller ID for the current account
 		 * @param  {Object}   args
+		 * @param  {('emergency'|'external')}  args.callerIdType  Caller ID type: emergency, external
 		 * @param  {String}   args.number     Number to be set for emergency calls
 		 * @param  {Function} [args.success]  Success callback
 		 * @param  {Function} [args.error]    Error callback
 		 */
-		strategyChangeEmergencyCallerId: function(args) {
+		strategyChangeCallerId: function(args) {
 			var self = this,
+				callerIdType = args.callerIdType,
 				number = args.number;
 
 			monster.waterfall([
@@ -1091,8 +1137,8 @@ define(function(require) {
 				},
 				function(data, callback) {
 					data.caller_id = data.caller_id || {};
-					data.caller_id.emergency = data.caller_id.emergency || {};
-					data.caller_id.emergency.number = number;
+					data.caller_id[callerIdType] = data.caller_id[callerIdType] || {};
+					data.caller_id[callerIdType].number = number;
 
 					self.strategyUpdateAccount({
 						data: data,
@@ -1116,30 +1162,36 @@ define(function(require) {
 		strategyNumbersBindEvents: function(container, strategyData) {
 			var self = this,
 				addNumbersToMainCallflow = function(numbers) {
-					if (numbers.length) {
-						var mainCallflow = strategyData.callflows.MainCallflow,
-							indexPlaceholder = mainCallflow.numbers.indexOf('undefinedMainNumber');
+					if (_.isEmpty(numbers)) {
+						return;
+					}
 
-						if (indexPlaceholder >= 0) {
-							mainCallflow.numbers[indexPlaceholder] = '0';
-						}
+					var mainCallflow = strategyData.callflows.MainCallflow,
+						indexPlaceholder = mainCallflow.numbers.indexOf('undefinedMainNumber');
 
-						mainCallflow.numbers = mainCallflow.numbers.concat(numbers);
+					if (indexPlaceholder >= 0) {
+						mainCallflow.numbers[indexPlaceholder] = '0';
+					}
 
-						self.strategyUpdateCallflow(mainCallflow, function(updatedCallflow) {
-							var parentContainer = container.parents('.element-container');
-							strategyData.callflows.MainCallflow = updatedCallflow;
-							refreshNumbersHeader(parentContainer);
-							self.strategyRefreshTemplate({
-								container: parentContainer,
-								strategyData: strategyData
-							});
+					mainCallflow.numbers = mainCallflow.numbers.concat(numbers);
+
+					self.strategyUpdateCallflow(mainCallflow, function(updatedCallflow) {
+						strategyData.callflows.MainCallflow = updatedCallflow;
+						refreshNumbersTemplate();
+
+						self.strategyCheckIfSetExternalCallerID({
+							numbers: self.strategyExtractMainNumbers({
+								mainCallflow: updatedCallflow
+							})
 						});
-					}
+					});
 				},
-				refreshNumbersHeader = function(parentContainer) {
+				refreshNumbersTemplate = function() {
 					var mainCallflow = strategyData.callflows.MainCallflow,
+						parentContainer = container.parents('.element-container'),
 						headerSpan = parentContainer.find('.element-header-inner .summary > span');
+
+					// Refresh headers
 					if (mainCallflow.numbers.length > 1) {
 						headerSpan.html(monster.util.formatPhoneNumber(mainCallflow.numbers[1]));
 						if (mainCallflow.numbers.length > 3) {
@@ -1160,6 +1212,12 @@ define(function(require) {
 						container.parents('#strategy_container').find('.element-container.helper').show();
 						container.parents('#strategy_container').find('.element-container.main-number').css('margin-top', '10px');
 					}
+
+					// Refresh template
+					self.strategyRefreshTemplate({
+						container: parentContainer,
+						strategyData: strategyData
+					});
 				};
 
 			container.on('click', '.action-links .spare-link:not(.disabled)', function(e) {
@@ -1169,7 +1227,7 @@ define(function(require) {
 					accountName: monster.apps.auth.currentAccount.name,
 					accountId: self.accountId,
 					callback: function(numberList) {
-						var numbers = $.map(numberList, function(val) {
+						var numbers = _.map(numberList, function(val) {
 							return val.phoneNumber;
 						});
 						addNumbersToMainCallflow(numbers);
@@ -1222,55 +1280,56 @@ define(function(require) {
 							popupHtml,
 							popup,
 							updateCallflow = function() {
-								strategyData.callflows.MainCallflow.numbers.splice(indexToRemove, 1);
-
-								// We don't want the '0' to stay in the routing system if they're no longer using SmartPBX.
-								// If they remove their last main number, we consider they don't use SmartPBX, so we reset the "0" to be the "undefinedMainNumber"
-								if (strategyData.callflows.MainCallflow.numbers.length === 1 && strategyData.callflows.MainCallflow.numbers[0] === '0') {
-									strategyData.callflows.MainCallflow.numbers[0] = 'undefinedMainNumber';
-								}
+								monster.waterfall([
+									function(callback) {
+										strategyData.callflows.MainCallflow.numbers.splice(indexToRemove, 1);
+
+										// We don't want the '0' to stay in the routing system if they're no longer using SmartPBX.
+										// If they remove their last main number, we consider they don't use SmartPBX, so we reset the "0" to be the "undefinedMainNumber"
+										if (strategyData.callflows.MainCallflow.numbers.length === 1 && strategyData.callflows.MainCallflow.numbers[0] === '0') {
+											strategyData.callflows.MainCallflow.numbers[0] = 'undefinedMainNumber';
+										}
 
-								self.strategyUpdateCallflow(strategyData.callflows.MainCallflow, function(updatedCallflow) {
-									var parentContainer = container.parents('.element-container');
-									monster.ui.toast({
-										type: 'success',
-										message: self.i18n.active().strategy.toastrMessages.removeNumberSuccess
-									});
-									strategyData.callflows.MainCallflow = updatedCallflow;
-									refreshNumbersHeader(parentContainer);
-									self.strategyRefreshTemplate({
-										container: parentContainer,
-										strategyData: strategyData
-									});
+										self.strategyUpdateCallflow(strategyData.callflows.MainCallflow, function(updatedCallflow) {
+											callback(null, updatedCallflow);
+										});
+									},
+									function(updatedCallflow, callback) {
+										monster.ui.toast({
+											type: 'success',
+											message: self.i18n.active().strategy.toastrMessages.removeNumberSuccess
+										});
+										strategyData.callflows.MainCallflow = updatedCallflow;
+										refreshNumbersTemplate(updateCallflow);
 
-									//Updating Company Caller ID if this was the selected number
-									self.callApi({
-										resource: 'account.get',
-										data: {
-											accountId: self.accountId
-										},
-										success: function(accountData) {
-											var modified = false;
-											if ('caller_id' in accountData.data && 'external' in accountData.data.caller_id && accountData.data.caller_id.external.number === numberToRemove) {
-												delete accountData.data.caller_id.external;
-												modified = true;
-											}
-											if ('caller_id' in accountData.data && 'emergency' in accountData.data.caller_id && accountData.data.caller_id.emergency.number === numberToRemove) {
-												delete accountData.data.caller_id.emergency;
-												modified = true;
-											}
-											if (modified) {
-												self.callApi({
-													resource: 'account.update',
-													data: {
-														accountId: self.accountId,
-														data: accountData.data
-													},
-													success: function(data) {}
-												});
+										self.strategyGetAccount({
+											success: function(accountData) {
+												callback(null, accountData);
 											}
-										}
-									});
+										});
+									}
+								], function(err, accountData) {
+									if (err) {
+										return;
+									}
+
+									var modified = false;
+
+									// TODO: Maybe before unsetting external caller_id, ask user to choose another, if any other number is available
+									if (_.get(accountData, 'caller_id.external.number') === numberToRemove) {
+										delete accountData.caller_id.external;
+										modified = true;
+									}
+									if (_.get(accountData, 'caller_id.emergency.number') === numberToRemove) {
+										delete accountData.caller_id.emergency;
+										modified = true;
+									}
+
+									if (modified) {
+										self.strategyUpdateAccount({
+											data: accountData
+										});
+									}
 								});
 							};
 
@@ -4582,6 +4641,21 @@ define(function(require) {
 				function(err, results) {
 					args.callback(err, _.reduce(results, _.assign));
 				});
+		},
+
+		/**
+		 * Extracts the phone numbers from the main callflow
+		 * @param    {Object} args
+		 * @param    {Object} args.mainCallflow  Main callflow
+		 * @returns  {String[]}                  Phone numbers
+		 */
+		strategyExtractMainNumbers: function(args) {
+			var self = this,
+				mainCallflow = args.mainCallflow;
+
+			return _.filter(mainCallflow.numbers, function(val) {
+				return val !== '0' && val !== 'undefinedMainNumber';
+			});
 		}
 	};
 
diff --git a/submodules/strategy/views/changeCallerIdPopup.html b/submodules/strategy/views/changeCallerIdPopup.html
new file mode 100644
index 0000000..68d492b
--- /dev/null
+++ b/submodules/strategy/views/changeCallerIdPopup.html
@@ -0,0 +1,26 @@
+<div class="e911-change-wrapper">
+	<div class="header">
+		{{#if oldNumber}}
+			{{ tryI18n i18n.strategy.updateCallerIdDialog.headerNewNumber callerIdType }}
+		{{else}}
+			{{ tryI18n i18n.strategy.updateCallerIdDialog.headerNoNumber callerIdType }}
+		{{/if}}
+	</div>
+
+	<div class="list-choices">
+		{{#if oldNumber}}
+			<div class="choice active" data-number="{{oldNumber}}">{{ formatPhoneNumber oldNumber }} <span class="current">({{ tryI18n i18n.strategy.updateCallerIdDialog.current callerIdType }})</span></div>
+		{{/if}}
+
+		{{#each newNumbers}}
+			<div class="choice{{#unless ../oldNumber}}{{#if @first}} active{{/if}}{{/unless}}" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
+		{{/each}}
+	</div>
+
+	<div class="actions clearfix">
+		<div class="pull-right">
+			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.save }}</button>
+		</div>
+	</div>
+</div>
diff --git a/submodules/strategy/views/changeE911Popup.html b/submodules/strategy/views/changeE911Popup.html
deleted file mode 100644
index 8e1b351..0000000
--- a/submodules/strategy/views/changeE911Popup.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="e911-change-wrapper">
-	<div class="header">
-		{{#if oldNumber}}
-			{{ i18n.strategy.updateE911Dialog.headerNewE911 }}
-		{{else}}
-			{{ i18n.strategy.updateE911Dialog.headerNoE911 }}
-		{{/if}}
-	</div>
-
-	<div class="list-choices">
-		{{#if oldNumber}}
-			<div class="choice" data-number="{{oldNumber}}">{{ formatPhoneNumber oldNumber }} <span class="current">({{ i18n.strategy.updateE911Dialog.current }})</span></div>
-		{{/if}}
-
-		{{#each newNumbers}}
-			<div class="choice" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
-		{{/each}}
-	</div>
-
-	<div class="actions clearfix">
-		<div class="pull-right">
-			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="monster-button monster-button-success save">{{ i18n.save }}</button>
-		</div>
-	</div>
-</div>

From 25c5992bfbe7cb83c04280f92361184239e37eb5 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Thu, 28 Feb 2019 17:54:58 -0800
Subject: [PATCH 14/35] UI-3312: Sort feature codes numerically (#123)

---
 submodules/featureCodes/featureCodes.js   | 97 +++++++++++++----------
 submodules/featureCodes/views/layout.html |  6 +-
 2 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/submodules/featureCodes/featureCodes.js b/submodules/featureCodes/featureCodes.js
index 485b05f..3bbc466 100644
--- a/submodules/featureCodes/featureCodes.js
+++ b/submodules/featureCodes/featureCodes.js
@@ -108,50 +108,63 @@ define(function(require) {
 
 		featureCodesFormatData: function(featureCodeData) {
 			var self = this,
-				featureCodes = {};
-
-			_.each(featureCodeData, function(callflow) {
-				// Some old callflows have been created with the feature code key, so we had the check to make sure they also have a name associated
-				if (callflow.featurecode.hasOwnProperty('name')) {
-					var category = 'misc',
-						i18nFeatureCode = self.i18n.active().featureCodes.labels[callflow.featurecode.name],
-						hasStar = (callflow.hasOwnProperty('numbers') && callflow.numbers.length && callflow.numbers[0].substr(0, 1) === '*') || (callflow.hasOwnProperty('patterns') && callflow.patterns.length && (_.startsWith(callflow.patterns[0], '^\\*') || _.startsWith(callflow.patterns[0], '\\*')));
-
-					_.find(self.categories, function(cat, key) {
-						if (cat.indexOf(callflow.featurecode.name) >= 0) {
-							category = key;
-							return true;
-						}
-						return false;
-					});
-
-					if (!featureCodes.hasOwnProperty(category)) {
-						featureCodes[category] = {
-							category: self.i18n.active().featureCodes.categories[category],
-							codes: []
-						};
-					}
-
-					featureCodes[category].codes.push({
-						key: callflow.featurecode.name,
-						name: i18nFeatureCode
-							? i18nFeatureCode.label
-							: _.capitalize(callflow.featurecode.name),
-						tooltip: i18nFeatureCode
-							? i18nFeatureCode.tooltip
-							: undefined,
-						number: callflow.featurecode.number ? callflow.featurecode.number.replace(/\\/g, '') : '',
-						hasStar: hasStar
-					});
-				}
-			});
+				defaultCategories = _.map(self.categories, function(codecs, category) {
+					return {
+						key: category,
+						items: codecs
+					};
+				});
 
-			return _.chain(featureCodes)
-				.map(function(category) {
-					category.codes = _.sortBy(category.codes, 'number');
-					return category;
+			return _
+				.chain(featureCodeData)
+				.filter(function(callflow) {
+					// Some old callflows have been created with the feature code key, so we check
+					// to make sure they also have a name associated
+					return _.has(callflow, 'featurecode.name');
+				})
+				.groupBy(function(callflow) {
+					var string = callflow.featurecode.name.match(/^(\w+){1}/)[0],
+						category = _.has(self.categories, string)
+							? string
+							: 'misc',
+						defaultCategory = _.find(defaultCategories, function(category) {
+							return _.includes(category.items, string);
+						});
+
+					return _.get(defaultCategory, 'key', category);
+				})
+				.map(function(codes, category) {
+					return {
+						label: self.i18n.active().featureCodes.categories[category],
+						items: _
+							.chain(codes)
+							.map(function(code) {
+								var i18n = _.get(self.i18n.active().featureCodes.labels, code.featurecode.name);
+
+								return {
+									hasStar: (
+										!_.isEmpty(code.numbers)
+										&& _.startsWith(code.numbers[0], '*')
+									) || (
+										!_.isEmpty(code.patterns)
+										&& code.patterns[0].match(/^(\^?\\\*)/)
+									),
+									label: _.get(i18n, 'label', _.capitalize(code.featurecode.name)),
+									number: _.has(code.featurecode, 'number')
+										? _.replace(code.featurecode.number, /\\/g, '')
+										: '',
+									tooltip: _.get(i18n, 'tooltip')
+								};
+							})
+							.sortBy(function(code) {
+								var number = _.toNumber(code.number);
+
+								return _.isNaN(number) ? -1 : number;
+							})
+							.value()
+					};
 				})
-				.sortBy('category')
+				.sortBy('label')
 				.value();
 		},
 
diff --git a/submodules/featureCodes/views/layout.html b/submodules/featureCodes/views/layout.html
index 92767b2..0465434 100644
--- a/submodules/featureCodes/views/layout.html
+++ b/submodules/featureCodes/views/layout.html
@@ -5,12 +5,12 @@
 	<div class="feature-codes-content">
 		{{#each featureCodes}}
 			<div class="feature-codes-category">
-				<div class="category-header">{{category}}</div>
+				<div class="category-header">{{label}}</div>
 				<div class="category-content">
-					{{#each codes}}
+					{{#each items}}
 					<div class="feature-code-line">
 						<div class="feature-code-label">
-							{{name}}
+							{{label}}
 						{{#if tooltip}}
 							<i class="fa fa-question-circle" data-toggle="tooltip" title="{{tooltip}}"></i>
 						{{/if}}

From 21f9dd7fe076183beea717ce3984484e18868d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Fri, 1 Mar 2019 11:19:50 -0600
Subject: [PATCH 15/35] UI-3311: Allow user to choose which main number to set
 for E911 (#122)

* Allow to choose number to use for E911

* Remove unnecessary strategyGetFeaturedNumbers function

* Code comments and i18n updates + flow fixes for E911

* Update pending i18n files

* Check class instead of data attr before unassign e911 main number

* Fix on check logic

* Do not display choose dialog when only one e911 number is left after removing E911 from the account emergency number
---
 i18n/de-DE.json                               |   4 +-
 i18n/en-US.json                               |   9 +-
 i18n/ru-RU.json                               |   4 +-
 submodules/strategy/strategy.js               | 151 ++++++++++++------
 .../strategy/views/changeCallerIdPopup.html   |  12 +-
 5 files changed, 119 insertions(+), 61 deletions(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index eef13f0..d6e4599 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -1014,10 +1014,10 @@
 			"title": {
 				"emergency": "Anrufer-ID des Accounts für Notfälle"
 			},
-			"headerNewNumber": {
+			"headerAddNumber": {
 				"emergency": "Sie haben gerade e911 für eine Ihrer Hauptnummern aktiviert. Bitte wählen Sie eine Nummer aus, die Sie für diesen Account als Ihre Anrufer-ID für Notfälle verwenden möchten."
 			},
-			"headerNoNumber": {
+			"headerRemoveNumber": {
 				"emergency": "Sie haben e911 für die Nummer deaktiviert, die als Ihre Anrufer-ID für Notfälle verwendet wurde. Bitte wählen Sie eine neue Nummer aus, die für diesen Account als Anrufer-ID für Notfälle dienen soll."
 			},
 			"success": {
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 5aed47c..0083c3f 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1038,11 +1038,14 @@
 				"emergency": "Account Emergency Caller-ID",
 				"external": "Account External Caller-ID"
 			},
-			"headerNewNumber": {
+			"headerAddNumber": {
 				"emergency": "You've just turned E911 on one of your main number, please select which number you would like to use for your Account Emergency Caller-ID."
 			},
-			"headerNoNumber": {
-				"emergency": "You've disabled E911 on the number that was used for your Emergency Caller-ID, please select a new number to use as this Account Emergency Caller-ID.",
+			"headerRemoveNumber": {
+				"emergency": "You've disabled E911 on the number that was used for your Emergency Caller-ID, please select a new number to use as this Account Emergency Caller-ID."
+			},
+			"headerChooseNumber": {
+				"emergency": "You've not set the emergency number for the account yet, please select which number you would like to use for your Account Emergency Caller-ID.",
 				"external": "You've not set the external number for the account yet, please select a new number to use as this Account External Caller-ID."
 			},
 			"success": {
diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json
index 607387c..c23a7b6 100644
--- a/i18n/ru-RU.json
+++ b/i18n/ru-RU.json
@@ -819,10 +819,10 @@
 			"title": {
 				"emergency": "АОН учетной записи для экстренных служб"
 			},
-			"headerNewNumber": {
+			"headerAddNumber": {
 				"emergency": "Вы только-что активировали использование E911 для одного из выших основных номеров. Пожалуйста выберете какой номер Вы желаете использовать как АОН для экстренных служб."
 			},
-			"headerNoNumber": {
+			"headerRemoveNumber": {
 				"emergency": "Вы отключили использование E911 для номера который ранее использовался как АОН для экстренных служб. Пожалуйста выберете новый номер для использования в качестве АОНа для экстренных служб."
 			},
 			"success": {
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 03c898a..b0e6a04 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -355,13 +355,14 @@ define(function(require) {
 		},
 
 		/**
-		 * Show e911 number choices
+		 * Show phone number choices
 		 * @param  {Object}   args
-		 * @param  {('emergency'|'external')}  args.callerIdType  Caller ID type: emergency, external
-		 * @param  {String}   args.oldNumber   Old E911 number
-		 * @param  {String[]} args.newNumbers  New E911 numbers
-		 * @param  {Function} [args.save]      Save callback
-		 * @param  {Function} [args.cancel]    Cancel callback
+		 * @param  {('emergency'|'external')}   args.callerIdType       Caller ID type: emergency, external
+		 * @param  {('choose'|'add'|'remove')}  [args.action='choose']  Action being done: Choose, add or remove a number
+		 * @param  {String}   [args.oldNumber]  Old number
+		 * @param  {String[]} args.newNumbers   New numbers
+		 * @param  {Function} [args.save]       Save callback
+		 * @param  {Function} [args.cancel]     Cancel callback
 		 */
 		strategyShowNumberChoices: function(args) {
 			var self = this,
@@ -370,6 +371,7 @@ define(function(require) {
 				template = $(self.getTemplate({
 					name: 'changeCallerIdPopup',
 					data: {
+						action: _.get(args, 'action', 'choose'),
 						oldNumber: oldNumber,
 						newNumbers: args.newNumbers,
 						callerIdType: callerIdType
@@ -540,42 +542,45 @@ define(function(require) {
 			monster.waterfall([
 				function(callback) {
 					var currAcc = monster.apps.auth.currentAccount,
-						hasEmergencyCallerId = _.get(currAcc, 'caller_id.emergency.number', '') !== '',
+						currentE911CallerId = _.get(currAcc, 'caller_id.emergency.number'),
 						hasE911Feature = _.includes(features || [], 'e911');
 
-					if (hasE911Feature && !hasEmergencyCallerId) {
+					if (hasE911Feature && _.isEmpty(currentE911CallerId)) {
 						callback('OK', number);
-					} else if (!hasEmergencyCallerId) {
-						callback('OK');
 					} else {
-						callback(null, currAcc, hasE911Feature);
+						callback(null, currentE911CallerId, hasE911Feature);
 					}
 				},
-				function(currAcc, hasE911Feature, callback) {
-					var e911ChoicesArgs;
+				function(currentE911CallerId, hasE911Feature, callback) {
+					var e911ChoicesArgs,
+						e911Numbers = [];
 
 					if (hasE911Feature) {
-						if (currAcc.caller_id.emergency.number !== number) {
+						if (currentE911CallerId !== number) {
 							e911ChoicesArgs = {
-								oldNumber: currAcc.caller_id.emergency.number,
+								action: 'add',
+								oldNumber: currentE911CallerId,
 								newNumbers: [ number ]
 							};
 						}
 					} else {
-						if (currAcc.caller_id.emergency.number === number) {
-							e911ChoicesArgs = {
-								newNumbers: _.chain(templateNumbers)
-									.filter(function(number) {
-										return _.includes(number.number.features || [], 'e911');
-									}).map(function(number) {
-										return number.number.id;
-									}).value()
-							};
+						if (!number || currentE911CallerId === number) {
+							e911Numbers = _.chain(templateNumbers)
+								.filter(function(number) {
+									return _.includes(number.number.features, 'e911');
+								}).map('number.id').value();
+
+							if (e911Numbers.length > 1) {
+								e911ChoicesArgs = {
+									action: number ? 'remove' : 'choose',
+									newNumbers: e911Numbers
+								};
+							}
 						}
 					}
 
 					if (_.isUndefined(e911ChoicesArgs)) {
-						callback('OK');
+						callback('OK', _.head(e911Numbers));
 					} else {
 						callback(null, e911ChoicesArgs);
 					}
@@ -1022,7 +1027,9 @@ define(function(require) {
 						submodule: 'strategy'
 					})),
 					afterFeatureUpdate = function afterFeatureUpdate(numberId, numberFeatures, callbacks) {
-						monster.ui.paintNumberFeaturesIcon(numberFeatures, template.find('[data-phonenumber="' + numberId + '"] .features'));
+						if (numberId) {
+							monster.ui.paintNumberFeaturesIcon(numberFeatures, template.find('[data-phonenumber="' + numberId + '"] .features'));
+						}
 
 						self.strategyCheckIfUpdateEmergencyCallerID({
 							templateNumbers: templateData.numbers,
@@ -1040,43 +1047,87 @@ define(function(require) {
 							}
 
 							// Cases:
-							// - Render popup for first number in list with E911 feature enabled,
-							//   if no number has this feature set
-							// - If no number has E911 feature enabled, show a warning toast to
-							//   inform the user of that fact
-
-							var isE911Active = _.some(numbers, function(numberData) {
-									return _.includes(numberData.number.features, 'e911');
-								}),
-								e911NumberData;
+							// * If there is one or more main numbers with E911 set:
+							//   - If there is one number, set that number as the emergency
+							//     caller ID for the account.
+							//   - If there are 2 or more, display dialog to choose number,
+							//     then set it as the account emergency caller ID.
+							// * If there are one or more numbers with E911 available (but not
+							//   set), then:
+							//   - If there is one number, select that number for E911.
+							//   - If there are 2 or more, display dialog to choose number.
+							//   Then display pop-up to set and save the info, and set the
+							//   selected number as the account emergency caller ID.
+							// * If there are no numbers with E911 feature available, display
+							//   toast to notify the user about it.
+							monster.waterfall([
+								function(callback) {
+									var isE911Active = _.some(numbers, function(numberData) {
+										return _.includes(numberData.number.features, 'e911');
+									});
 
-							if (!isE911Active) {
-								e911NumberData = _.chain(numbers)
-									.find(function(numberData) {
+									if (isE911Active) {
+										callback('OK', { });
+									} else {
+										callback(null);
+									}
+								},
+								function(callback) {
+									var e911AvailableNumbers = _.filter(numbers, function(numberData) {
 										var availableFeatures = monster.util.getNumberFeatures(numberData.number);
 										return _.includes(availableFeatures, 'e911');
-									}).get('number').value();
+									});
+
+									if (_.isEmpty(e911AvailableNumbers)) {
+										callback('no_e911_numbers');
+									} else {
+										callback(null, e911AvailableNumbers);
+									}
+								},
+								function(e911AvailableNumbers, callback) {
+									if (e911AvailableNumbers.length === 1) {
+										callback(null, _.head(e911AvailableNumbers).number.id);
+										return;
+									}
 
-								if (_.isUndefined(e911NumberData)) {
-									monster.ui.toast({
-										type: 'warning',
-										message: self.i18n.active().strategy.toastrMessages.noE911NumberAvailable
+									self.strategyShowNumberChoices({
+										callerIdType: 'emergency',
+										newNumbers: _.map(e911AvailableNumbers, 'number.id'),
+										save: function(number) {
+											callback(null, number);
+										}
 									});
-								} else {
+								},
+								function(numberId, callback) {
 									monster.pub('common.e911.renderPopup', {
-										phoneNumber: _.get(e911NumberData, 'phoneNumber', e911NumberData.id),
+										phoneNumber: numberId,
 										callbacks: {
 											success: function(data) {
-												afterFeatureUpdate(e911NumberData.id, data.data.features, action.callbacks);
+												callback(null, {
+													numberId: numberId,
+													features: data.data.features
+												});
 											},
 											error: function() {
-												_.has(action, 'callbacks.error')
-													&& action.callbacks.error();
+												callback(true);
 											}
 										}
 									});
 								}
-							}
+							], function(err, results) {
+								if (err && err !== 'OK') {
+									if (err === 'no_e911_numbers') {
+										monster.ui.toast({
+											type: 'warning',
+											message: self.i18n.active().strategy.toastrMessages.noE911NumberAvailable
+										});
+									} else {
+										_.has(action, 'callbacks.error') && action.callbacks.error(err);
+									}
+								} else {
+									afterFeatureUpdate(results.numberId, results.features, action.callbacks);
+								}
+							});
 						}
 					};
 
@@ -1271,7 +1322,7 @@ define(function(require) {
 					isE911Enabled = monster.util.isNumberFeatureEnabled('e911'),
 					indexToRemove = strategyData.callflows.MainCallflow.numbers.indexOf(numberToRemove.toString());
 
-				if (e911Feature === 'active' && container.find('.number-element .remove-number[data-e911="active"]').length === 1 && isE911Enabled) {
+				if (e911Feature === 'active' && container.find('.number-element .features .feature-e911').length === 1 && isE911Enabled) {
 					monster.ui.alert('error', self.i18n.active().strategy.alertMessages.lastE911Error);
 				} else if (indexToRemove >= 0) {
 					self.strategyGetNumber(numberToRemove, function(dataNumber) {
diff --git a/submodules/strategy/views/changeCallerIdPopup.html b/submodules/strategy/views/changeCallerIdPopup.html
index 68d492b..8e714ac 100644
--- a/submodules/strategy/views/changeCallerIdPopup.html
+++ b/submodules/strategy/views/changeCallerIdPopup.html
@@ -1,10 +1,14 @@
 <div class="e911-change-wrapper">
 	<div class="header">
-		{{#if oldNumber}}
-			{{ tryI18n i18n.strategy.updateCallerIdDialog.headerNewNumber callerIdType }}
+		{{#compare action "===" "choose"}}
+			{{ tryI18n i18n.strategy.updateCallerIdDialog.headerChooseNumber callerIdType }}
 		{{else}}
-			{{ tryI18n i18n.strategy.updateCallerIdDialog.headerNoNumber callerIdType }}
-		{{/if}}
+			{{#compare action "===" "add"}}
+				{{ tryI18n i18n.strategy.updateCallerIdDialog.headerAddNumber callerIdType }}
+			{{else}}
+				{{ tryI18n i18n.strategy.updateCallerIdDialog.headerRemoveNumber callerIdType }}
+			{{/compare}}
+		{{/compare}}
 	</div>
 
 	<div class="list-choices">

From e15921a72ef8ce343ab0e550c468afaa0b3b2dc5 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Mon, 11 Mar 2019 18:59:40 -0700
Subject: [PATCH 16/35] UI-3332: Update German translations (#124)

---
 i18n/de-DE.json | 144 ++++++++++++++++++++++++------------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index d6e4599..1054893 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -7,9 +7,9 @@
 		"myOffice": "Dashboard",
 		"users": "Benutzer",
 		"groups": "Gruppen",
-		"numbers": "Nummern",
+		"numbers": "Rufnummern",
 		"devices": "Geräte",
-		"mainNumber": "Hauptnummer",
+		"mainNumber": "Hauptrufnummer",
 		"callLogs": "Anrufprotokolle",
 		"quickLinks": "Hilfethemen",
 		"featureCodes": "Funktionscodes",
@@ -33,11 +33,11 @@
 	},
 
 	"groups": {
-		"addFromSpare": "Aus freien Nummern hinzufügen",
+		"addFromSpare": "Aus freien Rufnummern hinzufügen",
 		"add": "Gruppe hinzufügen",
 		"addExtension": "Nebenstelle hinzufügen",
 		"addNewExtension": "Nebenstellennummer: ",
-		"buy": "Nummern kaufen",
+		"buy": "Rufnummern kaufen",
 		"confirmDeleteGroup": "Diese Gruppe wird dauerhaft gelöscht. Vorgang fortsetzen?",
 		"delete": "Gruppe löschen",
 		"dialogCreationGroup": {
@@ -61,11 +61,11 @@
 		"noMatchingGroup": "Es konnten keine Gruppen gefunden werden, die Ihren Suchkriterien entsprechen.",
 		"noGroupsConfigured": "Fügen Sie der Gruppe zu Beginn einen Benutzer hinzu",
 		"noNumber": "Keine",
-		"noUnassignedNumbers": "Es sind keine Nummern verfügbar, die der Gruppe zugewiesen werden könnten.",
-		"noAssignedNumbers": "Dieser Gruppe sind derzeit keine Nummern zugewiesen.",
-		"noMoreSpareNumbers": "Es sind keine Nummern übrig. Sie können neue Nummern kaufen, indem Sie auf den untenstehenden Link klicken.",
-		"noMatchingNumbers": "Es konnten keine Nummern gefunden werden, die Ihren Suchkriterien entsprechen.",
-		"port": "Nummern portieren",
+		"noUnassignedNumbers": "Es sind keine Rufnummern verfügbar, die der Gruppe zugewiesen werden könnten.",
+		"noAssignedNumbers": "Dieser Gruppe sind derzeit keine Rufnummern zugewiesen.",
+		"noMoreSpareNumbers": "Es sind keine Rufnummern übrig. Sie können neue Rufnummern kaufen, indem Sie auf den untenstehenden Link klicken.",
+		"noMatchingNumbers": "Es konnten keine Rufnummern gefunden werden, die Ihren Suchkriterien entsprechen.",
+		"port": "Rufnummern portieren",
 		"ringThisMemberFor": "Dieses Mitglied aus folgendem Grund anrufen:",
 		"ringGroupMissing": "Für diese Gruppe sind keine Rufgruppen definiert (group_id fehlt in Callflow).",
 		"userDeleted": "Benutzer gelöscht",
@@ -133,7 +133,7 @@
 			"steps": {
 				"1": "Mit einem Klick auf diese Schaltfläche fügen Sie eine bestimmte Benutzergruppe hinzu. Ganz bequem per Drag&Drop können Sie Benutzer hinzufügen, einen Gruppennamen erstellen und eine Nebenstellennummer hinzufügen. Wenn Sie damit fertig sind, werden die einzelnen Benutzergruppen inklusive ihrer Einstellungen unten angezeigt.",
 				"2": "Nach Erstellung einer Benutzergruppe wird diese in dem Bereich hier angezeigt. Nehmen Sie alle erforderlichen Änderungen vor (z. B. Gruppennamen, Anzahl der Mitglieder und Nebenstellennummer).",
-				"3": "Kaufen, Portieren und Zuweisen von Nummern. Sobald der Vorgang abgeschlossen ist, wird die Nummer automatisch der spezifischen Benutzergruppe zugewiesen.",
+				"3": "Kaufen, Portieren und Zuweisen von Rufnummern. Sobald der Vorgang abgeschlossen ist, wird die Nummer automatisch der spezifischen Benutzergruppe zugewiesen.",
 				"4": "Sie können alle Benutzerfunktionen der Benutzergruppe aktivieren und deaktivieren und sie nahtlos verwalten."
 			}
 		},
@@ -198,7 +198,7 @@
 				"sectionTitle": "Notrufer-ID",
 				"emergency": "Nummer",
 				"notSet": "- Account-Standard -",
-				"noE911Numbers": "Sie haben für keine Ihrer Nummern E911 eingerichtet. Bitte richten Sie E911 über den Nummernmanager ein und kehren Sie dann zu diesem Bildschirm zurück.",
+				"noE911Numbers": "Sie haben für keine Ihrer Rufnummern E911 eingerichtet. Bitte richten Sie E911 über den Nummernmanager ein und kehren Sie dann zu diesem Bildschirm zurück.",
 				"address": "Adresse",
 				"__comment": "UI-1386: Geräte für die Verwendung des allgemeinen Steuerelements „numberSelector“ aktualisiert",
 				"__version": "v3.20_s4",
@@ -215,7 +215,7 @@
 					"zrtp": "ZRTP"
 				},
 				"outbound_privacy": {
-					"type": "Datenschutz bei der Anrufer-ID ",
+					"type": "temp. Rufnummer unterdrücken bei der Anrufer-ID ",
 					"default": "Standard",
 					"none": "Keine",
 					"number": "Nummer",
@@ -330,7 +330,7 @@
 		"classifiers": {
 			"unknown": {
 			    "name": "Sonstiges",
-			    "help": "Wählen Sie diese Option aus, wenn dieser Account Anrufe an ALLE ANDEREN NUMMERN außer an solche, die in dieser Liste aufgeführt sind, tätigen soll. (Wenn das Format der Nummer dem System unbekannt ist.)"
+			    "help": "Wählen Sie diese Option aus, wenn dieser Account Anrufe an ALLE ANDEREN Rufnummern außer an solche, die in dieser Liste aufgeführt sind, tätigen soll. (Wenn das Format der Nummer dem System unbekannt ist.)"
 			}
 		},
 		"noMatchingDevices": "Es konnten keine Geräte gefunden werden, die Ihren Suchkriterien entsprechen.",
@@ -418,9 +418,9 @@
 			"deviceName": "Gerätename"
 		},
 		"ata": {
-			"addTitle": "Hinzufügen eines ATA",
-			"editTitle": "Bearbeiten des ATA: {{name}}",
-			"new": "Neuer ATA",
+			"addTitle": "Hinzufügen eines analog Adapter",
+			"editTitle": "Bearbeiten des analog Adapter: {{name}}",
+			"new": "Neuer analog Adapter",
 			"deviceName": "Gerätename"
 		},
 		"sip": {
@@ -445,7 +445,7 @@
 			"softphone": "Softphone",
 			"landline": "Festnetz",
 			"fax": "Fax",
-			"ata": "ATA",
+			"ata": "analog Adapter",
 			"sip_uri": "SIP-URI"
 		},
 		"unassignedDevice": "–"
@@ -456,9 +456,9 @@
 		"add": "Benutzer hinzufügen",
 		"addExtension": "Diesem Benutzer eine Nebenstelle hinzufügen",
 		"addNewExtension": "Nebenstellennummer: ",
-		"addFromSpare": "Aus freien Nummern hinzufügen",
+		"addFromSpare": "Aus freien Rufnummern hinzufügen",
 		"addFromSpareDevices": "Aus freien Geräten hinzufügen",
-		"buy": "Nummern kaufen",
+		"buy": "Rufnummern kaufen",
 		"dialogChangePassword": {
 			"help": "Sie können ein neues Kennwort hinzufügen, indem Sie ein beliebiges Kennwort mit der E-Mail-Adresse eintippen!",
 			"password": "Kennwort",
@@ -489,7 +489,7 @@
 			"password": "Kennwort (mind. 6 Zeichen)",
 			"sendToDifferentEmail": "E-Mails an andere Adresse senden",
 			"title": "Benutzer erstellen",
-			"vmboxAlreadyExist": "VMBox-Nummer ist bereits vergeben. Bitte wählen Sie eine andere Voicemailbox-Nummer.",
+			"vmboxAlreadyExist": "VMBox-Nummer ist bereits vergeben. Bitte wählen Sie eine andere Anrufbeantworter-Nummer.",
 			"vmboxNumber": "VM-Box Nr.",
 			"__comment": "UI-814: Option zur automatischen Versendung einer E-Mail bei Benutzererstellung hinzugefügt",
 			"__version": "3.20_s3",
@@ -516,14 +516,14 @@
 			"__version": "3.19",
 			"nameHelp": "Geben Sie den Vornamen des Benutzers in den ersten Eintrag und seinen Nachnamen in den zweiten Eintrag ein",
 			"loginHelp": "Dies ist der Benutzername dieses Benutzers. Er wird zur Anmeldung auf der Anwendung verwendet",
-			"vmboxHelp": "Dies ist die Nummer des Anrufbeantworters für diesen Benutzer. Klicken Sie auf „PIN ändern“, um die PIN der Voicemailbox für diesen Benutzer zurückzusetzen",
+			"vmboxHelp": "Dies ist die Nummer des Anrufbeantworters für diesen Benutzer. Klicken Sie auf „PIN ändern“, um die PIN der Anrufbeantworter für diesen Benutzer zurückzusetzen",
 			"roleHelp": "Der „Admin“ hat die Berechtigung, auf AppExchange zuzugreifen und diesem Konto Apps hinzuzufügen. Der „Benutzer“ dagegen kann nur auf die Apps zugreifen, die für ihn aktiviert wurden",
 			"languageHelp": "Ändert die Sprache der UI",
 			"timezoneHelp": "Legt die Zeitzone für die Geräte und die Nummer des Anrufbeantworters dieses Benutzers fest",
-			"ringingHelp": "Legt die Rufzeichen-Zeitüberschreitung für diesen Benutzer und seine Geräte fest. Wenn Sie zum Beispiel den Wert 20 festlegen, klingelt es bei diesem Benutzer 20 Sekunden lang, bevor das System den Anruf auf dessen Voicemailbox umschaltet",
+			"ringingHelp": "Legt die Rufzeichen-Zeitüberschreitung für diesen Benutzer und seine Geräte fest. Wenn Sie zum Beispiel den Wert 20 festlegen, klingelt es bei diesem Benutzer 20 Sekunden lang, bevor das System den Anruf auf dessen Anrufbeantworter umschaltet",
 			"mainExtensionHelp": "Definiert die Anrufer-ID für diesen Benutzer für Anrufe innerhalb des Systems und seine Anwesenheits-ID für diese Nummer",
 			"outbound_privacy": {
-				"type": "Datenschutz bei der Anrufer-ID ",
+				"type": "temp. Rufnummer unterdrücken bei der Anrufer-ID ",
 				"default": "Standard",
 				"none": "Keine",
 				"number": "Nummer",
@@ -533,27 +533,27 @@
 		},
 		"delete": "Benutzer löschen",
 		"errorCallerId": "Bevor Sie die Anrufer-ID dieses Benutzers konfigurieren, müssen Sie ihm eine Nummer zuweisen",
-		"errorNumberFaxing": "Bevor Sie die Faxnummer dieses Benutzers konfigurieren, benötigen Sie freie Nummern auf Ihrem Account (Sie können neue Nummern im Abschnitt „Nummern“ im linken Menü kaufen).",
+		"errorNumberFaxing": "Bevor Sie die Faxnummer dieses Benutzers konfigurieren, benötigen Sie freie Rufnummern auf Ihrem Account (Sie können neue Rufnummern im Abschnitt „Rufnummern“ im linken Menü kaufen).",
 		"featureOn": "EIN",
 		"includeInDirectory": "Benutzer ins Unternehmensverzeichnis aufnehmen",
 		"noMatchingDevices": "Keine Geräte gefunden, die Ihrer Suche entsprachen",
-		"noMatchingNumbers": "Es konnten keine Nummern gefunden werden, die Ihren Suchkriterien entsprechen.",
+		"noMatchingNumbers": "Es konnten keine Rufnummern gefunden werden, die Ihren Suchkriterien entsprechen.",
 		"noMatchingUser": "Keine Daten gefunden, die Ihrer Suche entsprachen",
 		"noUsersConfigured": "Fügen Sie zu Beginn einen Benutzer hinzu",
 		"noMoreSpareDevices": "Es sind keine freien Geräte übrig. Sie können im Geräteinventar neue Geräte kaufen",
-		"noMoreSpareNumbers": "Es sind keine Nummern übrig. Sie können neue Nummern kaufen, indem Sie auf den untenstehenden Link klicken.",
+		"noMoreSpareNumbers": "Es sind keine Rufnummern übrig. Sie können neue Rufnummern kaufen, indem Sie auf den untenstehenden Link klicken.",
 		"noAssignedDevices": "Derzeit sind diesem Benutzer keine Geräte zugewiesen.",
 		"noAssignedExtensions": "Derzeit sind diesem Benutzer keine Nebenstellen zugewiesen.",
 		"noNumber": "Keine",
 		"noNumberCallflow": "Sie müssen diesem Benutzer mindestens eine Nebenstelle oder Telefonnummer zuweisen, bevor Sie speichern",
 		"needExtensionFirst": "Benutzer benötigen eine Nebenstelle, bevor ihnen eine Telefonnummer zugewiesen werden kann. Bitte klicken Sie auf den Abschnitt „Nebenstelle“ und fügen Sie dort eine hinzu.",
 		"noExtension": "Keine",
-		"noAssignedNumbers": "Diesem Benutzer sind keine Nummern zugewiesen.",
-		"noUnassignedNumbers": "Es sind keine freien Nummern verfügbar, die dem Benutzer zugewiesen werden könnten.",
+		"noAssignedNumbers": "Diesem Benutzer sind keine Rufnummern zugewiesen.",
+		"noUnassignedNumbers": "Es sind keine freien Rufnummern verfügbar, die dem Benutzer zugewiesen werden könnten.",
 		"noUserDevices": "Keine",
 		"noUserFeatures": "Keine",
 		"noUserCallflow": "Es ist ein Fehler aufgetreten. Da diesem Benutzer keine Callflows zugewiesen sind, können Sie ihn nicht dem Unternehmensverzeichnis hinzufügen",
-		"port": "Nummern portieren",
+		"port": "Rufnummern portieren",
 		"resetPassword": "Kennwort zurücksetzen",
 		"resendInstructions": "Anweisungen erneut senden",
 		"title": "Benutzer insgesamt",
@@ -594,9 +594,9 @@
 			"deskphone": "Ein Festnetztelefon",
 			"number": "Diese Nummer",
 			"placeholder": "+49 123 4567890",
-			"requireKeyPress": "Sprachnachricht für weitergeleitete Nummern hinterlassen",
+			"requireKeyPress": "Sprachnachricht für weitergeleitete Rufnummern hinterlassen",
 			"title": "Anrufweiterleitung",
-			"timeoutWarning": "Um Sprachnachrichten für weitergeleitete Nummern zu hinterlassen, muss Ihre Rufzeichen-Zeitüberschreitung mindestens 30 Sekunden betragen. Wenn Sie jetzt speichern, werden Sie automatisch in die Benutzereinstellungen weitergeleitet, wo Sie die Rufzeichen-Zeitüberschreitung aktualisieren können.",
+			"timeoutWarning": "Um Sprachnachrichten für weitergeleitete Rufnummern zu hinterlassen, muss Ihre Rufzeichen-Zeitüberschreitung mindestens 30 Sekunden betragen. Wenn Sie jetzt speichern, werden Sie automatisch in die Benutzereinstellungen weitergeleitet, wo Sie die Rufzeichen-Zeitüberschreitung aktualisieren können.",
 			"__comment": ": Modus für Failover bei Anrufweiterleitung hinzugefügt",
 			"__version": "4.0",
 			"failoverWarning": "Im „Failover-Modus“ haben die Anrufweiterleitungseinstellungen nur dann Geltung, wenn keines der Geräte dieses Benutzers registriert ist.",
@@ -640,7 +640,7 @@
 			"pinLabel": "Nummer des persönlichen Konferenzraums",
 			"number": "Konferenztelefonnummer(n)",
 			"help": "Sie können einen Konferenzanruf erstellen, indem Sie den Teilnehmern eine Konferenztelefonnummer und Ihre persönliche Zimmernummer bereitstellen",
-			"noConfNumbers": "Sie müssen eine Haupt-Konferenznummer (Im Abschnitt „Hauptnummer“ auf der linken Seite des SmartPBX) hinzufügen, um die persönlichen Konferenzbrücken zu aktivieren"
+			"noConfNumbers": "Sie müssen eine Haupt-Konferenznummer (Im Abschnitt „Hauptrufnummer“ auf der linken Seite des SmartPBX) hinzufügen, um die persönlichen Konferenzbrücken zu aktivieren"
 		},
 		"do_not_disturb": {
 			"headline": "Benutzereinstellungen für „Bitte nicht stören“",
@@ -705,7 +705,7 @@
 			"currentCallerIdLabel": "Aktuelle Anrufer-ID: ",
 			"none": "Keine",
 			"headline": "Einstellungen für Benutzer-Anrufer-ID-Nummer",
-			"help": "Wenn Sie diese Funktion nicht aktivieren, wird die standardmäßig angezeigte Anrufer-ID diejenige sein, die auf der Hauptnummer dieses Accounts konfiguriert ist."
+			"help": "Wenn Sie diese Funktion nicht aktivieren, wird die standardmäßig angezeigte Anrufer-ID diejenige sein, die auf der Hauptrufnummer dieses Accounts konfiguriert ist."
 		},
 		"music_on_hold": {
 			"title": "Warteschleifenmusik",
@@ -730,7 +730,7 @@
 		"__version": "3.19",
 		"migration": {
 			"confirmMigration": "Für die Nummer, die Sie hinzufügen möchten, wurde ein Callflow gefunden. Offenbar können wir diesen Callflow nach SmartPBX migrieren. Bevor wir damit fortfahren, sollte Ihnen bewusst sein, dass Sie diesen Callflow nach dieser Änderung nicht mehr in der Kazoo-UI oder in der Monster-UI-Callflows-App aktualisieren können. Möchten Sie den Vorgang fortsetzen?",
-			"tooManyCallflows": "Offenbar gehören die Nummern, die Sie hinzufügen möchten, zu mehreren Kazoo-UI-Callflows. Diese Callflows können nicht ordnungsgemäß in die Monster-UI migriert werden. Bitte wenden Sie sich für Hilfe an den Support."
+			"tooManyCallflows": "Offenbar gehören die Rufnummern, die Sie hinzufügen möchten, zu mehreren Kazoo-UI-Callflows. Diese Callflows können nicht ordnungsgemäß in die Monster-UI migriert werden. Bitte wenden Sie sich für Hilfe an den Support."
 		},
 		"__commment": "UI-1109: Pop-up für Änderung der Anwesenheits-ID hinzugefügt",
 		"__version": "3.19",
@@ -753,7 +753,7 @@
 				"1": "Fügen Sie einen bestimmten Benutzer hinzu, indem Sie auf die Schaltfläche klicken und seine Angaben ausfüllen. Sobald dies abgeschlossen ist, werden alle Benutzer und ihre Einstellungen unten eingetragen angezeigt.",
 				"2": "Sobald ein Benutzer erstellt wurde, wird dieser Bereich aktualisiert. Nehmen Sie alle erforderlichen Änderungen für diesen Benutzer in den Benutzereinstellungen vor",
 				"3": "Stellen Sie Benutzern ihre eigenen eindeutigen Direktwahl-Nebenstellen zur Verfügung.",
-				"4": "Klicken Sie auf die Schaltfläche zum Kaufen, Portieren und Zuweisen von Nummern. Sobald der Vorgang abgeschlossen ist, wird die Nummer automatisch dem bestimmten Benutzer zugewiesen.",
+				"4": "Klicken Sie auf die Schaltfläche zum Kaufen, Portieren und Zuweisen von Rufnummern. Sobald der Vorgang abgeschlossen ist, wird die Nummer automatisch dem bestimmten Benutzer zugewiesen.",
 				"5": "Autoprovisioning für eines unserer unterstützten Geräte. Die UI verfügt über eine Liste mit Herstellern und Geräten. Sobald der Vorgang abgeschlossen ist, wird es automatisch dem jeweiligen Benutzer zugewiesen.",
 				"6": "Verwalten Sie, auf welche Funktionen Benutzer zugreifen dürfen. Sie können alle spezifischen Benutzerfunktionen aktivieren, deaktivieren und verwalten."
 			}
@@ -777,7 +777,7 @@
 	},
 
 	"strategy": {
-		"noNumberHelp": "Hinweis: Fügen Sie Ihrem Account zuerst eine Haupt-Büronummer hinzu. Sobald Sie eine Hauptnummer hinzufügen, können Sie Bürozeiten, Feiertage und die Verarbeitung eingehender Anrufe (Callflow) für Ihr Büro einrichten.",
+		"noNumberHelp": "Hinweis: Fügen Sie Ihrem Account zuerst eine Haupt-Büronummer hinzu. Sobald Sie eine Hauptrufnummer hinzufügen, können Sie Bürozeiten, Feiertage und die Verarbeitung eingehender Anrufe (Callflow) für Ihr Büro einrichten.",
 		"sectionTitles": {
 			"numbers": "Haupt-Unternehmensnummern",
 			"confnum": "Haupt-Konferenznummer",
@@ -788,18 +788,18 @@
 			"__version": "3.22",
 			"faxingnum": "Haupt-Faxboxnummer"
 		},
-		"noNumberTitle": "Hauptnummer hinzufügen",
+		"noNumberTitle": "Hauptrufnummer hinzufügen",
 		"noNumberMessage": "Fügen Sie eine Nummer aus den untenstehenden Links hinzu oder kaufen Sie eine, um fortzufahren.",
 		"noConfNumMessage": "Fügen Sie eine Haupt-Konferenznummer hinzu.",
 		"numberLinks": {
-			"spare": "Aus freien Nummern hinzufügen",
+			"spare": "Aus freien Rufnummern hinzufügen",
 			"buy": {
-				"link": "Nummern kaufen",
+				"link": "Rufnummern kaufen",
 				"regular": "Lokal",
 				"tollfree": "Gebührenfrei",
 				"vanity": "Vanity"
 			},
-			"port": "Nummern portieren"
+			"port": "Rufnummern portieren"
 		},
 		"hours": {
 			"alwaysOpenTitle": "Durchgehend geöffnet",
@@ -915,7 +915,7 @@
 			"__comment": "UI-1353: Verzeichnisunterstützung für den virtuellen Empfang hinzugefügt",
 			"__version": "v3.20_s4",
 			"directory": "Verzeichnis",
-			"__comment": "UI-1742: In „Hauptnummer“ kann nun ein Callflow ausgewählt werden, der unter „Erweiterte Callflows“ erstellt wurde",
+			"__comment": "UI-1742: In „Hauptrufnummer“ kann nun ein Callflow ausgewählt werden, der unter „Erweiterte Callflows“ erstellt wurde",
 			"__version": "3.22",
 			"advancedCallflows": "Erweiterte Callflows",
 			"__comment": "UI-1886: In „Virtueller Empfang“ kann jetzt ein Medium ausgewählt werden",
@@ -932,14 +932,14 @@
 			"emptyTtsGreeting": "Um die Text-zu-Sprache-Funktion zu aktivieren, müssen Sie Ihre Ansage eingeben.",
 			"emptyUploadGreeting": "Wählen Sie eine Datei zum Hochladen aus",
 			"fileTooBigAlert": "Sie können keine Datei größer 5 MB hochladen",
-			"uniqueMenuNumbers": "Nummern im Menü müssen eindeutig und vollständig sein.",
-			"lastE911Error": "Sie müssen für mindestens eine Ihrer Hauptnummern die Notruffunktion (e911) eingerichtet haben. Daher müssen Sie erst e911 für eine andere Hauptnummer festlegen, bevor Sie diese löschen können."
+			"uniqueMenuNumbers": "Rufnummern im Menü müssen eindeutig und vollständig sein.",
+			"lastE911Error": "Sie müssen für mindestens eine Ihrer Hauptnummern die Notruffunktion (e911) eingerichtet haben. Daher müssen Sie erst e911 für eine andere Hauptrufnummer festlegen, bevor Sie diese löschen können."
 		},
 		"toastrMessages": {
 			"updateHolidaySuccess": "Feiertage wurden aktualisiert.",
 			"updateCallSuccess": "Anrufstrategie wurde aktualisiert.",
-			"buyNumbersSuccess": "Nummern wurden gekauft.",
-			"buyNumbersError": "Beim Kauf von Nummern ist ein Fehler aufgetreten.",
+			"buyNumbersSuccess": "Rufnummern wurden gekauft.",
+			"buyNumbersError": "Beim Kauf von Rufnummern ist ein Fehler aufgetreten.",
 			"removeNumberSuccess": "Nummer wurde aus dem Haupt-Callflow entfernt."
 		},
 		"popupRemoveFeatures": {
@@ -1108,28 +1108,28 @@
 			"emergencyCity": "Ort",
 			"emergencyState": "Bundesland/Kanton",
 			"emergencyHelp1": "Diese Adresse wird als Ihre Anrufer-ID-Adresse angezeigt, wenn Sie einen ausgehenden Notruf an eine Behörde tätigen (z. B. 911 in den USA).",
-			"emergencyHelp2": "Hinweis: Sie können diese Funktion auch für Nummern von Benutzern festlegen, wenn sich diese an einem anderen Standort als oben angegeben befinden.",
+			"emergencyHelp2": "Hinweis: Sie können diese Funktion auch für Rufnummern von Benutzern festlegen, wenn sich diese an einem anderen Standort als oben angegeben befinden.",
 			"mandatoryE911Alert": "Sie müssen für Ihre Unternehmens-Anrufer-ID-Nummer e911-Informationen angeben."
 		},
-		"missingMainNumberForCallerId": "Bevor Sie die Anrufer-ID konfigurieren können, müssen Sie eine Hauptnummer zu Ihrem Büro hinzufügen!",
-		"missingMainNumberMessage": "Fügen Sie Ihrem Account eine Hauptnummer hinzu.",
+		"missingMainNumberForCallerId": "Bevor Sie die Anrufer-ID konfigurieren können, müssen Sie eine Hauptrufnummer zu Ihrem Büro hinzufügen!",
+		"missingMainNumberMessage": "Fügen Sie Ihrem Account eine Hauptrufnummer hinzu.",
 		"totalUsers": "Benutzer insgesamt",
 		"totalDevices": "Alle Geräte",
 		"totalConfs": "Konferenzbrücken",
-		"mainNumberLabel": "Hauptnummer",
-		"noMainNumber": "Hauptnummer hinzufügen",
+		"mainNumberLabel": "Hauptrufnummer",
+		"noMainNumber": "Hauptrufnummer hinzufügen",
 		"confNumberLabel": "Konferenznummer",
 		"faxNumberLabel": "Faxnummer",
-		"totalNumbers": "Nummern insgesamt",
+		"totalNumbers": "Rufnummern insgesamt",
 		"unregisteredDevices": "Nicht registrierte Geräte",
 		"accountId": "Account-ID:",
 		"accountRealm": "Account-Bereich:",
 		"numberChartLegend": {
-			"assigned": "Zugewiesene Nummern",
-			"spare": "Freie Nummern",
+			"assigned": "Zugewiesene Rufnummern",
+			"spare": "Freie Rufnummern",
 			"local": "Ortsnummern",
-			"tollfree": "Gebührenfreie Nummern",
-			"international": "Internationale Nummern",
+			"tollfree": "Gebührenfreie Rufnummern",
+			"international": "Internationale Rufnummern",
 			"noNumber": "Keine Nummer verfügbar"
 		},
 		"__comment": "UI-1220: Wenn jemand SmartPBX das erste Mal lädt und keinen Anrufbeantworter besitzt, wird automatisch ein zentraler Anrufbeantworter hinzugefügt",
@@ -1146,17 +1146,17 @@
 		"__version": "3.23",
 		"walkthrough": {
 			"steps": {
-				"1": "Willkommen bei SmartPBX, der einfachen Methode, Ihr Bürotelefonsystem einzurichten! Dies ist das Haupt-Dashboard. Hier haben Sie einen Überblick über alle Benutzer, Geräte und Nummern!",
-				"2": "Mit SmartPBX ist die Einrichtung von Benutzern ein Kinderspiel. Den Großteil Ihrer Services können Sie über die Registerkarte „Benutzer“ erstellen und verwalten. Erstellen Sie neue Benutzer, weisen Sie Nummern zu, fügen Sie Geräte hinzu und verwalten Sie Benutzerfunktionen.",
+				"1": "Willkommen bei SmartPBX, der einfachen Methode, Ihr Bürotelefonsystem einzurichten! Dies ist das Haupt-Dashboard. Hier haben Sie einen Überblick über alle Benutzer, Geräte und Rufnummern!",
+				"2": "Mit SmartPBX ist die Einrichtung von Benutzern ein Kinderspiel. Den Großteil Ihrer Services können Sie über die Registerkarte „Benutzer“ erstellen und verwalten. Erstellen Sie neue Benutzer, weisen Sie Rufnummern zu, fügen Sie Geräte hinzu und verwalten Sie Benutzerfunktionen.",
 				"3": "Sobald Sie genügend Benutzer erstellt haben, können Sie Benutzergruppen erstellen. Das ist außerordentlich nützlich, wenn mehrere Benutzer in derselben Abteilung arbeiten, wie etwa ein Vertriebsteam.",
-				"4": "Hauptnummer-Services sind für Ihr Geschäft äußerst wichtig! Mit dem virtuellen Empfang können Sie die Anrufverarbeitung verwalten und Anrufe abhängig von Öffnungszeiten und Feiertagen umleiten."
+				"4": "Hauptrufnummer-Services sind für Ihr Geschäft äußerst wichtig! Mit dem virtuellen Empfang können Sie die Anrufverarbeitung verwalten und Anrufe abhängig von Öffnungszeiten und Feiertagen umleiten."
 			}
 		},
 		"__comment": "UI-1856: Im Dashboard werden CNAM-Aktionen ausgeblendet, wenn die Funktion für den Account deaktiviert ist",
 		"__version": "3.23",
-		"missingCnamE911Message": "Richten Sie Ihre Unternehmens-Anrufer-ID und e911 für eine Hauptnummer ein.",
-		"missingCnamMessage": "Richten Sie Ihre Unternehmens-Anrufer-ID für eine Hauptnummer ein.",
-		"missingE911Message": "Richten Sie e911 für eine Hauptnummer ein.",
+		"missingCnamE911Message": "Richten Sie Ihre Unternehmens-Anrufer-ID und e911 für eine Hauptrufnummer ein.",
+		"missingCnamMessage": "Richten Sie Ihre Unternehmens-Anrufer-ID für eine Hauptrufnummer ein.",
+		"missingE911Message": "Richten Sie e911 für eine Hauptrufnummer ein.",
 
 		"userChartLegend": {
 			"none": "Keine Rolle"
@@ -1166,8 +1166,8 @@
 	"__comment": "UI-299, v3.19_s2: Registerkarte „Funktionscodes“ zu SmartPBX hinzugefügt.",
 	"featureCodes": {
 		"title": "Verfügbare Funktionscodes",
-		"noFeatureCodeMessage": "Für Ihren Account sind noch keine Funktionscodes aktiviert. Funktionscodes werden automatisch erstellt, wenn Sie die Seite „Hauptnummer“ laden.",
-		"mainNumberLink": "Gehe zu „Hauptnummer“",
+		"noFeatureCodeMessage": "Für Ihren Account sind noch keine Funktionscodes aktiviert. Funktionscodes werden automatisch erstellt, wenn Sie die Seite „Hauptrufnummer“ laden.",
+		"mainNumberLink": "Gehe zu „Hauptrufnummer“",
 		"labels": {
 			"qubicle login": {
 				"label": "Agentenanmeldung",
@@ -1230,15 +1230,15 @@
 				"tooltip": "(Eingabe von *13 plus der Hotdesk-ID) Damit wird der Hotdesk auf Geräten ein-/ausgeschaltet."
 			},
 			"voicemail[action=check]": {
-				"label": "Voicemail überprüfen",
+				"label": "Anrufbeantworter abhören",
 				"tooltip": "(Eingabe von *97 plus Nebenstellennummer) Damit können Sie sich in anderen Mailboxen anmelden."
 			},
 			"voicemail[action=\"direct\"]": {
-				"label": "An Voicemail weiterleiten",
+				"label": "Zum Anrufbeantworter weiterleiten",
 				"tooltip": "(Drücken Sie auf „Weiterleiten“, dann ** und die Nebenstellennummer des Empfängers) Der Anruf wird direkt zur Voicemail durchgestellt."
 			},
 			"voicemail[single_mailbox_login]": {
-				"label": "Voicemail überprüfen (automatische Anmeldung)",
+				"label": "Anrufbeantworter abhören (automatische Anmeldung)",
 				"tooltip": "(Eingabe von *98 und des Kennworts) Wenn automatische Anmeldung aktiviert ist, benötigen Sie kein Kennwort."
 			},
 			"intercom": {
@@ -1246,7 +1246,7 @@
 				"tooltip": "(Eingabe von *0 plus der Nebenstellennummer) Wenn das Telefon die Gegensprechanlagefunktion unterstützt, wird es den Anruf ohne manuelle Eingriffe entgegennehmen, und Sie können dann frei sprechen."
 			},
 			"privacy[mode=full]": {
-				"label": "Datenschutz",
+				"label": "temp. Rufnummer unterdrücken",
 				"tooltip": "(Eingabe von *67 plus der Nummer, die Sie anrufen möchten) Dadurch wird Ihre Anrufer-ID unterdrückt."
 			},
 			"park_and_retrieve": {
@@ -1368,7 +1368,7 @@
 				},
 				"autoLogin": {
 					"label": "Automatische Anmeldung aktiviert?",
-					"help": "Aktivieren, um automatische Anmeldung für diese Voicemailbox zu aktivieren. (Wenn der Benutzer seinen eigenen Anrufbeantworter anruft, gelangt er direkt zu seinen Nachrichten.)"
+					"help": "Aktivieren, um automatische Anmeldung für diese Anrufbeantworter zu aktivieren. (Wenn der Benutzer seinen eigenen Anrufbeantworter anruft, gelangt er direkt zu seinen Nachrichten.)"
 				},
 				"skipGreetings": {
 					"label": "Ansagen überspringen?",
@@ -1399,10 +1399,10 @@
 			"recipients": {
 				"menuTitle": "Empfänger",
 				"sectionTitle": "Empfänger",
-				"header": "In diesem Bereich können Sie verwalten, wer benachrichtigt werden soll, wenn in dieser Voicemailbox eine Nachricht eingeht. Klicken Sie auf „Neuen Empfänger hinzufügen“, um der Liste eine E-Mail-Adresse hinzuzufügen",
+				"header": "In diesem Bereich können Sie verwalten, wer benachrichtigt werden soll, wenn in dieser Anrufbeantworter eine Nachricht eingeht. Klicken Sie auf „Neuen Empfänger hinzufügen“, um der Liste eine E-Mail-Adresse hinzuzufügen",
 				"create": "Neuen Empfänger hinzufügen"
 			},
-			"__comment": "UI-975: Voranstellen-Funktion („Prepend“) zu Nummern hinzugefügt",
+			"__comment": "UI-975: Voranstellen-Funktion („Prepend“) zu Rufnummern hinzugefügt",
 			"__version": "v3.22",
 			"greeting": {
 				"menuTitle": "Ansagen-Medien",
@@ -1420,10 +1420,10 @@
 		}
 	},
 
-	"__comment": "UI-1219: Voranstellen-Funktion („Prepend“) zu Nummern hinzugefügt",
+	"__comment": "UI-1219: Voranstellen-Funktion („Prepend“) zu Rufnummern hinzugefügt",
 	"__version": "v3.20_s1",
 	"numberPrepend": "Voranstellen",
-	"__comment": "UI-1153: Warnungssymbol neben Nummern einblenden, die weitergeleitet werden",
+	"__comment": "UI-1153: Warnungssymbol neben Rufnummern einblenden, die weitergeleitet werden",
 	"__version": "v3.20_s3",
 	"portIconHelp": "Diese Nummer wird gerade portiert; und wenn die Portierung fehlschlägt, wird sie gelöscht. Das Symbol wird nur bei der Einrichtung angezeigt und hat keine Funktion bei der Anrufverarbeitung"
 }

From 9284cd8ced5196862a9756b07f28ed5568fdfb17 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Tue, 12 Mar 2019 09:57:35 -0700
Subject: [PATCH 17/35] UI-3333: Show media upload disclosure message depending
 on config flag (#125)

---
 submodules/groups/groups.js                       |  1 +
 submodules/groups/views/feature-ringback.html     |  8 ++++++++
 submodules/myOffice/myOffice.js                   |  1 +
 submodules/myOffice/views/musicOnHoldPopup.html   | 10 +++++++++-
 submodules/users/users.js                         |  1 +
 submodules/users/views/feature-music_on_hold.html |  8 ++++++++
 6 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 2c87159..0e2568a 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -672,6 +672,7 @@ define(function(require) {
 
 			self.groupsListMedias(function(medias) {
 				var templateData = {
+						showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
 						group: data.group,
 						silenceMedia: silenceMediaId,
 						mediaList: medias,
diff --git a/submodules/groups/views/feature-ringback.html b/submodules/groups/views/feature-ringback.html
index a3dd28c..e25161f 100644
--- a/submodules/groups/views/feature-ringback.html
+++ b/submodules/groups/views/feature-ringback.html
@@ -32,6 +32,14 @@
 			<input type="file" class="upload-input" accept="audio/*">
 			<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
 			<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
+		{{#if showMediaUploadDisclosure}}
+			<div>
+				<br>
+				{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
+					{{i18n.mediaUploadDisclosure.text}}
+				{{/monsterPanelText}}
+			</div>
+		{{/if}}
 		</div>
 	</div>
 
diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index d3c5f38..fd7be70 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -763,6 +763,7 @@ define(function(require) {
 
 			self.myOfficeListMedias(function(medias) {
 				var templateData = {
+						showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
 						silenceMedia: silenceMediaId,
 						mediaList: medias,
 						media: 'music_on_hold' in account && 'media_id' in account.music_on_hold ? account.music_on_hold.media_id : undefined
diff --git a/submodules/myOffice/views/musicOnHoldPopup.html b/submodules/myOffice/views/musicOnHoldPopup.html
index ae8703a..69ba937 100644
--- a/submodules/myOffice/views/musicOnHoldPopup.html
+++ b/submodules/myOffice/views/musicOnHoldPopup.html
@@ -28,6 +28,14 @@
 			<input type="file" class="upload-input" accept="audio/*">
 			<button type="button" class="monster-button monster-button-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
 			<button type="button" class="monster-button monster-button-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
+		{{#if showMediaUploadDisclosure}}
+			<div>
+				<br>
+				{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
+					{{i18n.mediaUploadDisclosure.text}}
+				{{/monsterPanelText}}
+			</div>
+		{{/if}}
 		</div>
 	</div>
 
@@ -37,4 +45,4 @@
 			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 13b9b84..6f62417 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -3069,6 +3069,7 @@ define(function(require) {
 
 			self.usersListMedias(function(medias) {
 				var templateData = {
+						showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
 						user: currentUser,
 						silenceMedia: silenceMediaId,
 						mediaList: medias,
diff --git a/submodules/users/views/feature-music_on_hold.html b/submodules/users/views/feature-music_on_hold.html
index af551bf..9949f2c 100644
--- a/submodules/users/views/feature-music_on_hold.html
+++ b/submodules/users/views/feature-music_on_hold.html
@@ -32,6 +32,14 @@
 			<input type="file" class="upload-input" accept="audio/*">
 			<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
 			<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
+		{{#if showMediaUploadDisclosure}}
+			<div>
+				<br>
+				{{#monsterPanelText i18n.mediaUploadDisclosure.title "info" "fill-width"}}
+					{{i18n.mediaUploadDisclosure.text}}
+				{{/monsterPanelText}}
+			</div>
+		{{/if}}
 		</div>
 	</div>
 

From d3506861de89560af1f461ef4f1b2eae3e93df25 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Tue, 12 Mar 2019 18:43:02 -0700
Subject: [PATCH 18/35] UI-3332: Add German translation for voicemail box user
 feature (#127)

---
 i18n/de-DE.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index 1054893..02ec8b6 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -688,7 +688,11 @@
 			}
 		},
 		"vmbox": {
-			"deleteAfterNotify": "Nach dem Senden der Benachrichtigung Nachrichten aus Datenbank löschen."
+			"deleteAfterNotify": "Nach dem Senden der Benachrichtigung Nachrichten aus Datenbank löschen.",
+			"headline": "Anrufbeantworter für Benutzer",
+			"label": "Für diesen Benutzer steht ein Anrufbeantworter zur Verfügung.",
+			"sendVmToEmail": "Senden Sie für jede neue Sprachnachricht eine E-Mail.",
+			"title": "Anrufbeantworter"
 		},
 		"find_me_follow_me": {
 			"title": "Find Me/Follow Me",

From 4264174a8131259c5d95eb323e31f9fa5ea0e083 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Wed, 13 Mar 2019 10:03:34 -0700
Subject: [PATCH 19/35] UI-3333: Show media upload disclosure notice for
 virtual receptionist (#128)

---
 submodules/strategy/strategy.js          | 1 +
 submodules/strategy/views/menuPopup.html | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index b0e6a04..a68377f 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -2857,6 +2857,7 @@ define(function(require) {
 							template = $(self.getTemplate({
 								name: 'menuPopup',
 								data: {
+									showMediaUploadDisclosure: monster.config.whitelabel.showMediaUploadDisclosure,
 									menu: menu,
 									greeting: greeting,
 									greetingFiles: greetingFiles,
diff --git a/submodules/strategy/views/menuPopup.html b/submodules/strategy/views/menuPopup.html
index 7fa1f07..f78ef5b 100644
--- a/submodules/strategy/views/menuPopup.html
+++ b/submodules/strategy/views/menuPopup.html
@@ -49,6 +49,11 @@
 								{{#monsterText}}
 									{{i18n.strategy.popup.greetingsHelp}}
 								{{/monsterText}}
+							{{#if showMediaUploadDisclosure}}
+								{{#monsterText}}
+									{{i18n.mediaUploadDisclosure.text}}
+								{{/monsterText}}
+							{{/if}}
 								<input type="file" class="upload-input" accept="audio/*">
 								<div class="greeting-option-actions clearfix">
 									<button class="update-greeting pull-right monster-button-mini monster-button-primary">{{i18n.update}}</button>

From b638a884cb750356836480104c437bb34b0b70a8 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Thu, 14 Mar 2019 09:32:41 -0700
Subject: [PATCH 20/35] UI-3332: Add missing German translations (#129)

* Add missing German translation

* Replace hard coded string from HTML with i18n reference
---
 i18n/de-DE.json                           | 7 ++++---
 i18n/en-US.json                           | 4 ++--
 submodules/users/views/feature-vmbox.html | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index 02ec8b6..dd8b0c1 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -690,9 +690,10 @@
 		"vmbox": {
 			"deleteAfterNotify": "Nach dem Senden der Benachrichtigung Nachrichten aus Datenbank löschen.",
 			"headline": "Anrufbeantworter für Benutzer",
-			"label": "Für diesen Benutzer steht ein Anrufbeantworter zur Verfügung.",
-			"sendVmToEmail": "Senden Sie für jede neue Sprachnachricht eine E-Mail.",
-			"title": "Anrufbeantworter"
+			"text": "Für diesen Benutzer steht ein Anrufbeantworter zur Verfügung.",
+			"label": "Voicemail-zu-Email",
+			"title": "Anrufbeantworter",
+			"vmToEmailHelp": "Für jede neue Sprachnachricht wird eine E-Mail an {{variable}} gesendet. Wenn Sie den Empfänger dieser E-Mail-Benachrichtigungen ändern möchten, bearbeiten Sie bitte die E-Mail-Adresse des Benutzers im Abschnitt Benutzerverwaltung."
 		},
 		"find_me_follow_me": {
 			"title": "Find Me/Follow Me",
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 0083c3f..9d67fb6 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -701,8 +701,8 @@
 		"vmbox": {
 			"deleteAfterNotify": "Delete messages from database after sending the notification.",
 			"headline": "User Voicemail Box",
-			"label": "A voicemail box will be available for this user.",
-			"sendVmToEmail": "Send an e-mail to {{variable}} for every new voicemail.",
+			"text": "A voicemail box will be available for this user.",
+			"label": "Voicemail to e-mail:",
 			"title": "Voicemail Box",
 			"vmToEmailHelp": "An e-mail will be sent to {{variable}} for every new voicemail. If you want to change where email notifications go to, please edit the user's email address in the User Administration section."
 		},
diff --git a/submodules/users/views/feature-vmbox.html b/submodules/users/views/feature-vmbox.html
index 5cede35..4f4dac6 100644
--- a/submodules/users/views/feature-vmbox.html
+++ b/submodules/users/views/feature-vmbox.html
@@ -19,11 +19,13 @@
 		<form id="vmbox_form">
 
 			<div class="main-line">
-				{{i18n.users.vmbox.label}}
+				{{i18n.users.vmbox.text}}
 			</div>
 
 			<div class="control-group main">
-				<label class="title">Voicemail to e-mail:</label>
+				<label class="title">
+					{{i18n.users.vmbox.label}}
+				</label>
 				{{#monsterSwitch}}
 					<input type="checkbox" name="vm_to_email_enabled" id="vm_to_email_enabled" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if vm_to_email_enabled}} checked="checked"{{/if}}></input>
 				{{/monsterSwitch}}

From fb417d65a8e131cdd2f20dc2d5353ffa48cca16f Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Thu, 14 Mar 2019 11:04:31 -0700
Subject: [PATCH 21/35] UI-3332: Add missing German translation (#130)

---
 i18n/de-DE.json | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index dd8b0c1..04fdd6e 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -479,6 +479,7 @@
 		},
 		"dialogCreationUser": {
 			"createUser": "Benutzer erstellen",
+			"createUserAndAddAnother": "Benutzer erstellen und anderen hinzufügen",
 			"errorOnCreation": "Bei der Erstellung dieses Benutzers ist ein Fehler aufgetreten:",
 			"extension": "Hauptnebenstelle",
 			"extensionAlreadyExist": "Diese Nebenstelle ist bereits vergeben. Bitte wählen Sie eine andere Nebenstelle.",
@@ -486,14 +487,27 @@
 			"lastName": "Nachname",
 			"loginEmail": "Zur Anwendung verwendete E-Mail",
 			"notificationEmail": "Benachrichtigungs-E-Mail",
-			"password": "Kennwort (mind. 6 Zeichen)",
+			"password": "Kennwort",
+			"passwordPlaceholder": "Kennwort (mind. 6 Zeichen)",
 			"sendToDifferentEmail": "E-Mails an andere Adresse senden",
-			"title": "Benutzer erstellen",
+			"title": "Benutzer und Gerät hinzufügen",
 			"vmboxAlreadyExist": "VMBox-Nummer ist bereits vergeben. Bitte wählen Sie eine andere Anrufbeantworter-Nummer.",
 			"vmboxNumber": "VM-Box Nr.",
 			"__comment": "UI-814: Option zur automatischen Versendung einer E-Mail bei Benutzererstellung hinzugefügt",
 			"__version": "3.20_s3",
-			"sendWelcomeEmail": "Anmeldedaten an diesen Benutzer senden"
+			"sendWelcomeEmail": "Anmeldedaten an diesen Benutzer senden",
+			"addDevice": {
+				"deviceMake": {
+					"label": "Gerätemarke",
+					"none": "Keiner"
+				},
+				"deviceModel": {
+					"label": "Gerätemodell"
+				},
+				"macAddress": "MAC-Adresse",
+				"name": "Gerätename",
+				"title": "Gerät hinzufügen"
+			}
 		},
 		"editionForm": {
 			"changePIN": "PIN ändern",

From 3b04108882a8dbf0bb5e8ebda8a97f326c421287 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Mon, 18 Mar 2019 10:43:50 -0700
Subject: [PATCH 22/35] UI-3332: Add missing German tranlsation (#131)

---
 i18n/de-DE.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index 04fdd6e..f772738 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -480,6 +480,7 @@
 		"dialogCreationUser": {
 			"createUser": "Benutzer erstellen",
 			"createUserAndAddAnother": "Benutzer erstellen und anderen hinzufügen",
+			"createVmbox": "Erstellen Sie eine Anrufbeantworter für diesen Benutzer",
 			"errorOnCreation": "Bei der Erstellung dieses Benutzers ist ein Fehler aufgetreten:",
 			"extension": "Hauptnebenstelle",
 			"extensionAlreadyExist": "Diese Nebenstelle ist bereits vergeben. Bitte wählen Sie eine andere Nebenstelle.",

From 4543ec20f9e0194ea4ea479646ca2940bdd2184e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Fri, 29 Mar 2019 14:16:07 -0600
Subject: [PATCH 23/35] Fix variable name (#133)

---
 submodules/strategy/strategy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index a68377f..0d81cc7 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -1784,7 +1784,7 @@ define(function(require) {
 			});
 
 			container.on('click', '.action-links .edit-email', function(e) {
-				event.preventDefault();
+				e.preventDefault();
 
 				monster.waterfall([
 					function(callback) {

From 8ac2da31a18fc12fa9a2ae352789f24a7bb3c3df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Fri, 5 Apr 2019 18:51:47 -0600
Subject: [PATCH 24/35] UI-3328: Do not delete VMBox when disabling VMBox user
 feature (#132)

* Do not delete user vmbox, and use common functions to get main user vmbox

* Adjust flow at usersRenderVMBox + add TO-DOs

* Create or update user vmbox when enabling feature

* Refactor to reduce nesting & repeated code/checks

* Refactor + check user's vmbox in main callflow modules

* Fix variable name

* Create function to extract data from callflow flow

* Receive main user callflow, and other user callflows, at usersFormatUserData

* Get vmbox from main callflow if possible

* Undo unnecessary changes & remove unused function

* Get user vmbox from main callflow

* Get vmbox only when needed + add TO-DO's

* Undo refactored code not related to bug

* Changes to support usersMigrateFromExtensions case

* Get main vmbox for feature popup render, and restore add vmbox logic

* Add missing self variables

* Update VMBox status in user main callflow

* Clean code

* Fix some names

* Use usersGetMainCallflowAndVMBox to get bot callflow and vmbox

* Remove unnecessary change

* Remove unnecessary call to API

* Multiple small fixes

* Fix callflow module name on check

* Change property name to skip callflow module

* Fix defaultValue when extracting data.skip_module

* Fix vmbox active value

* Fix to get vmbox active status, when callflow module is not present
---
 submodules/users/users.js | 518 +++++++++++++++++++-------------------
 1 file changed, 262 insertions(+), 256 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 6f62417..6ef7265 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -181,11 +181,10 @@ define(function(require) {
 		/**
 		 * Format user related data
 		 * @param  {Object} data
-		 * @param  {Object} data.user              User data
-		 * @param  {Object} data.userMainCallflow  User's main callflow
-		 * @param  {Object} data.userVMBox         User's main voicemail box
-		 * @param  {Object} data.existingVmboxes   Account's existing voicemail boxes
-		 * @param  {Object} data.mainDirectory     Account's main directory
+		 * @param  {Object} data.user                User data
+		 * @param  {Object} [data.userMainCallflow]  User's main callflow
+		 * @param  {Object} [data.userVMBox]         User's main voicemail box
+		 * @param  {Object} [data.mainDirectory]     Account's main directory
 		 */
 		usersFormatUserData: function(data) {
 			var self = this,
@@ -193,7 +192,6 @@ define(function(require) {
 				_mainDirectory = data.mainDirectory,
 				_mainCallflow = data.userMainCallflow,
 				_vmbox = data.userVMBox,
-				_vmboxes = data.existingVmboxes,
 				formattedUser = {
 					additionalDevices: 0,
 					additionalExtensions: 0,
@@ -296,21 +294,6 @@ define(function(require) {
 			}
 
 			dataUser.extra.features = _.clone(dataUser.features);
-			if (_vmbox) {
-				dataUser.extra.features.push('vmbox');
-			}
-
-			dataUser.extra.countFeatures = 0;
-			_.each(dataUser.extra.features, function(v) {
-				if (v in dataUser.extra.mapFeatures) {
-					dataUser.extra.countFeatures++;
-					dataUser.extra.mapFeatures[v].active = true;
-				}
-			});
-
-			if (dataUser.extra.countFeatures > 0) {
-				dataUser.extra.hasFeatures = true;
-			}
 
 			if (_mainDirectory) {
 				dataUser.extra.mainDirectoryId = _mainDirectory.id;
@@ -339,19 +322,26 @@ define(function(require) {
 					}
 					dataUser.extra.ringingTimeout = flow.data.timeout;
 				}
+
+				// Check if user has vmbox enabled
+				if (_.includes(_mainCallflow.modules, 'voicemail')) {
+					dataUser.extra.features.push('vmbox');
+				}
 			}
 
 			if (_vmbox) {
 				dataUser.extra.vmbox = _vmbox;
 			}
 
-			if (!_.isEmpty(_vmbox) && !_.isEmpty(_vmboxes)) {
-				var i = _vmboxes.indexOf(_vmbox.mailbox);
-
-				_vmboxes.splice(i, 1);
+			dataUser.extra.countFeatures = 0;
+			_.each(dataUser.extra.features, function(v) {
+				if (v in dataUser.extra.mapFeatures) {
+					dataUser.extra.countFeatures++;
+					dataUser.extra.mapFeatures[v].active = true;
+				}
+			});
 
-				dataUser.extra.existingVmboxes = _vmboxes;
-			}
+			dataUser.extra.hasFeatures = (dataUser.extra.countFeatures > 0);
 
 			dataUser.extra.adminId = self.userId;
 
@@ -399,19 +389,25 @@ define(function(require) {
 					countUsers: data.users.length
 				},
 				mapUsers = {},
-				mapVMBoxes,
+				mapCallflows = _.chain(data.callflows)
+					.filter(function(callflow) {
+						return callflow.type === 'mainUserCallflow';
+					})
+					.groupBy('owner_id')
+					.value(),
 				registeredDevices = _.map(data.deviceStatus, function(device) { return device.device_id; });
 
 			if (_.size(self.appFlags.global.servicePlansRole) > 0) {
 				dataTemplate.showLicensedUserRoles = true;
 			}
 
-			mapVMBoxes = _.groupBy(data.vmboxes, 'owner_id');
-
 			_.each(data.users, function(user) {
+				var userCallflows = _.get(mapCallflows, user.id),
+					userMainCallflow = _.head(userCallflows);
+
 				mapUsers[user.id] = self.usersFormatUserData({
 					user: user,
-					userVMBox: self.usersGetUserMainVMBox(user, mapVMBoxes[user.id])
+					userMainCallflow: userMainCallflow
 				});
 			});
 
@@ -753,8 +749,7 @@ define(function(require) {
 									callback: function() {
 										updateCallflow();
 									},
-									oldPresenceId: oldPresenceId,
-									userExtension: extensionsList[0]
+									oldPresenceId: oldPresenceId
 								});
 							});
 						});
@@ -854,8 +849,6 @@ define(function(require) {
 
 				monster.util.checkVersion(currentUser, function() {
 					if (monster.ui.valid(form)) {
-						currentUser.extra.vmbox.timezone = formData.timezone;
-
 						var oldPresenceId = currentUser.presence_id,
 							userToSave = $.extend(true, {}, currentUser, formData),
 							newName = monster.util.getUserFullName(userToSave),
@@ -983,22 +976,27 @@ define(function(require) {
 				});
 
 				pinTemplate.find('.save-new-pin').on('click', function() {
-					var formData = monster.ui.getFormData('form_new_pin'),
-						vmboxData = $.extend(true, currentUser.extra.vmbox, formData);
+					var formData = monster.ui.getFormData('form_new_pin');
 
 					if (monster.ui.valid(form)) {
-						self.usersUpdateVMBox(vmboxData, function(data) {
-							popup.dialog('close').remove();
+						self.usersPatchVMBox({
+							data: {
+								voicemailId: currentUser.extra.vmbox.id,
+								data: formData
+							},
+							success: function(data) {
+								popup.dialog('close').remove();
 
-							monster.ui.toast({
-								type: 'success',
-								message: self.getTemplate({
-									name: '!' + toastrMessages.pinUpdated,
-									data: {
-										name: monster.util.getUserFullName(currentUser)
-									}
-								})
-							});
+								monster.ui.toast({
+									type: 'success',
+									message: self.getTemplate({
+										name: '!' + toastrMessages.pinUpdated,
+										data: {
+											name: monster.util.getUserFullName(currentUser)
+										}
+									})
+								});
+							}
 						});
 					}
 				});
@@ -1511,10 +1509,20 @@ define(function(require) {
 			});
 
 			template.on('click', '.feature[data-feature="vmbox"]', function() {
-				self.usersGetMainVMBoxSmartUser({
-					user: currentUser,
-					success: function(vmbox) {
+				self.usersGetMainCallflowAndVMBox({
+					userId: currentUser.id,
+					success: function(data) {
+						var vmbox = data.vmbox,
+							vmboxModule = self.usersExtractDataFromCallflow({
+								callflow: data.callflow,
+								module: 'voicemail'
+							});
+
+						// Update in-memory vmbox status
+						currentUser.extra.mapFeatures.vmbox.active = !(_.isUndefined(vmboxModule) || _.get(vmboxModule, 'data.skip_module', false));
+
 						currentUser.extra.deleteAfterNotify = (vmbox && vmbox.delete_after_notify);
+
 						self.usersRenderVMBox(currentUser, vmbox);
 					}
 				});
@@ -2250,6 +2258,7 @@ define(function(require) {
 
 		usersRenderVMBox: function(currentUser, vmbox) {
 			var self = this,
+				vmboxActive = currentUser.extra.mapFeatures.vmbox.active,
 				featureTemplate = $(self.getTemplate({
 					name: 'feature-vmbox',
 					data: currentUser,
@@ -2286,15 +2295,6 @@ define(function(require) {
 
 				monster.waterfall([
 					function(callback) {
-						if (vmbox && !enabled) {
-							self.usersDeleteUserVMBox({
-								userId: userId,
-								voicemailId: vmbox.id,
-								callback: callback
-							});
-							return;
-						}
-
 						if (!vmbox && enabled) {
 							self.usersAddMainVMBoxToUser({
 								user: currentUser,
@@ -2324,6 +2324,22 @@ define(function(require) {
 							}
 						});
 					},
+					function(callback) {
+						if ((!vmbox && enabled) || (vmboxActive === enabled)) {
+							// - Case 1: VMBox was created, so the main user callflow was already
+							//   updated
+							// - Case 2: VMBox status has not changed, so there is no need to
+							//   update the main user callflow
+							callback(null);
+							return;
+						}
+
+						self.usersUpdateVMBoxStatusInCallflow({
+							userId: userId,
+							enabled: enabled,
+							callback: callback
+						});
+					},
 					function(callback) {
 						if (currentUser.vm_to_email_enabled === vmToEmailEnabled) {
 							callback(null);
@@ -3359,9 +3375,15 @@ define(function(require) {
 			var self = this;
 
 			monster.parallel({
-				mainCallflow: function(callback) {
-					self.usersGetMainCallflow(userId, function(mainCallflow) {
-						callback(null, mainCallflow);
+				mainCallflowVMBox: function(callback) {
+					self.usersGetMainCallflowAndVMBox({
+						userId: userId,
+						success: function(data) {
+							callback(null, data);
+						},
+						error: function(err) {
+							callback(err);
+						}
 					});
 				},
 				mainDirectory: function(callback) {
@@ -3373,35 +3395,6 @@ define(function(require) {
 					self.usersGetUser(userId, function(userData) {
 						callback(null, userData);
 					});
-				},
-				vmboxes: function(callback) {
-					self.usersListVMBoxes({
-						success: function(vmboxes) {
-							var firstVmboxId,
-								results = {
-									listExisting: [],
-									userVM: {}
-								};
-
-							_.each(vmboxes, function(vmbox) {
-								results.listExisting.push(vmbox.mailbox);
-
-								if (vmbox.owner_id === userId && !firstVmboxId) {
-									firstVmboxId = vmbox.id;
-								}
-							});
-
-							if (firstVmboxId) {
-								self.usersGetVMBox(firstVmboxId, function(vmbox) {
-									results.userVM = vmbox;
-
-									callback(null, results);
-								});
-							} else {
-								callback(null, results);
-							}
-						}
-					});
 				}
 			}, function(error, results) {
 				var userData = results.user;
@@ -3416,10 +3409,9 @@ define(function(require) {
 
 				var dataTemplate = self.usersFormatUserData({
 						user: userData,
-						userMainCallflow: results.mainCallflow,
-						userVMBox: results.vmboxes.userVM,
-						mainDirectory: results.mainDirectory,
-						existingVmboxes: results.vmboxes.listExisting
+						userMainCallflow: results.mainCallflowVMBox.callflow,
+						userVMBox: results.mainCallflowVMBox.vmbox,
+						mainDirectory: results.mainDirectory
 					}),
 					template = $(self.getTemplate({
 						name: 'name',
@@ -3883,32 +3875,6 @@ define(function(require) {
 
 		/* Utils */
 
-		/**
-		 * Deletes a Voicemail Box by ID
-		 * @param  {Object}   args
-		 * @param  {String}   args.voicemailId  Voicemail Box ID
-		 * @param  {Function} args.success      Success callback
-		 * @param  {Function} args.error        Error callback
-		 */
-		usersDeleteVMBox: function(args) {
-			var self = this;
-
-			self.callApi({
-				resource: 'voicemail.delete',
-				data: {
-					voicemailId: args.voicemailId,
-					accountId: self.accountId,
-					data: {}
-				},
-				success: function(data) {
-					args.hasOwnProperty('success') && args.success(data.data);
-				},
-				error: function(parsedError) {
-					args.hasOwnProperty('error') && args.error(parsedError);
-				}
-			});
-		},
-
 		usersDeleteCallflow: function(callflowId, callback) {
 			var self = this;
 
@@ -4076,10 +4042,9 @@ define(function(require) {
 						type: 'mainUserCallflow'
 					};
 
-				self.usersSmartUpdateVMBox({
+				self.usersGetSuitableMainVMBoxSmartUser({
 					user: user,
-					needVMUpdate: false,
-					callback: function(_dataVM) {
+					success: function(_dataVM) {
 						if (_.isEmpty(_dataVM)) {
 							// Remove VMBox from callflow if there is none
 							callflow.flow.children = {};
@@ -4442,19 +4407,6 @@ define(function(require) {
 			});
 		},
 
-		usersListVMBoxesUser: function(userId, callback) {
-			var self = this;
-
-			self.usersListVMBoxes({
-				data: {
-					filters: {
-						filter_owner_id: userId
-					}
-				},
-				success: callback
-			});
-		},
-
 		usersGetVMBox: function(vmboxId, callback) {
 			var self = this;
 
@@ -4822,18 +4774,6 @@ define(function(require) {
 							callback(null, data.data);
 						}
 					});
-				},
-				vmboxes: function(callback) {
-					self.usersListVMBoxes({
-						data: {
-							filters: {
-								'filter_ui_metadata.origin': 'voip'
-							}
-						},
-						success: function(vmboxes) {
-							callback(null, vmboxes);
-						}
-					});
 				}
 			}, function(err, results) {
 				callback && callback(results);
@@ -5073,48 +5013,48 @@ define(function(require) {
 			});
 		},
 
-		/* If user has a vmbox, then only update it if it comes from the user form.
-		If the check comes from the extension page, where we create a callflow,
-		then only update the vmbox if there are no vmbox attached to this user */
+		/**
+		 * Update voicemail box, if needed
+		 * @param  {Object}   args
+		 * @param  {Object}   args.user           Kazoo user
+		 * @param  {String}   args.oldPresenceId  Previous user presence ID
+		 * @param  {Function} [args.callback]     Optional callback
+		 */
 		usersSmartUpdateVMBox: function(args) {
 			var self = this,
 				user = args.user,
-				needVMUpdate = args.needVMUpdate || true,
 				callback = args.callback,
 				oldPresenceId = args.oldPresenceId || undefined;
 
-			self.usersListVMBoxesUser(user.id, function(vmboxes) {
-				if (_.isEmpty(vmboxes)) {
-					callback && callback({});
-					return;
-				}
-				if (!needVMUpdate) {
-					callback && callback(vmboxes[0]);
-					return;
-				}
-
-				monster.waterfall([
-					function(wfCallback) {
-						self.usersGetVMBox(vmboxes[0].id, function(vmbox) {
-							wfCallback(null, vmbox);
-						});
-					},
-					function(vmbox, wfCallback) {
-						vmbox.name = self.usersGetMainVMBoxName(monster.util.getUserFullName(user));
-						// We only want to update the vmbox number if it was already synced with the presenceId (and if the presenceId was not already set)
-						// This allows us to support old clients who have mailbox number != than their extension number
-						if (oldPresenceId === vmbox.mailbox) {
-							// If it's synced, then we update the vmbox number as long as the main extension is set to something different than 'unset' in which case we don't update the vmbox number value
-							vmbox.mailbox = (user.presence_id && user.presence_id !== 'unset') ? user.presence_id + '' : vmbox.mailbox;
+			monster.waterfall([
+				function(wfCallback) {
+					self.usersGetMainCallflowAndVMBox({
+						userId: user.id,
+						success: function(data) {
+							wfCallback(null, data.vmbox);
 						}
+					});
+				},
+				function(vmbox, wfCallback) {
+					if (!vmbox) {
+						wfCallback(null, {});
+						return;
+					}
 
-						self.usersUpdateVMBox(vmbox, function(vmboxSaved) {
-							wfCallback(null, vmboxSaved);
-						});
+					vmbox.name = self.usersGetMainVMBoxName(monster.util.getUserFullName(user));
+					// We only want to update the vmbox number if it was already synced with the presenceId (and if the presenceId was not already set)
+					// This allows us to support old clients who have mailbox number != than their extension number
+					if (oldPresenceId === vmbox.mailbox) {
+						// If it's synced, then we update the vmbox number as long as the main extension is set to something different than 'unset' in which case we don't update the vmbox number value
+						vmbox.mailbox = (user.presence_id && user.presence_id !== 'unset') ? user.presence_id + '' : vmbox.mailbox;
 					}
-				], function(err, vmboxSaved) {
-					callback && callback(vmboxSaved);
-				});
+
+					self.usersUpdateVMBox(vmbox, function(vmboxSaved) {
+						wfCallback(null, vmboxSaved);
+					});
+				}
+			], function(err, vmboxSaved) {
+				callback && callback(vmboxSaved);
 			});
 		},
 
@@ -5452,70 +5392,6 @@ define(function(require) {
 			});
 		},
 
-		/**
-		 * Deletes user's main Voicemail Box, and removes it from the main user callflow
-		 * @param  {Object}   args
-		 * @param  {String}   args.userId       User ID
-		 * @param  {String}   args.voicemailId  ID of the voicemail to delete
-		 * @param  {Function} args.callback     Callback for monster.waterfall
-		 */
-		usersDeleteUserVMBox: function(args) {
-			var self = this,
-				voicemailId = args.voicemailId;
-
-			monster.waterfall([
-				function(waterfallCallback) {
-					self.usersGetMainCallflow(args.userId, function(mainUserCallflow) {
-						waterfallCallback(null, mainUserCallflow);
-					});
-				},
-				function(mainUserCallflow, waterfallCallback) {
-					if (_.isNil(mainUserCallflow)) {
-						waterfallCallback(null);
-						return;
-					}
-
-					var flowChildren = mainUserCallflow.flow.children;
-
-					// Check if main user callflow has been created via the voip app, and it has
-					// the voicemail set in the default position. If it is not the case, do not
-					// modify.
-					if (mainUserCallflow.ui_metadata.origin !== 'voip'
-						|| _.isEmpty(flowChildren)
-						|| flowChildren._.module !== 'voicemail'
-						|| flowChildren._.data.id !== voicemailId) {
-						waterfallCallback(null);
-						return;
-					}
-
-					// Remove voicemail from callflow, and save
-					mainUserCallflow.flow.children = {};
-
-					self.usersUpdateCallflow(mainUserCallflow, function() {
-						waterfallCallback(null);
-					});
-				},
-				function(waterfallCallback) {
-					self.usersDeleteVMBox({
-						voicemailId: args.voicemailId,
-						success: function() {
-							waterfallCallback(null);
-						},
-						error: function() {
-							waterfallCallback(true);
-						}
-					});
-				}
-			], function(err, result) {
-				if (err) {
-					args.hasOwnProperty('callback') && args.callback(err);
-					return;
-				}
-
-				args.hasOwnProperty('callback') && args.callback(null);
-			});
-		},
-
 		/**
 		 * Adds a main VMBox to an existing user
 		 * @param  {Object}   args
@@ -5606,22 +5482,22 @@ define(function(require) {
 		},
 
 		/**
-		 * Gets the main voicemail box for a user, which has been created through Smart PBX app
+		 * Gets a suitable main voicemail box for a Smart PBX user
 		 * @param  {Object}   args
 		 * @param  {Object}   args.user     User data
 		 * @param  {Function} args.success  Success callback
 		 * @param  {Function} args.error    Error callback
 		 */
-		usersGetMainVMBoxSmartUser: function(args) {
+		usersGetSuitableMainVMBoxSmartUser: function(args) {
 			var self = this,
 				user = args.user;
 
 			monster.waterfall([
 				function(callback) {
-					self.usersListVMBoxesSmartUser({
+					self.usersListVMBoxesUser({
 						userId: user.id,
 						success: function(vmboxes) {
-							callback(null, self.usersGetUserMainVMBox(user, vmboxes));
+							callback(null, self.usersGetUserMainVMBoxFromList(user, vmboxes));
 						},
 						error: function(parsedError) {
 							callback(parsedError);
@@ -5676,20 +5552,19 @@ define(function(require) {
 		},
 
 		/**
-		 * Gets the list of vmboxes for a user, that has been created through Smart PBX app
+		 * Gets the list of vmboxes for a user
 		 * @param  {Object}   args
 		 * @param  {String}   args.userId   User ID
 		 * @param  {Function} args.success  Success callback
 		 * @param  {Function} args.error    Error callback
 		 */
-		usersListVMBoxesSmartUser: function(args) {
+		usersListVMBoxesUser: function(args) {
 			var self = this;
 
 			self.usersListVMBoxes({
 				data: {
 					filters: {
-						filter_owner_id: args.userId,
-						'filter_ui_metadata.origin': 'voip'
+						filter_owner_id: args.userId
 					}
 				},
 				success: args.success
@@ -5754,7 +5629,7 @@ define(function(require) {
 		 * @param  {Object} user     User data
 		 * @param  {Array}  vmboxes  List of voicemail boxes that belong to the user
 		 */
-		usersGetUserMainVMBox: function(user, vmboxes) {
+		usersGetUserMainVMBoxFromList: function(user, vmboxes) {
 			if (_.isEmpty(vmboxes)) {
 				return null;
 			}
@@ -5799,6 +5674,137 @@ define(function(require) {
 			var self = this;
 
 			return userName + self.appFlags.users.smartPBXVMBoxString;
+		},
+
+		/**
+		 * Extracts a module node or a module value (if path is provided) from a callflow's
+		 * default flow tree.
+		 * @param  {Object} args
+		 * @param  {Object} args.callflow    Callflow object
+		 * @param  {Object} args.module      Callflow module name
+		 * @param  {Object} [args.dataPath]  Optional path of data to extract within the module.
+		 * @returns {Any}   Value extracted from the callflow, or undefined if the module or path
+		 *                  is not found
+		 */
+		usersExtractDataFromCallflow: function(args) {
+			var self = this,
+				flow = _.get(args, 'callflow.flow'),
+				cfModule = args.module;
+
+			if (_.isNil(flow)) {
+				return undefined;
+			}
+
+			while (flow.module !== cfModule && _.has(flow.children, '_')) {
+				flow = flow.children._;
+			}
+
+			if (flow.module !== cfModule) {
+				return undefined;
+			} else if (_.has(args, 'dataPath')) {
+				return _.get(flow, args.dataPath);
+			} else {
+				return flow;
+			}
+		},
+
+		/**
+		 * Extracts the vmbox ID from a user mai callflow
+		 * @param  {Object} args
+		 * @param  {Object} args.userMainCallflow  User's main callflow
+		 * @returns  {String}                      Voicemail box ID
+		 */
+		usersExtractVMBoxIdFromCallflow: function(args) {
+			var self = this;
+
+			return self.usersExtractDataFromCallflow({
+				callflow: args.userMainCallflow,
+				module: 'voicemail',
+				dataPath: 'data.id'
+			});
+		},
+
+		/**
+		 * Gets a user main callflow and main vmbox
+		 * @param  {Object}   args
+		 * @param  {Object}   args.userId     User ID
+		 * @param  {Function} [args.success]  Optional success callback
+		 * @param  {Function} [args.error]    Optional error callback
+		 */
+		usersGetMainCallflowAndVMBox: function(args) {
+			var self = this;
+
+			monster.waterfall([
+				function(waterfallCallback) {
+					self.usersGetMainCallflow(args.userId, function(callflow) {
+						waterfallCallback(null, callflow);
+					});
+				},
+				function(callflow, waterfallCallback) {
+					var vmboxId = self.usersExtractVMBoxIdFromCallflow({
+						userMainCallflow: callflow
+					});
+
+					if (vmboxId) {
+						self.usersGetVMBox(vmboxId, function(vmbox) {
+							waterfallCallback(null, {
+								callflow: callflow,
+								vmbox: vmbox
+							});
+						});
+					} else {
+						waterfallCallback(null, {
+							callflow: callflow
+						});
+					}
+				}
+			], function(err, results) {
+				if (err) {
+					_.has(args, 'error') && args.error(err);
+				} else {
+					_.has(args, 'success') && args.success(results);
+				}
+			});
+		},
+
+		/**
+		 * Update VMBox module status in callflow, to be enabled or skipped
+		 * @param  {Object}   args
+		 * @param  {String}   args.userId    User ID
+		 * @param  {Boolean}  args.enabled   Indicates if vmbox module should be enabled or skipped
+		 * @param  {Function} args.callback  Asynchronous callback
+		 */
+		usersUpdateVMBoxStatusInCallflow: function(args) {
+			var self = this,
+				userId = args.userId,
+				enabled = args.enabled,
+				callback = args.callback;
+
+			monster.waterfall([
+				function(waterfallCallback) {
+					self.usersGetMainCallflow(userId, function(callflow) {
+						waterfallCallback(null, callflow);
+					});
+				},
+				function(callflow, waterfallCallback) {
+					var flow = self.usersExtractDataFromCallflow({
+						callflow: callflow,
+						module: 'voicemail'
+					});
+
+					if (flow) {
+						// Module already exists in callflow
+						flow.data.skip_module = !enabled;
+
+						self.usersUpdateCallflow(callflow, function() {
+							waterfallCallback(null);
+						});
+					} else {
+						// Module does not exist in callflow, but should, so err
+						waterfallCallback(true);
+					}
+				}
+			], callback);
 		}
 	};
 

From 3e43b4dde98e1ae4c06bb3c384280fd31bd5a24f Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Mon, 8 Apr 2019 08:45:39 -0700
Subject: [PATCH 25/35] UI-3328: Reverse module presence check and check
 against skipped_modules (#134)

---
 submodules/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 6ef7265..8f0d694 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -324,7 +324,7 @@ define(function(require) {
 				}
 
 				// Check if user has vmbox enabled
-				if (_.includes(_mainCallflow.modules, 'voicemail')) {
+				if (!_.includes(_mainCallflow.skipped_modules, 'voicemail')) {
 					dataUser.extra.features.push('vmbox');
 				}
 			}

From 6ec9b7e93eb51a69bde077d3e0c75c3f256c893b Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Tue, 9 Apr 2019 08:45:13 -0700
Subject: [PATCH 26/35] Revert "UI-3328: Reverse module presence check and
 check against skipped_modules (#134)"

Property was changed back to modules as it was decided that exposing a
list of modules enabled would be more useful than the opposite.

This reverts commit 3e43b4dde98e1ae4c06bb3c384280fd31bd5a24f.
---
 submodules/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 8f0d694..6ef7265 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -324,7 +324,7 @@ define(function(require) {
 				}
 
 				// Check if user has vmbox enabled
-				if (!_.includes(_mainCallflow.skipped_modules, 'voicemail')) {
+				if (_.includes(_mainCallflow.modules, 'voicemail')) {
 					dataUser.extra.features.push('vmbox');
 				}
 			}

From 375575ac569737f2f5fc0b33345b6f16450342ac Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Wed, 17 Apr 2019 16:00:55 -0700
Subject: [PATCH 27/35] UI-3354: Store call forwarding number in E164 format
 (#137)

---
 submodules/users/users.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 6ef7265..3782b09 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2462,6 +2462,10 @@ define(function(require) {
 				} else if (user.call_forward.enabled === false) {
 					cfMode = user.call_forward.hasOwnProperty('failover') && user.call_forward.failover === true ? 'failover' : 'off';
 				}
+
+				if (_.has(user.call_forward, 'number')) {
+					user.call_forward.number = monster.util.unformatPhoneNumber(user.call_forward.number);
+				}
 			}
 
 			user.extra.callForwardMode = cfMode;
@@ -2518,8 +2522,11 @@ define(function(require) {
 			});
 
 			featureTemplate.find('.save').on('click', function() {
-				if (monster.ui.valid(featureForm)) {
-					var formData = monster.ui.getFormData('call_forward_form');
+				var formData = monster.ui.getFormData('call_forward_form'),
+					phoneNumber = monster.util.getFormatPhoneNumber(formData.number).e164Number,
+					isValidPhoneNumber = !_.isUndefined(phoneNumber);
+
+				if (monster.ui.valid(featureForm) && isValidPhoneNumber) {
 					formData.require_keypress = !formData.require_keypress;
 
 					var selectedType = featureTemplate.find('.feature-select-mode button.selected').data('value');
@@ -2534,7 +2541,7 @@ define(function(require) {
 						formData.failover = false;
 					}
 
-					formData.number = monster.util.unformatPhoneNumber(formData.number, 'keepPlus');
+					formData.number = phoneNumber;
 					delete formData.phoneType;
 
 					var userToSave = $.extend(true, {}, currentUser, { call_forward: formData });
@@ -2543,6 +2550,7 @@ define(function(require) {
 						args.openedTab = 'name';
 					}
 
+
 					self.usersUpdateUser(userToSave, function(data) {
 						args.userId = data.data.id;
 

From 228009789908a039868715653d6191478170ef4a Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Thu, 18 Apr 2019 16:14:56 -0700
Subject: [PATCH 28/35] UI-3353: Fix user main extension formatting (#138)

---
 submodules/users/users.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 3782b09..fc3e52a 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -354,7 +354,9 @@ define(function(require) {
 				addNumberToPresenceOptions = function(number) {
 					temp = {
 						key: number,
-						value: monster.util.formatPhoneNumber(number)
+						value: _.startsWith('+', number)
+							? monster.util.formatPhoneNumber(number)
+							: number
 					};
 
 					dataUser.extra.presenceIdOptions.push(temp);

From 94f49fb4a0c517d064828c7619135c04146337f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Thu, 18 Apr 2019 20:30:36 -0600
Subject: [PATCH 29/35] UI-3358: Deleting user vmbox from vmboxes submodule
 updates callflow accordingly (#136)

* Remove vmbox from user main callflow if deleted thru vmboxes module

* Remove console.log

* Clean up main user callflow resolution
---
 submodules/vmboxes/vmboxes.js | 332 +++++++++++++++++++++++++++++++---
 1 file changed, 304 insertions(+), 28 deletions(-)

diff --git a/submodules/vmboxes/vmboxes.js b/submodules/vmboxes/vmboxes.js
index 8f6637a..55b5f58 100644
--- a/submodules/vmboxes/vmboxes.js
+++ b/submodules/vmboxes/vmboxes.js
@@ -203,7 +203,7 @@ define(function(require) {
 
 			monster.ui.tabs(templateVMBox);
 
-			timezone.populateDropdown(templateVMBox.find('#timezone'), data.timezone || 'inherit', {inherit: self.i18n.active().defaultTimezone});
+			timezone.populateDropdown(templateVMBox.find('#timezone'), data.timezone || 'inherit', { inherit: self.i18n.active().defaultTimezone });
 			monster.ui.chosen(templateVMBox.find('#timezone'));
 
 			monster.ui.tooltips(templateVMBox);
@@ -224,18 +224,21 @@ define(function(require) {
 				var voicemailId = $(this).parents('.edit-vmbox').data('id');
 
 				monster.ui.confirm(self.i18n.active().vmboxes.confirmDeleteVmbox, function() {
-					self.vmboxesDeleteVmbox(voicemailId, function(vmbox) {
-						monster.ui.toast({
-							type: 'success',
-							message: self.getTemplate({
-								name: '!' + self.i18n.active().vmboxes.deletedVmbox,
-								data: {
-									vmboxName: vmbox.name
-								}
-							})
-						});
+					self.vmboxesDeleteVmbox({
+						voicemailId: voicemailId,
+						success: function(vmbox) {
+							monster.ui.toast({
+								type: 'success',
+								message: self.getTemplate({
+									name: '!' + self.i18n.active().vmboxes.deletedVmbox,
+									data: {
+										vmboxName: vmbox.name
+									}
+								})
+							});
 
-						callbacks.afterDelete && callbacks.afterDelete(vmbox);
+							callbacks.afterDelete && callbacks.afterDelete(vmbox);
+						}
 					});
 				});
 			});
@@ -384,22 +387,6 @@ define(function(require) {
 		},
 
 		/* Utils */
-		vmboxesDeleteVmbox: function(voicemailId, callback) {
-			var self = this;
-
-			self.callApi({
-				resource: 'voicemail.delete',
-				data: {
-					accountId: self.accountId,
-					voicemailId: voicemailId,
-					data: {}
-				},
-				success: function(data) {
-					callback(data.data);
-				}
-			});
-		},
-
 		vmboxesGetEditData: function(id, callback) {
 			var self = this;
 
@@ -530,6 +517,295 @@ define(function(require) {
 
 				callback && callback(results);
 			});
+		},
+
+		/**
+		 * Deletes a user voicemail box
+		 * @param  {Object}   args
+		 * @param  {Object}   args.voicemailId  ID of the voicemail box to delete
+		 * @param  {Function} [args.success]    Success callback
+		 * @param  {Function} [args.error]      Error callback
+		 */
+		vmboxesDeleteVmbox: function(args) {
+			var self = this,
+				voicemailId = args.voicemailId;
+
+			monster.waterfall([
+				function(callback) {
+					self.vmboxesRequestDeleteVmbox({
+						data: {
+							voicemailId: voicemailId
+						},
+						success: function(deletedVmbox) {
+							callback(null, deletedVmbox);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				},
+				function(vmbox, callback) {
+					self.vmboxesGetUserMainCallflow({
+						userId: vmbox.owner_id,
+						success: function(userMainCallflow) {
+							callback(null, vmbox, userMainCallflow);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				},
+				function(vmbox, userMainCallflow, callback) {
+					if (_.isUndefined(userMainCallflow)) {
+						callback(null);
+						return;
+					}
+					self.vmboxesRemoveModuleFromCallflow({
+						callflow: userMainCallflow,
+						module: 'voicemail',
+						dataId: voicemailId,
+						success: function() {
+							callback(null, vmbox);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				}
+			], function(err, vmbox) {
+				if (err) {
+					_.has(args, 'error') && args.error(err);
+				} else {
+					_.has(args, 'success') && args.success(vmbox);
+				}
+			});
+		},
+
+		/**
+		 * Deletes a user voicemail box
+		 * @param  {Object}   args
+		 * @param  {Object}   args.callflow   Callflow to modify
+		 * @param  {String}   args.module     Module type to remove
+		 * @param  {String}   args.dataId     ID of the data whose module should be removed
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Function} [args.error]    Error callback
+		 */
+		vmboxesRemoveModuleFromCallflow: function(args) {
+			var self = this,
+				callflow = args.callflow,
+				parentFlow = callflow,
+				flow = _.get(parentFlow, 'flow'),
+				cfModule = args.module,
+				dataId = args.dataId,
+				callflowModified = false;
+
+			monster.series([
+				function(callback) {
+					while (flow) {
+						if (flow.module === cfModule && _.get(flow, 'data.id') === dataId) {
+							var childFlow = _.get(flow, 'children._', {});
+							if (_.has(parentFlow, 'flow')) {
+								// The parent is the callflow itself
+								parentFlow.flow = childFlow;
+								flow = parentFlow.flow;
+							} else if (_.isEmpty(childFlow)) {
+								parentFlow.children = {};
+								flow = null;
+							} else {
+								parentFlow.children._ = childFlow;
+								flow = childFlow;
+							}
+							callflowModified = true;
+						}
+
+						parentFlow = flow;
+						flow = _.get(flow, 'children._');
+					}
+
+					callback(null);
+				},
+				function(callback) {
+					if (!callflowModified) {
+						callback(null);
+						return;
+					}
+
+					self.usersRequestUpdateCallflow({
+						callflow: callflow,
+						success: function() {
+							callback(null);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				}
+			], function(err) {
+				if (err) {
+					_.has(args, 'error') && args.error();
+				} else {
+					_.has(args, 'success') && args.success();
+				}
+			});
+		},
+
+		/**
+		 * Gets the main callflow for a user, by its user ID
+		 * @param  {Object}   args
+		 * @param  {String}   args.userId   User ID
+		 * @param  {Function} args.success  Success callback
+		 * @param  {Function} [args.error]  Error callback
+		 */
+		vmboxesGetUserMainCallflow: function(args) {
+			var self = this,
+				userId = args.userId;
+
+			monster.waterfall([
+				function(callback) {
+					self.vmboxesRequestListCallflows({
+						data: {
+							filters: {
+								filter_owner_id: userId,
+								filter_type: 'mainUserCallflow',
+								paginate: 'false'
+							}
+						},
+						success: function(callflowsData) {
+							callback(null, callflowsData);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				},
+				function(callflowsData, callback) {
+					if (_.isEmpty(callflowsData)) {
+						callback(null);
+						return;
+					}
+
+					self.vmboxesRequestGetCallflow({
+						data: {
+							callflowId: _.head(callflowsData).id
+						},
+						success: function(data) {
+							callback(null, data);
+						},
+						error: function() {
+							callback(true);
+						}
+					});
+				}
+			], function(err, userMainCallflow) {
+				if (err) {
+					_.has(args, 'error') && args.error(err);
+				} else {
+					_.has(args, 'success') && args.success(userMainCallflow);
+				}
+			});
+		},
+
+		/**
+		 * Request a list of callflows to te API
+		 * @param  {Object}   args
+		 * @param  {Object}   [args.data]
+		 * @param  {Object}   [args.data.filters]  Querystring filters
+		 * @param  {Function} [args.success]       Success callback
+		 * @param  {Function} [args.error]         Error callback
+		 */
+		vmboxesRequestListCallflows: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'callflow.list',
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
+				success: function(data) {
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					_.has(args, 'error') && args.error(parsedError);
+				}
+			});
+		},
+
+		/**
+		 * Request a callflow to the API by ID
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data
+		 * @param  {String}   args.data.callflowId  Callflow ID
+		 * @param  {Function} [args.success]        Success callback
+		 * @param  {Function} [args.error]          Error callback
+		 */
+		vmboxesRequestGetCallflow: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'callflow.get',
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
+				success: function(data) {
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					_.has(args, 'error') && args.error(parsedError);
+				}
+			});
+		},
+
+		/**
+		 * Request a callflow to the API by ID
+		 * @param  {Object}   args
+		 * @param  {Object}   args.callflow   Callflow to update
+		 * @param  {Function} [args.success]  Success callback
+		 * @param  {Function} [args.error]    Error callback
+		 */
+		usersRequestUpdateCallflow: function(args) {
+			var self = this,
+				callflow = args.callflow;
+
+			self.callApi({
+				resource: 'callflow.update',
+				data: {
+					accountId: self.accountId,
+					callflowId: callflow.id,
+					data: callflow
+				},
+				success: function(data) {
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					_.has(args, 'error') && args.error(parsedError);
+				}
+			});
+		},
+
+		/**
+		 * Request the deletion of a voicemail box to the API, by its ID
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data
+		 * @param  {String}   args.data.voicemailId  Voicemail box ID
+		 * @param  {Function} [args.success]         Success callback
+		 * @param  {Function} [args.error]           Error callback
+		 */
+		vmboxesRequestDeleteVmbox: function(args) {
+			var self = this;
+
+			self.callApi({
+				resource: 'voicemail.delete',
+				data: _.merge({
+					accountId: self.accountId,
+					data: {}
+				}, args.data),
+				success: function(data) {
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError) {
+					_.has(args, 'error') && args.error(parsedError);
+				}
+			});
 		}
 	};
 

From d8aef0cedafcfdb57e32a2f9d399709813684b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Mon, 22 Apr 2019 12:50:20 -0600
Subject: [PATCH 30/35] UI-3342: Edit and save combo key labels for device
 (#135)

---
 i18n/de-DE.json                               |   9 +-
 i18n/en-US.json                               |  12 +-
 i18n/es-ES.json                               |   5 +-
 i18n/fr-FR.json                               |   5 +-
 i18n/ru-RU.json                               |   9 +-
 submodules/devices/devices.js                 |  97 +++++++---
 .../devices/{devices.css => devices.scss}     | 172 ++++++++++++++++--
 .../devices/views/devices-sip_device.html     | 167 +++++++++--------
 8 files changed, 339 insertions(+), 137 deletions(-)
 rename submodules/devices/{devices.css => devices.scss} (79%)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index f772738..83a95ad 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -289,7 +289,9 @@
 			"__comment": "UI-1351: Möglichkeit zur Konfiguration von Funktionstasten für SIP-Geräte in SmartPBX hinzugefügt",
 			"__version": "v3.20_s4",
 			"keys": {
-				"alertMessage": "In der Standardeinstellung wird diese Taste als Leitungstaste verwendet. Wir empfehlen, dies nicht zu ändern.",
+				"alert": {
+					"message": "In der Standardeinstellung wird diese Taste als Leitungstaste verwendet. Wir empfehlen, dies nicht zu ändern."
+				},
 				"featureKeys": {
 					"title": "Funktionstasten",
 					"label": "Funktionstaste"
@@ -299,8 +301,8 @@
 					"label": "Kombitaste"
 				},
 				"labels": {
-					"user": "Benutzer",
 					"parkingSpot": "Halteposition",
+					"user": "Benutzer",
 					"value": "Wert"
 				},
 				"info": {
@@ -314,7 +316,8 @@
 						"parking": "Wird angezeigt, wenn ein Anruf eine Halteposition belegt, die für das gesamte Unternehmen zur Verfügung steht. Die Anzeige kann verwendet werden, um einen Anruf in die Halteposition zu verlegen oder um einen gehaltenen Anruf wieder abzurufen.",
 						"personal_parking": "Wird angezeigt, wenn ein Anruf eine Halteposition belegt, die für den ausgewählten Benutzer vorgesehen ist. Die Anzeige kann verwendet werden, um einen Anruf in die Halteposition zu verlegen oder um einen gehaltenen Anruf wieder abzurufen.",
 						"speed_dial": "Zeigt keine Anrufereignisse an, kann jedoch zum schnellen Anrufen der konfigurierten Nummer verwendet werden."
-					}
+					},
+					"typeTitle": "{{variable}}: "
 				},
 				"types": {
 					"line": "Zeile",
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 9d67fb6..820099c 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -293,7 +293,10 @@
 			"__comment": "UI-1351: Add ability to configure feature keys for SIP devices in SmartPBX",
 			"__version": "v3.20_s4",
 			"keys": {
-				"alertMessage": "By default, this key will be used as a Line Key and we recommend you not to change it.",
+				"alert": {
+					"message": "By default, this key will be used as a Line Key. It is strongly recommended that you not change it.",
+					"title": "Key 1 Default"
+				},
 				"featureKeys": {
 					"title": "Feature Keys",
 					"label": "Feature key"
@@ -303,8 +306,10 @@
 					"label": "Combo key"
 				},
 				"labels": {
-					"user": "User",
+					"deviceLabel": "Label on Device",
+					"function": "Function",
 					"parkingSpot": "Parking Spot",
+					"user": "User",
 					"value": "Value"
 				},
 				"info": {
@@ -318,7 +323,8 @@
 						"parking": "Indicate when a call is placed on a parking slot available to the entire company. The indicator can be used to transfer a call to the parking slot or retrieve a parked call.",
 						"personal_parking": "Indicate when a call is placed on a parking slot dedicated to the selected user. The indicator can be used to transfer a call to the parking slot or retrieve a parked call.",
 						"speed_dial": "Does not indicate for any calls event but can be used to rapidly call the configured number."
-					}
+					},
+					"typeTitle": "{{variable}}: "
 				},
 				"types": {
 					"line": "Line",
diff --git a/i18n/es-ES.json b/i18n/es-ES.json
index 1c118d5..afd2e17 100644
--- a/i18n/es-ES.json
+++ b/i18n/es-ES.json
@@ -232,8 +232,8 @@
 				"menuTitle": "Teclas de funciones",
 				"description": "Tecla de funcion",
 				"labels": {
-					"user": "Usuario",
 					"parkingSpot": "El punto de estacionamiento ",
+					"user": "Usuario",
 					"value": "Valor"
 				},
 				"info": {
@@ -246,7 +246,8 @@
 						"parking": "Indicar cuando una llamada a sido puesta en ranura de estacionamiento disponible a la compañía entera. El indicador puede ser usada para transferir una llamada al la ranura de estacionamiento ò contestar una llamada estacionada.",
 						"personal_parking": "Indicar cuando una llamada este puesta en una ranura de estacionamiento dedicada al usuario seleccionado. El indicador puede ser usado para transferir una llamada a la ranura de estacionamiento or recivir una llamada ya estacionada.",
 						"speed_dial": "No es indicada para cualquier evento de llamada pero se puede usar para llamar el número configurado rapidamente."
-					}
+					},
+					"typeTitle": "{{variable}}: "
 				},
 				"types": {
 					"none": "Ningun",
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index 18a2281..efd9f5c 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -208,8 +208,8 @@
 				"menuTitle": "Feature Keys",
 				"description": "Feature key",
 				"labels": {
-					"user": "Utilisateur",
 					"parkingSpot": "Place",
+					"user": "Utilisateur",
 					"value": "Valeur"
 				},
 				"info": {
@@ -222,7 +222,8 @@
 						"parking": "Indique lorsqu'un appel est placé sur une place de parking accessible par l'intégralité de l'entreprise. L'indicateur peut être utilisé pour transférer un appel vers la place de parking ou récupérer un appel en attente.",
 						"personal_parking": "Indique lorsqu'un appel est placé sur une place de parking dédié à l'utilisateur sélectionné. L'indicateur peut être utilisé pour transférer un appel vers la place de parking ou récupérer un appel en attente.",
 						"speed_dial": "N'indique pas l'état d'un appel mais peut être utilisé pour appeller rapidement le numéro configuré."
-					}
+					},
+					"typeTitle": "{{variable}}: "
 				},
 				"types": {
 					"none": "Aucun",
diff --git a/i18n/ru-RU.json b/i18n/ru-RU.json
index c23a7b6..f847fdb 100644
--- a/i18n/ru-RU.json
+++ b/i18n/ru-RU.json
@@ -203,7 +203,9 @@
 				"unselectedCodecs": "Доступные кодеки"
 			},
 			"keys": {
-				"alertMessage": "По-умолчанию эта клавиша будет использована как клавиша линии и мы рекомендуем Вам не изменять этого.",
+				"alert": {
+					"message": "По-умолчанию эта клавиша будет использована как клавиша линии и мы рекомендуем Вам не изменять этого."
+				},
 				"featureKeys": {
 					"title": "Функциональные клавиши",
 					"label": "Функциональная клавиша"
@@ -213,8 +215,8 @@
 					"label": "Комбинированная клавиша"
 				},
 				"labels": {
-					"user": "Пользователь",
 					"parkingSpot": "Парковочная орбита",
+					"user": "Пользователь",
 					"value": "Значение"
 				},
 				"info": {
@@ -228,7 +230,8 @@
 						"parking": "Показывать, когда звонок поставлен на парковочную орбиту, доступную всем пользователям. Индикатор может быть использован для парковки звонка или подключения к запаркованному звонку.",
 						"personal_parking": "Показывать, когда звонок поставлен на персональную парковочную орбиту пользователя. Индикатор может быть использован для парковки звонка или подключения к запаркованному звонку.",
 						"speed_dial": "Не отображать события звонка, использовать только для быстрого набора."
-					}
+					},
+					"typeTitle": "{{variable}}: "
 				},
 				"types": {
 					"line": "Линия",
diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 096a9b0..cf2304a 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -212,17 +212,13 @@ define(function(require) {
 									});
 
 									var actions = [ 'none', 'presence', 'parking', 'personal_parking', 'speed_dial' ],
-										parkingSpots = [],
+										parkingSpots = _.range(1, 11),	// Array with integer numbers >= 1 and < 11
 										extra;
 
 									users.sort(function(a, b) {
 										return a.last_name.toLowerCase() > b.last_name.toLowerCase() ? 1 : -1;
 									});
 
-									for (var i = 0; i < 10; i++) {
-										parkingSpots[i] = i + 1;
-									}
-
 									_.each(actions, function(action, idx, list) {
 										list[idx] = {
 											id: action,
@@ -244,18 +240,28 @@ define(function(require) {
 									};
 
 									_.each(keyTypes, function(key) {
-										var camelCaseKey = self.devicesSnakeToCamel(key);
+										var camelCaseKey = _.camelCase(key);
 
 										extra.provision.keys.push({
 											id: key,
 											type: camelCaseKey,
 											title: self.i18n.active().devices.popupSettings.keys[camelCaseKey].title,
 											label: self.i18n.active().devices.popupSettings.keys[camelCaseKey].label,
-											data: dataDevice.provision[key]
+											data: _.map(dataDevice.provision[key], function(dataItem) {
+												var value = _.get(dataItem, 'value', {});
+
+												if (_.isString(value)) {
+													dataItem.value = {
+														value: value
+													};
+												}
+
+												return dataItem;
+											})
 										});
 									});
 
-									dataDevice.extra = dataDevice.hasOwnProperty('extra') ? $.extend(true, {}, dataDevice.extra, extra) : extra;
+									dataDevice.extra = _.has(dataDevice, 'extra') ? _.merge({}, dataDevice.extra, extra) : extra;
 
 									self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
 								}
@@ -351,25 +357,39 @@ define(function(require) {
 					_.each(value.data, function(val, key) {
 						if (val) {
 							var groupSelector = '.control-group[data-id="' + key + '"] ',
-								valueSelector = '.feature-key-value[data-type="' + val.type + '"]';
+								valueSelector = '.feature-key-value[data-type~="' + val.type + '"]';
 
 							templateDevice
 								.find(section.concat(groupSelector, valueSelector))
-									.addClass('active')
-								.find('[name="provision.keys.' + value.id + '[' + key + '].value"]')
-									.val(val.value);
+								.addClass('active');
+							templateDevice.find(valueSelector + ' [name="provision.keys.' + value.id + '[' + key + '].value.value"]')
+								.val(_.get(val, 'value.value'));
+							templateDevice.find(valueSelector + ' [name="provision.keys.' + value.id + '[' + key + '].value.label"]')
+								.val(_.get(val, 'value.label'));
 						}
 					});
 				});
 
 				templateDevice.find('.keys').sortable({
 					items: '.control-group',
+					placeholder: 'control-group placeholder',
 					update: function() {
-						templateDevice
-								.find('.feature-key-index')
-									.each(function(idx, el) {
-										$(el).text(idx + 1);
-									});
+						var $this = $(this);
+
+						$this
+							.find('.feature-key-index')
+								.each(function(idx, el) {
+									$(el).text(idx + 1);
+								});
+
+						if ($this.data('section') === 'comboKeys') {
+							$this
+								.find('.control-group')
+									.first()
+										.addClass('warning')
+									.siblings('.control-group.warning')
+										.removeClass('warning');
+						}
 					}
 				});
 
@@ -610,10 +630,12 @@ define(function(require) {
 			});
 
 			templateDevice.find('.feature-key-type').on('change', function() {
-				var type = $(this).val();
+				var $this = $(this),
+					type = $this.val(),
+					$featureKeyValue = $this.closest('.feature-key-value');
 
-				$(this).siblings('.feature-key-value.active').removeClass('active');
-				$(this).siblings('.feature-key-value[data-type="' + type + '"]').addClass('active');
+				$featureKeyValue.siblings('.feature-key-value.active[data-type]').removeClass('active');
+				$featureKeyValue.siblings('.feature-key-value[data-type~="' + type + '"]').addClass('active');
 			});
 
 			templateDevice.find('.tabs-section[data-section="featureKeys"] .type-info a').on('click', function() {
@@ -668,7 +690,15 @@ define(function(require) {
 				hasCodecs = $.inArray(originalData.device_type, ['sip_device', 'landline', 'fax', 'ata', 'softphone', 'smartphone', 'mobile', 'sip_uri']) > -1,
 				hasCallForward = $.inArray(originalData.device_type, ['landline', 'cellphone', 'smartphone']) > -1,
 				hasRTP = $.inArray(originalData.device_type, ['sip_device', 'mobile', 'softphone']) > -1,
-				formData = monster.ui.getFormData('form_device');
+				formData = monster.ui.getFormData('form_device'),
+				isValuePropertyEmpty = function(data, property) {
+					return _
+						.chain(data)
+						.get(['value', property])
+						.trim()
+						.isEmpty()
+						.value();
+				};
 
 			if ('mac_address' in formData) {
 				formData.mac_address = monster.util.formatMacAddress(formData.mac_address);
@@ -711,7 +741,7 @@ define(function(require) {
 				});
 			}
 
-			if (formData.hasOwnProperty('provision') && formData.provision.hasOwnProperty('keys')) {
+			if (_.has(formData, 'provision.keys')) {
 				/**
 				 * form2object sends keys back as arrays even if the first key is 1
 				 * they needs to be coerced into an object to match the datatype in originalData
@@ -719,8 +749,23 @@ define(function(require) {
 				_.each(formData.provision.keys, function(value, key, list) {
 					var keys = {};
 
-					list[key].forEach(function(val, idx) {
-						keys[idx] = val.type === 'none' ? null : val;
+					_.each(list[key], function(val, idx) {
+						if (val.type === 'none') {
+							keys[idx] = null;
+						} else {
+							if (val.type === 'parking') {
+								val.value.value = _.parseInt(val.value.value, 10);
+							}
+
+							if (key !== 'combo_keys' || isValuePropertyEmpty(val, 'label')) {
+								if (isValuePropertyEmpty(val, 'value')) {
+									delete val.value;
+								} else {
+									val.value = val.value.value;
+								}
+							}
+							keys[idx] = val;
+						}
 					});
 
 					if (_.isEmpty(keys)) {
@@ -1044,10 +1089,6 @@ define(function(require) {
 			return formattedData;
 		},
 
-		devicesSnakeToCamel: function(string) {
-			return string.replace(/(_\w)/g, function(match) { return match[1].toUpperCase(); });
-		},
-
 		/* Utils */
 		devicesDeleteDevice: function(deviceId, callback) {
 			var self = this;
diff --git a/submodules/devices/devices.css b/submodules/devices/devices.scss
similarity index 79%
rename from submodules/devices/devices.css
rename to submodules/devices/devices.scss
index 9fe5a8a..9f39b83 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.scss
@@ -1,3 +1,5 @@
+@import "../../../../css/partials/base";
+
 #devices_container .devices-header {
 	font-size: 18px;
 	line-height: 30px;
@@ -247,7 +249,6 @@
 }
 
 .voip-edit-device-popup .edit-device .title-bar .device-title > div {
-	display: inline-block;
 	float: left;
 	font-size: 18px;
 	font-weight: bold;
@@ -302,12 +303,6 @@
 	margin: 0 40px 25px 40px;
 }
 
-.voip-edit-device-popup .edit-device .content .tabs-section .helper i {
-	position: absolute;
-	top: 0;
-	left: -25px;
-}
-
 .voip-edit-device-popup .edit-device .content .tabs-section .number-address {
 	display: none;
 }
@@ -372,18 +367,157 @@
 	color: #aaa;
 }
 
-.voip-edit-device-popup .edit-device .feature-key-value {
-	display: none;
-	margin-left: 20px;
-}
-
-.voip-edit-device-popup .edit-device .feature-key-value.active {
-	display: inline-block;
-}
-
-.voip-edit-device-popup .edit-device .feature-key-value label {
-	display: inline-block;
-	margin-right: 10px;
+.voip-edit-device-popup .edit-device {
+	.tabs-section {
+		.section-header {
+			display: flex;
+			flex-direction: row;
+			align-items: stretch;
+			width: 100%;
+			margin-bottom: 1.5rem;
+
+			.title, .helper {
+				margin: 0;
+			}
+
+			.helper {
+				flex: 1;
+				position: static;
+				padding-left: 1rem;
+				text-align: right;
+
+				.text {
+					padding-right: 0.5rem;
+				}
+
+				.collapse {
+					text-align: justify;
+				}
+			}
+		}
+
+		.control-group {
+			background-color: $white;
+
+			&.placeholder {
+				background-color: $white-lilac !important;
+				height: 91px;
+			}
+
+			.drag-handle-icon {
+				margin-right: 12px;
+			}
+
+			.feature-key-value {
+				display: none;
+				margin-left: 20px;
+
+				&.active {
+					display: inline-block;
+				}
+
+				label {
+					display: inline-block;
+					margin-right: 10px;
+				}
+			}
+		}
+
+		&[data-section="comboKeys"]{
+			.control-group {
+				margin-bottom: 0;
+				padding: 1rem;
+				box-shadow: inset 0px 1px 0px 0px #DBDBDE,
+					inset 0px -1px 0px 0px #DBDBDE;
+
+				&.warning {
+					background-color: #FCF8E3;
+
+					.monster-panel-text {
+						display: block;
+					}
+				}
+
+				&:hover {
+					box-shadow: inset 0px 1px 0px 0px #DBDBDE,
+						inset 0px -1px 0px 0px #DBDBDE,
+						0px 1px 4px 0px rgba(21, 21, 23, 0.24);
+
+					.drag-handle-icon {
+						width: 1rem;
+						margin-right: 0.75rem;
+					}
+				}
+
+				.drag-handle-icon {
+					display: inline-block;
+					width: 0;
+					margin-right: 0;
+  					transition: all 0.25s ease-in-out;
+				}
+
+				.controls {
+					margin-left: 0px;
+					display: flex;
+
+					.feature-key-value {
+						display:none;
+						margin-left: 0.5rem;
+
+						&:first-of-type {
+							margin-left: 0;
+						}
+
+						&.active {
+							display: block;
+							width: calc(33.33% - 0.33rem);
+						}
+					}
+				}
+
+				.monster-panel-text {
+					display: none;
+				}
+
+				label {
+					display: block;
+					float: none;
+
+					&.control-label {
+						margin-bottom: 1rem;
+						padding-top: 0;
+						width: auto;
+						text-align: left;
+						font-size: 1rem;
+						color: $woodsmoke;
+					}
+				}
+
+				select {
+					display: block;
+					width: 100%;
+				}
+
+				input {
+					display: block;
+					width: auto;
+				}
+
+				.chosen-container {
+					display: block;
+					width: 100% !important;
+
+					.chosen-drop {
+						width: 100%;
+
+						.chosen-search input {
+							width: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 .voip-edit-device-popup .keys .fa {
diff --git a/submodules/devices/views/devices-sip_device.html b/submodules/devices/views/devices-sip_device.html
index 19af033..5ccd3ae 100644
--- a/submodules/devices/views/devices-sip_device.html
+++ b/submodules/devices/views/devices-sip_device.html
@@ -321,92 +321,105 @@
 
 		{{#each extra.provision.keys}}
 			<div class="tabs-section clearfix keys" data-section="{{type}}">
-				<div class="title">
-					{{{title}}}
-				</div>
-				<div class="type-info helper">
-					<a href="javascript:void(0);" data-toggle="collapse" data-target="#info_content_{{type}}">
-						<i class="fa fa-question-circle"></i>
-						<span class="text">
-							{{ @root.i18n.devices.popupSettings.keys.info.link.showInfo }}
-						</span>
-					</a>
-					<div id="info_content_{{type}}" class="collapse">
-					{{#each @root.extra.provision.keyActions}}
-						{{#if info}}
-						<p>
-							<strong>
-								{{text}}
-							</strong>
-							: {{info}}
-						</p>
-						{{/if}}
-					{{/each}}
-					{{#compare id '===' 'combo_keys'}}
-						<p>
-							<strong>
-								{{@root.i18n.devices.popupSettings.keys.types.line}}
-							</strong>
-							: {{@root.i18n.devices.popupSettings.keys.info.types.line}}
-						</p>
-					{{/compare}}
+				<div class="section-header">
+					<div class="title">
+						{{{title}}}
+					</div>
+					<div class="type-info helper">
+						<a href="javascript:void(0);" data-toggle="collapse" data-target="#info_content_{{type}}">
+							<span class="text">
+								{{ @root.i18n.devices.popupSettings.keys.info.link.showInfo }}
+							</span>
+							{{telicon 'question--circle'}}
+						</a>
+						<div id="info_content_{{type}}" class="collapse">
+						{{#each @root.extra.provision.keyActions}}
+							{{#if info}}
+							<p>
+								<strong>
+									{{replaceVar @root.i18n.devices.popupSettings.keys.info.typeTitle text}}
+								</strong>
+								{{info}}
+							</p>
+							{{/if}}
+						{{/each}}
+						{{#compare id '===' 'combo_keys'}}
+							<p>
+								<strong>
+									{{replaceVar @root.i18n.devices.popupSettings.keys.info.typeTitle @root.i18n.devices.popupSettings.keys.types.line}}
+								</strong>
+								{{@root.i18n.devices.popupSettings.keys.info.types.line}}
+							</p>
+						{{/compare}}
+						</div>
 					</div>
 				</div>
+				<div class="section-content">
 				{{#each data}}
-				<div class="control-group{{#compare ../id '===' 'combo_keys'}}{{#compare @key '===' '0'}} error{{/compare}}{{/compare}}" data-id="{{@key}}">
-					{{#compare ../id '===' 'combo_keys'}}
-						{{#compare @key '===' '0'}}
-							<div class="alert alert-error">
-								{{@root.i18n.devices.popupSettings.keys.alertMessage}}
-							</div>
+					<div class="control-group{{#compare ../id '===' 'combo_keys'}}{{#if @first}} warning{{/if}}{{/compare}}" data-id="{{@key}}">
+						<label for="provision.keys.{{../id}}[{{@key}}].type" class="control-label">
+							{{telicon 'drag-handle' class='drag-handle-icon'}}
+							<span>{{ ../label }}</span> <span class="feature-key-index">{{@key}}</span>
+						</label>
+						{{#compare ../id '===' 'combo_keys'}}
+							{{#monsterPanelText @root.i18n.devices.popupSettings.keys.alert.title 'warning' 'fill-width'}}
+								{{@root.i18n.devices.popupSettings.keys.alert.message}}
+							{{/monsterPanelText}}
 						{{/compare}}
-					{{/compare}}
-					<label for="provision.keys.{{../id}}[{{@key}}].type" class="control-label">
-						<i class="fa fa-reorder monster-gray"></i>
-						{{ ../label }} <span class="feature-key-index">{{@key}}</span>
-					</label>
-					<div class="controls">
-						<select name="provision.keys.{{../id}}[{{@key}}].type" class="feature-key-type span2">
-						{{#select type}}
-							{{#each @root.extra.provision.keyActions}}
-								<option value="{{id}}">{{text}}</option>
-							{{/each}}
+						<div class="controls">
+							<div class="feature-key-value active">
 							{{#compare ../id '===' 'combo_keys'}}
-								<option value="line">{{@root.i18n.devices.popupSettings.keys.types.line}}</option>
+								<label for="provision.keys.{{../id}}[{{@key}}].type">{{ @root.i18n.devices.popupSettings.keys.labels.function }}</label>
 							{{/compare}}
-						{{/select}}
-						</select>
-						<div class="feature-key-value" data-type="presence">
-							<label for="provision.keys.{{../id}}[{{@key}}].value">{{ @root.i18n.devices.popupSettings.keys.labels.user }}</label>
-							<select name="provision.keys.{{../id}}[{{@key}}].value" class="chosen-feature-key-user">
-							{{#each @root.extra.provision.users}}
-								<option value="{{id}}">{{first_name}} {{last_name}}</option>
-							{{/each}}
-							</select>
-						</div>
-						<div class="feature-key-value" data-type="parking">
-							<label for="provision.keys.{{../id}}[{{@key}}].value">{{ @root.i18n.devices.popupSettings.keys.labels.parkingSpot }}</label>
-							<select class="span1" name="provision.keys.{{../id}}[{{@key}}].value">
-							{{#each @root.extra.provision.parkingSpots}}
-								<option value="{{this}}">{{this}}</option>
-							{{/each}}
-							</select>
-						</div>
-						<div class="feature-key-value" data-type="personal_parking">
-							<label for="provision.keys.{{../id}}[{{@key}}].value">{{ @root.i18n.devices.popupSettings.keys.labels.user }}</label>
-							<select name="provision.keys.{{../id}}[{{@key}}].value" class="chosen-feature-key-user">
-							{{#each @root.extra.provision.users}}
-								<option value="{{id}}">{{first_name}} {{last_name}}</option>
-							{{/each}}
-							</select>
-						</div>
-						<div class="feature-key-value" data-type="speed_dial">
-							<label for="provision.keys.{{../id}}[{{@key}}].value">{{ @root.i18n.devices.popupSettings.keys.labels.value }}</label>
-							<input type="text" value="" name="provision.keys.{{../id}}[{{@key}}].value">
+								<select name="provision.keys.{{../id}}[{{@key}}].type" class="feature-key-type span2">
+								{{#select type}}
+									{{#each @root.extra.provision.keyActions}}
+										<option value="{{id}}">{{text}}</option>
+									{{/each}}
+									{{#compare ../id '===' 'combo_keys'}}
+										<option value="line">{{@root.i18n.devices.popupSettings.keys.types.line}}</option>
+									{{/compare}}
+								{{/select}}
+								</select>
+							</div>
+							<div class="feature-key-value" data-type="presence">
+								<label for="provision.keys.{{../id}}[{{@key}}].value.value">{{ @root.i18n.devices.popupSettings.keys.labels.user }}</label>
+								<select name="provision.keys.{{../id}}[{{@key}}].value.value" class="chosen-feature-key-user">
+								{{#each @root.extra.provision.users}}
+									<option value="{{id}}">{{first_name}} {{last_name}}</option>
+								{{/each}}
+								</select>
+							</div>
+							<div class="feature-key-value" data-type="parking">
+								<label for="provision.keys.{{../id}}[{{@key}}].value.value">{{ @root.i18n.devices.popupSettings.keys.labels.parkingSpot }}</label>
+								<select class="span1" name="provision.keys.{{../id}}[{{@key}}].value.value">
+								{{#each @root.extra.provision.parkingSpots}}
+									<option value="{{this}}">{{this}}</option>
+								{{/each}}
+								</select>
+							</div>
+							<div class="feature-key-value" data-type="personal_parking">
+								<label for="provision.keys.{{../id}}[{{@key}}].value.value">{{ @root.i18n.devices.popupSettings.keys.labels.user }}</label>
+								<select name="provision.keys.{{../id}}[{{@key}}].value.value" class="chosen-feature-key-user">
+								{{#each @root.extra.provision.users}}
+									<option value="{{id}}">{{first_name}} {{last_name}}</option>
+								{{/each}}
+								</select>
+							</div>
+							<div class="feature-key-value" data-type="speed_dial">
+								<label for="provision.keys.{{../id}}[{{@key}}].value.value">{{ @root.i18n.devices.popupSettings.keys.labels.value }}</label>
+								<input type="text" value="" name="provision.keys.{{../id}}[{{@key}}].value.value">
+							</div>
+						{{#compare ../id '===' 'combo_keys'}}
+							<div class="feature-key-value" data-type="presence personal_parking speed_dial parking">
+								<label for="provision.keys.{{../id}}[{{@key}}].value.label">{{ @root.i18n.devices.popupSettings.keys.labels.deviceLabel }}</label>
+								<input type="text" value="" name="provision.keys.{{../id}}[{{@key}}].value.label">
+							</div>
+						{{/compare}}
 						</div>
 					</div>
-				</div>
 				{{/each}}
+				</div>
 			</div>
 		{{/each}}
 		</form>

From 8bc333d1b6b066aacc7bc8c4c2d7c96d2c94617c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Thu, 25 Apr 2019 15:29:56 -0600
Subject: [PATCH 31/35] UI-3374: Purge vmbox module from user callflow if not
 found (#140)

---
 submodules/users/users.js     | 86 ++++++++++++++++++++++++++++-------
 submodules/vmboxes/vmboxes.js |  7 +--
 2 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index fc3e52a..e4d4fda 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -4417,17 +4417,30 @@ define(function(require) {
 			});
 		},
 
-		usersGetVMBox: function(vmboxId, callback) {
+		/**
+		 * Creates a Voicemail Box
+		 * @param  {Object}   args
+		 * @param  {Object}   args.data                  Data to be sent by the SDK to the API
+		 * @param  {Object}   args.data.voicemailId      Voicemail box ID
+		 * @param  {Boolean}  [args.data.generateError]  Whether or not to display the generic
+		 *                                               Monster UI error dialog when the request
+		 *                                               fails.
+		 * @param  {Function} [args.success]             Success callback
+		 * @param  {Function} [args.error]               Error callback
+		 */
+		usersGetVMBox: function(args) {
 			var self = this;
 
 			self.callApi({
 				resource: 'voicemail.get',
-				data: {
-					accountId: self.accountId,
-					voicemailId: vmboxId
-				},
+				data: _.merge({
+					accountId: self.accountId
+				}, args.data),
 				success: function(data) {
-					callback(data.data);
+					_.has(args, 'success') && args.success(data.data);
+				},
+				error: function(parsedError, error, globalHandler) {
+					_.has(args, 'error') && args.error(parsedError, error, globalHandler);
 				}
 			});
 		},
@@ -5520,8 +5533,13 @@ define(function(require) {
 						return;
 					}
 
-					self.usersGetVMBox(vmboxLite.id, function(vmbox) {
-						callback(null, vmbox);
+					self.usersGetVMBox({
+						data: {
+							voicemailId: vmboxLite.id
+						},
+						success: function(vmbox) {
+							callback(null, vmbox);
+						}
 					});
 				}
 			], function(err, vmbox) {
@@ -5755,18 +5773,54 @@ define(function(require) {
 						userMainCallflow: callflow
 					});
 
-					if (vmboxId) {
-						self.usersGetVMBox(vmboxId, function(vmbox) {
-							waterfallCallback(null, {
+					if (!vmboxId) {
+						waterfallCallback(null, null, {
+							callflow: callflow
+						});
+						return;
+					}
+
+					self.usersGetVMBox({
+						data: {
+							voicemailId: vmboxId,
+							generateError: false
+						},
+						success: function(vmbox) {
+							waterfallCallback(null, null, {
 								callflow: callflow,
 								vmbox: vmbox
 							});
-						});
-					} else {
-						waterfallCallback(null, {
-							callflow: callflow
-						});
+						},
+						error: function(parsedError, error, globalHandler) {
+							if (error.status === 404) {
+								waterfallCallback(null, vmboxId, {
+									callflow: callflow
+								});
+							} else {
+								globalHandler(parsedError, { generateError: true });
+								waterfallCallback(true);
+							}
+						}
+					});
+				},
+				function(vmboxIdNotFound, data, waterfallCallback) {
+					if (!vmboxIdNotFound) {
+						waterfallCallback(null, data);
+						return;
 					}
+
+					// VMBox no longer exists, so purge it from main callflow
+					monster.pub('voip.vmboxes.removeCallflowModule', {
+						callflow: data.callflow,
+						module: 'voicemail',
+						dataId: vmboxIdNotFound,
+						success: function() {
+							waterfallCallback(null, data);
+						},
+						error: function() {
+							waterfallCallback(true);
+						}
+					});
 				}
 			], function(err, results) {
 				if (err) {
diff --git a/submodules/vmboxes/vmboxes.js b/submodules/vmboxes/vmboxes.js
index 55b5f58..1e735b6 100644
--- a/submodules/vmboxes/vmboxes.js
+++ b/submodules/vmboxes/vmboxes.js
@@ -9,7 +9,8 @@ define(function(require) {
 		requests: {},
 
 		subscribe: {
-			'voip.vmboxes.render': 'vmboxesRender'
+			'voip.vmboxes.render': 'vmboxesRender',
+			'voip.vmboxes.removeCallflowModule': 'vmboxesRemoveCallflowModule'
 		},
 
 		/* Users */
@@ -560,7 +561,7 @@ define(function(require) {
 						callback(null);
 						return;
 					}
-					self.vmboxesRemoveModuleFromCallflow({
+					self.vmboxesRemoveCallflowModule({
 						callflow: userMainCallflow,
 						module: 'voicemail',
 						dataId: voicemailId,
@@ -590,7 +591,7 @@ define(function(require) {
 		 * @param  {Function} [args.success]  Success callback
 		 * @param  {Function} [args.error]    Error callback
 		 */
-		vmboxesRemoveModuleFromCallflow: function(args) {
+		vmboxesRemoveCallflowModule: function(args) {
 			var self = this,
 				callflow = args.callflow,
 				parentFlow = callflow,

From a321225474a8bee1d758b498a2e1c5a01904b4b6 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Fri, 26 Apr 2019 15:35:32 -0700
Subject: [PATCH 32/35] UI-3356: Disable "Assign To" when handling devices from
 user submodule (#143)

* Conditionaly render user assignment feature

* Pass down prop governing user assignment rendering

* Disable user assignment when loaded by user submodule
---
 submodules/devices/devices.js | 50 ++++++++++++++++++++++++++++++-----
 submodules/users/users.js     |  2 ++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index cf2304a..81305cf 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -179,15 +179,30 @@ define(function(require) {
 			return _.isEmpty(types) ? null : types;
 		},
 
+		/**
+		 * @param  {Object} args
+		 * @param  {Object} args.data
+		 * @param  {Boolean} [args.allowAssign]
+		 * @param  {Function} [args.callbackSave]
+		 * @param  {Function} [args.callbackDelete]
+		 */
 		devicesRenderEdit: function(args) {
 			var self = this,
 				data = args.data,
+				allowAssign = _.get(args, 'allowAssign'),
 				callbackSave = args.callbackSave,
 				callbackDelete = args.callbackDelete || function(device) {
 					self.devicesRender();
 				};
 
 			self.devicesGetEditData(data, function(dataDevice) {
+				var renderDeviceArgs = {
+					data: dataDevice,
+					allowAssign: allowAssign,
+					callbackSave: callbackSave,
+					callbackDelete: callbackDelete
+				};
+
 				if (dataDevice.hasOwnProperty('provision')) {
 					self.devicesGetIterator(dataDevice.provision, function(template) {
 						var keyTypes = self.getKeyTypes(template);
@@ -263,23 +278,32 @@ define(function(require) {
 
 									dataDevice.extra = _.has(dataDevice, 'extra') ? _.merge({}, dataDevice.extra, extra) : extra;
 
-									self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
+									self.devicesRenderDevice(_.merge({}, renderDeviceArgs, {
+										data: dataDevice
+									}));
 								}
 							});
 						} else {
-							self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
+							self.devicesRenderDevice(renderDeviceArgs);
 						}
 					}, function() {
-						self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
+						self.devicesRenderDevice(renderDeviceArgs);
 					});
 				} else {
-					self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
+					self.devicesRenderDevice(renderDeviceArgs);
 				}
 			});
 		},
 
+		/**
+		 * @param  {Object} args
+		 * @param  {Boolean} [args.allowAssign]
+		 * @param  {String} args.type
+		 * @param  {Function} args.callback
+		 */
 		devicesRenderAdd: function(args) {
 			var self = this,
+				allowAssign = _.get(args, 'allowAssign'),
 				type = args.type,
 				callback = args.callback,
 				data = {
@@ -304,6 +328,7 @@ define(function(require) {
 					},
 					callbackMissingBrand: function() {
 						self.devicesRenderEdit({
+							allowAssign: allowAssign,
 							data: data,
 							callbackSave: function(dataDevice) {
 								callback && callback(dataDevice);
@@ -313,6 +338,7 @@ define(function(require) {
 				});
 			} else {
 				self.devicesRenderEdit({
+					allowAssign: allowAssign,
 					data: data,
 					callbackSave: function(dataDevice) {
 						callback && callback(dataDevice);
@@ -321,8 +347,18 @@ define(function(require) {
 			}
 		},
 
-		devicesRenderDevice: function(data, callbackSave, callbackDelete) {
+		/**
+		 * @param  {Object} args.data
+		 * @param  {Boolean} [args.allowAssign=true]
+		 * @param  {Function} [args.callbackSave]
+		 * @param  {Function} [args.callbackDelete]
+		 */
+		devicesRenderDevice: function(args) {
 			var self = this,
+				data = _.get(args, 'data'),
+				isAssignAllowed = !!_.get(args, 'allowAssign', true),
+				callbackSave = _.get(args, 'callbackSave'),
+				callbackDelete = _.get(args, 'callbackDelete'),
 				mode = data.id ? 'edit' : 'add',
 				type = data.device_type,
 				popupTitle = mode === 'edit'
@@ -348,7 +384,9 @@ define(function(require) {
 					submodule: 'devices'
 				}));
 
-			deviceForm.find('.tabs-section[data-section="basic"]').append(assignTemplate);
+			if (isAssignAllowed) {
+				deviceForm.find('.tabs-section[data-section="basic"]').append(assignTemplate);
+			}
 
 			if (data.extra.hasOwnProperty('provision') && data.extra.provision.hasOwnProperty('keys')) {
 				_.each(data.extra.provision.keys, function(value) {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index e4d4fda..6fd38fb 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1160,6 +1160,7 @@ define(function(require) {
 					type = $this.data('type');
 
 				monster.pub('voip.devices.renderAdd', {
+					allowAssign: false,
 					type: type,
 					callback: function(device) {
 						var rowDevice = $(self.getTemplate({
@@ -1242,6 +1243,7 @@ define(function(require) {
 					userId = $(this).parents('.grid-row').data('id');
 
 				monster.pub('voip.devices.editDevice', {
+					allowAssign: false,
 					data: { id: id },
 					callbackSave: function(device) {
 						row.find('.edit-device').html(device.name);

From 4b574332b7b70c6182afe193afc893628f84479b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Mon, 29 Apr 2019 14:30:22 -0600
Subject: [PATCH 33/35] UI-3363: Swap provision key items via drag-and-drop
 (#139)

---
 submodules/devices/devices.js   | 111 ++++++++++++++++++++++++++------
 submodules/devices/devices.scss |  22 ++++++-
 2 files changed, 111 insertions(+), 22 deletions(-)

diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 81305cf..a64b015 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -408,27 +408,98 @@ define(function(require) {
 					});
 				});
 
-				templateDevice.find('.keys').sortable({
-					items: '.control-group',
-					placeholder: 'control-group placeholder',
-					update: function() {
-						var $this = $(this);
-
-						$this
-							.find('.feature-key-index')
-								.each(function(idx, el) {
-									$(el).text(idx + 1);
-								});
-
-						if ($this.data('section') === 'comboKeys') {
+				templateDevice.find('.keys').each(function() {
+					var $this = $(this),
+						itemUpdated = false,
+						$itemUnder,
+						$itemBefore,
+						$itemAfter,
+						$siblings;
+
+					$this.sortable({
+						items: '.control-group',
+						placeholder: 'control-group placeholder',
+						update: function(e, ui) {
+							ui.item.addClass('moved');
+
+							itemUpdated = true;
+						},
+						start: function(e, ui) {
+							$itemBefore = ui.item.prevAll('.control-group:not(.placeholder):first');
+							$itemAfter = ui.item.nextAll('.control-group:not(.placeholder):first');
+							$siblings = ui.item.siblings('.control-group');
+						},
+						stop: function(e, ui) {
+							// Swap
+							if (!_.isEmpty($itemUnder) && !$itemUnder.hasClass('placeholder')) {
+								$itemUnder.addClass('moved');
+
+								if (itemUpdated) {
+									// The dragged item was updated, so we only need to swap the other item
+									if (!_.isEmpty($itemBefore) && !$itemUnder.is($itemBefore)) {
+										$itemUnder.remove().insertAfter($itemBefore);
+									} else if (!_.isEmpty($itemAfter) && !$itemUnder.is($itemAfter)) {
+										$itemUnder.remove().insertBefore($itemAfter);
+									}
+								} else {
+									// Special case: the dragged item is over a sibling next to it,
+									// but it did not triggered an update event, because the
+									// placeholder was still at the same original position of the item
+									ui.item.addClass('moved');
+									if (!$itemUnder.is($itemBefore)) {
+										$itemUnder.insertBefore(ui.item);
+									} else if (!$itemUnder.is($itemAfter)) {
+										$itemUnder.insertAfter(ui.item);
+									}
+								}
+							}
+
+							// Update items
 							$this
-								.find('.control-group')
-									.first()
-										.addClass('warning')
-									.siblings('.control-group.warning')
-										.removeClass('warning');
-						}
-					}
+								.find('.feature-key-index')
+									.each(function(idx, el) {
+										$(el).text(idx + 1);
+									});
+
+							if ($this.data('section') === 'comboKeys') {
+								$this
+									.find('.control-group')
+										.first()
+											.addClass('warning')
+										.siblings('.control-group.warning')
+											.removeClass('warning');
+							}
+
+							// Cleanup
+							if (!_.isEmpty($itemUnder)) {
+								$itemUnder.removeClass('selected');
+								$itemUnder = null;
+							}
+							itemUpdated = false;
+						},
+						sort: _.debounce(function(e, ui) {
+							var $newItemUnder = $siblings.filter(function(idx, elem) {
+								var itemPosition = ui.position,
+									$elem = $(elem),
+									elemPosition = $elem.position();
+								return itemPosition.left >= elemPosition.left
+									&& itemPosition.left <= elemPosition.left + $elem.width()
+									&& itemPosition.top >= elemPosition.top
+									&& itemPosition.top <= elemPosition.top + $elem.height();
+							});
+
+							if ($newItemUnder.is($itemUnder)) {
+								return;
+							}
+
+							if (!_.isEmpty($itemUnder)) {
+								$itemUnder.removeClass('selected');
+							}
+
+							$newItemUnder.addClass('selected');
+							$itemUnder = $newItemUnder;
+						}, 50)
+					});
 				});
 
 				templateDevice
diff --git a/submodules/devices/devices.scss b/submodules/devices/devices.scss
index 9f39b83..fa84cbb 100644
--- a/submodules/devices/devices.scss
+++ b/submodules/devices/devices.scss
@@ -397,11 +397,26 @@
 		}
 
 		.control-group {
+			margin-bottom: 0;
 			background-color: $white;
+			padding: 0.5rem 0;
 
 			&.placeholder {
 				background-color: $white-lilac !important;
-				height: 91px;
+				height: 30px;
+			}
+
+			&.selected, &.selected.placeholder {
+				background-color: $dodger-blue !important;
+			}
+
+			@keyframes highlight-out {
+				0%   { background-color: $dodger-blue }
+				100% { background-color: $white }
+			}
+
+			&.moved {
+				animation: highlight-out 1s ease-in-out;
 			}
 
 			.drag-handle-icon {
@@ -425,11 +440,14 @@
 
 		&[data-section="comboKeys"]{
 			.control-group {
-				margin-bottom: 0;
 				padding: 1rem;
 				box-shadow: inset 0px 1px 0px 0px #DBDBDE,
 					inset 0px -1px 0px 0px #DBDBDE;
 
+				&.placeholder {
+					height: 91px;
+				}
+
 				&.warning {
 					background-color: #FCF8E3;
 

From ecdc309fcad133aea7912ed871350f26e2e9588a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= <guillegr123@gmail.com>
Date: Wed, 8 May 2019 14:37:38 -0600
Subject: [PATCH 34/35] UI-3344: Fit edit device dialog to viewport height
 (#142)

---
 submodules/devices/devices.js   |  3 +--
 submodules/devices/devices.scss | 13 ++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index a64b015..bd12da6 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -758,9 +758,8 @@ define(function(require) {
 			});
 
 			var popup = monster.ui.dialog(templateDevice, {
-				position: ['center', 20],
 				title: popupTitle,
-				dialogClass: 'voip-edit-device-popup overflow-visible'
+				dialogClass: 'voip-edit-device-popup'
 			});
 		},
 
diff --git a/submodules/devices/devices.scss b/submodules/devices/devices.scss
index fa84cbb..348a1e8 100644
--- a/submodules/devices/devices.scss
+++ b/submodules/devices/devices.scss
@@ -223,10 +223,6 @@
 }
 
 /* Adding / Edition Devices Popups */
-.overflow-visible .ui-dialog-content {
-	overflow: visible;
-}
-
 .voip-edit-device-popup .edit-device {
 	width: 700px;
 }
@@ -244,7 +240,6 @@
 
 .voip-edit-device-popup .edit-device .title-bar {
 	border-bottom: 1px solid #ccc;
-	margin-bottom: 20px;
 	padding: 15px 0;
 }
 
@@ -276,6 +271,10 @@
 	margin-right: 15px;
 }
 
+.voip-edit-device-popup .edit-device .content {
+	padding-top: 1.5rem;
+}
+
 .voip-edit-device-popup .edit-device .content .tabs-section.keys {
 	padding: 0 20px;
 }
@@ -438,6 +437,10 @@
 			}
 		}
 
+		&[data-section="featureKeys"] input[type="text"] {
+			width: 190px;
+		}
+
 		&[data-section="comboKeys"]{
 			.control-group {
 				padding: 1rem;

From 85400e7c6d97019d23dd8a7c233f6c6337b04bdf Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Tue, 14 May 2019 13:27:52 -0700
Subject: [PATCH 35/35] MSPB-1: Translate call handling strategy reset confirm
 to German (#144)

---
 i18n/de-DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n/de-DE.json b/i18n/de-DE.json
index 83a95ad..203d7c3 100644
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@ -947,7 +947,8 @@
 		},
 		"confirmMessages": {
 			"deleteHoliday": "Dieser Feiertag wird dauerhaft gelöscht. Vorgang fortsetzen?",
-			"disableHolidays": "Alle vorhandenen Feiertage werden dauerhaft gelöscht. Vorgang fortsetzen?"
+			"disableHolidays": "Alle vorhandenen Feiertage werden dauerhaft gelöscht. Vorgang fortsetzen?",
+			"resetCalls": "Alle Strategien zur Verarbeitung eingehender Anrufe werden auf die Standardwerte zurückgesetzt. Fortfahren?"
 		},
 		"alertMessages": {
 			"uniqueHoliday": "Jeder Feiertag benötigt einen eindeutigen Namen.",