From d9c4004f74b26fbcead0d61cbcaa1f9433685e48 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Tue, 29 Jul 2014 17:37:02 -0700
Subject: [PATCH] UI-294: Add default faxbox settings

---
 submodules/users/users.js       | 46 ++++++++++++++++-----------------
 views/users-feature-faxing.html |  4 +--
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 525a0d6..b5bb305 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1470,7 +1470,7 @@ define(function(require){
 			});
 
 			featureTemplate.find('.save').on('click', function() {
-				var faxboxData = form2object('faxbox_form', '.', true),
+				var newNumber = featureTemplate.find('#caller_id').val(),
 					args = {
 						openedTab: 'features',
 						callback: function() {
@@ -1479,13 +1479,7 @@ define(function(require){
 					};
 
 				if ( switchFeature.bootstrapSwitch('status') ) {
-					faxboxData.owner_id = faxboxData.hasOwnProperty('owner_id') ? faxboxData.owner_id : data.user.id;
-
-					if ( data.hasOwnProperty('faxbox') ) {
-						faxboxData.id = data.faxbox.id;
-					}
-
-					self.usersUpdateFaxing(data, faxboxData, function(results) {
+					self.usersUpdateFaxing(data, newNumber, function(results) {
 						args.userId = results.callflow.owner_id;
 
 						self.usersRender(args);
@@ -3626,7 +3620,7 @@ define(function(require){
 			);
 		},
 
-		usersUpdateFaxing: function(data, faxboxData, globalCallback) {
+		usersUpdateFaxing: function(data, newNumber, globalCallback) {
 			var self = this;
 
 			monster.parallel({
@@ -3642,8 +3636,7 @@ define(function(require){
 								}
 							});
 
-							self.usersUpdateCallflowFaxing(data.user, faxboxData, baseCallflow, function(callflow) {
-console.log(callflow);
+							self.usersUpdateCallflowFaxing(data, newNumber, baseCallflow, function(callflow) {
 								callback && callback(null, callflow);
 							});
 						});
@@ -3670,24 +3663,32 @@ console.log(callflow);
 			);
 		},
 
-		usersUpdateCallflowFaxing: function(user, faxbox, callflow, callback) {
+		usersUpdateCallflowFaxing: function(data, newNumber, callflow, callback) {
 			var self = this,
+				user = data.user,
+				faxbox = data.faxbox,
 				baseCallflow = {
 					type: 'faxing',
-					owner_id: faxbox.owner_id,
-					numbers: [ faxbox.caller_id ],
+					owner_id: user.id,
+					numbers: [ newNumber ],
 					flow: {
 						module: 'faxbox',
 						children: {},
 						data: {
-							faxbox_id: faxbox.id
+							faxbox_id: faxbox ? faxbox.id : ''
 						}
 					}
+				},
+				number = {
+					caller_id: newNumber,
+					fax_identity: monster.util.formatPhoneNumber(newNumber)
 				};
 
 			callflow = $.extend(true, {}, baseCallflow, callflow);
 
-			if(callflow.id) {
+			if( callflow.hasOwnProperty('id') ) {
+				faxbox = $.extend(true, {}, faxbox, number);
+
 				self.callApi({
 					resource: 'faxbox.update',
 					data:{
@@ -3699,21 +3700,17 @@ console.log(callflow);
 						self.usersUpdateCallflow(callflow, function(callflow) {
 							callback && callback(callflow);
 						});
-					},
-					error: function(_data, status) {
-						console.log(_data, status);
 					}
 				});
-			}
-			else {
+			} else {
 				var defaultFaxbox = {
 						name: user.first_name.concat(' ', user.last_name, self.i18n.active().users.faxing.defaultSettings.nameExtension),
 						caller_name: user.first_name.concat(' ', user.last_name),
 						fax_header: monster.config.company.name.concat(self.i18n.active().users.faxing.defaultSettings.headerExtension),
-						fax_identity: monster.util.formatPhoneNumber(faxbox.caller_id),
+						fax_timezone: user.timezone,
 						smtp_permission_list: [],
+						owner_id: user.id,
 						retries: 3,
-						fax_timezone: user.timezone,
 						notifications: {
 							inbound: {
 								email: {
@@ -3728,12 +3725,13 @@ console.log(callflow);
 						}
 					};
 
-				faxbox = $.extend(true, {}, defaultFaxbox, faxbox);
+				faxbox = $.extend(true, {}, defaultFaxbox, number);
 
 				self.callApi({
 					resource: 'faxbox.create',
 					data: {
 						accountId: self.accountId,
+						userId: user.id,
 						data: faxbox
 					},
 					success: function(_data, status) {
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html
index 32e143e..c3eca17 100644
--- a/views/users-feature-faxing.html
+++ b/views/users-feature-faxing.html
@@ -22,14 +22,14 @@
 					</select>
 				</div>
 			</div>
-			{{#if faxbox.cloud_connector_claim_url}}
+		{{#if faxbox.cloud_connector_claim_url}}
 			<div class="control-group">
 				<label for="printer_link" class="control-label">{{ i18n.users.faxing.form.label.linkToPrinter }}</label>
 				<div class="controls">
 					<a id="printer_link" href="{{faxbox.cloud_connector_claim_url}}" target="_blank">{{faxbox.cloud_connector_claim_url}}</a>
 				</div>
 			</div>
-			{{/if}}
+		{{/if}}
 		</form>
 		<div class="help-box gray-box">
 			<div class="wrapper-icon">