From 45c583707e892cda0191050312bf27b7fbdd6e76 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Fri, 8 Aug 2014 12:30:50 -0700
Subject: [PATCH] UI-294: Use correct user email address and handle DELETE
 faxbox endpoint not working

---
 submodules/users/users.js       | 20 ++++++++++++++------
 views/users-feature-faxing.html |  4 ++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index b5bb305..108bad9 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2279,8 +2279,12 @@ define(function(require){
 					}
 				}
 
-				if('differentEmail' in userData.extra) {
-					userData.email = userData.extra.differentEmail ? userData.extra.email : userData.username;
+				if('differentEmail' in userData.extra && userData.extra.differentEmail) {
+					if ( 'email' in userData.extra ) {
+						userData.email = userData.extra.email
+					}
+				} else {
+					userData.email = userData.username;
 				}
 
 				if('language' in userData.extra) {
@@ -3652,7 +3656,7 @@ define(function(require){
 							data.user.smartpbx.faxing.enabled = true;
 
 							self.usersUpdateUser(data.user, function(user) {
-								callback && callback(null, user);
+								callback && callback(null, user.data);
 							});
 						}
 					}
@@ -3708,9 +3712,7 @@ define(function(require){
 						caller_name: user.first_name.concat(' ', user.last_name),
 						fax_header: monster.config.company.name.concat(self.i18n.active().users.faxing.defaultSettings.headerExtension),
 						fax_timezone: user.timezone,
-						smtp_permission_list: [],
 						owner_id: user.id,
-						retries: 3,
 						notifications: {
 							inbound: {
 								email: {
@@ -3809,12 +3811,18 @@ define(function(require){
 													resource: 'faxbox.delete',
 													data: {
 														accountId: self.accountId,
-														faxboxId: data.data.flow.data.faxbox_id
+														faxboxId: data.data.flow.data.faxbox_id,
+														generateError: false
 													},
 													success: function(_data, status) {
 														self.usersDeleteCallflow(callflow.id, function(results) {
 															subCallback(null, results);
 														});
+													},
+													error: function(_data, error) {
+														self.usersDeleteCallflow(callflow.id, function(results) {
+															subCallback(null, results);
+														});
 													}
 												});
 											}
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html
index c3eca17..a7fca75 100644
--- a/views/users-feature-faxing.html
+++ b/views/users-feature-faxing.html
@@ -10,7 +10,11 @@
 	</div>
 
 	<div class="content{{#unless user.extra.mapFeatures.faxing.active}} disabled{{/unless}}">
+	{{#if faxbox}}
+		<p>{{replaceVar i18n.users.faxing.text this.faxbox.notifications.inbound.email.send_to}}</p>
+	{{else}}
 		<p>{{replaceVar i18n.users.faxing.text this.user.email }}</p>
+	{{/if}}
 		<form class="form-horizontal" id="faxbox_form">
 			<div class="control-group">
 				<label for="caller_id" class="control-label">{{ i18n.users.faxing.form.label.callerId }}</label>