viithiisys / Acufuel

Browse Code »

Commit 9b112a598518479aee01ad14917fc76af9c4f1d4

Authored by Kuldeep Arora 2018-07-19 09:29:27 -0400

1 parent 3b466beb3e

Exists in master

additional account reset pwd ui

Showing 3 changed files with 34 additions and 3 deletions Show diff stats

app/partials/accountSetting/accountSetting.Controller.js

Diff comments View file @9b112a5

 (function() {
     'use strict'
     angular.module('acufuel')
         .controller('AccountSettingController', [ '$scope', '$filter', '$rootScope', '$state', 'AccountSettingService', AccountSettingController]);
       function AccountSettingController($scope, $filter, $rootScope, $state, AccountSettingService) {
           $scope.addArray = [];
           $scope.userData = {};
           getAdditionalAccounts();
           function getAdditionalAccounts() {
             AccountSettingService.getAdditionalAccounts().then(function(result) {
               $scope.additionalAccounts = result;
                 })
           }
           $scope.userid = JSON.parse(localStorage.getItem('userProfileId'));
           if($scope.userid && $scope.userid != null && $scope.userid != undefined){
             var id = $scope.userid;
             AccountSettingService.loginUserData(id).then(function(result) {
                 $scope.userData = result;
                 $scope.userData.status = $scope.userData.account.user.status.toLowerCase();
                 $scope.userData.userType = $scope.userData.userType.type.toLowerCase();
             })
           }
           AccountSettingService.getProducts().then(function(result) {
                 $scope.productList = result;
                 for(var i=0;i<$scope.productList.length;i++){
                   var obj = {
                     id : $scope.productList[i].id,
                     name : $scope.productList[i].name,
                     status : $scope.productList[i].status
                   }
                   $scope.addArray.push(obj);
                 }
           })
           $scope.productData = {};
           $scope.productData.productList = [];
           $scope.checkProduct = function(productlist, product, index){
               $scope.addArray[index].id =  productlist[index].id;
               $scope.addArray[index].name =  productlist[index].name;
               $scope.addArray[index].status =  productlist[index].status;
               $scope.productData.productList = $scope.addArray;
                console.log($scope.productData)
           }
           $scope.updateUser = function(){
             var updateData = "companyName=" + $scope.userData.companyName + "&username=" + $scope.userData.username + "&firstName=" + $scope.userData.firstName
             + "&lastName=" + $scope.userData.lastName + "&phone=" + $scope.userData.phone + "&mobile=" + $scope.userData.mobile
             + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid;
             AccountSettingService.updateUserProfile(updateData).then(function(result) {
               AccountSettingService.updateProducts($scope.productData).then(function(result) {
                 toastr.success(''+result.success+'', {
                     closeButton: true
                 });
                 window.localStorage.setItem('currentUserName', JSON.stringify($scope.userData.firstName +' '+ $scope.userData.lastName));
                 window.localStorage.setItem('companyName', JSON.stringify($scope.userData.companyName));
                 $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName'));
                 $scope.companyName= JSON.parse(localStorage.getItem('companyName'))
                 $scope.testFunction();
               })
             })
           }
           $scope.accountdata = {};
           $scope.accountdata.userName = '';
           $scope.accountdata.status = true;
             $scope.addAccount = function(){
               $('#demo-modal').css('display', 'block');
                $scope.accountdata.status = true;
           }
           $scope.cancelAddAccount = function(){
               $scope.accountdata = {};
               $('#demo-modal').css('display', '');
           }
           $scope.checkEmail = function(email, type) {
         	  console.log(type)
         	  AccountSettingService.checkEmail(email).then(function(result) {
         		  if(result.status == 'ACTIVE'){
         			  toastr.error('Email already exists.', {
                           closeButton: true
                       })
                       if(type == 'additional'){
                     	  $scope.accountdata.userName = '';
                       }
         		  }
         	  })
           }
            $scope.additionalAccnObj = {};
            $scope.createAddAccount = function(){
             $scope.accountdata.status = true;
               if ($scope.accountdata.userName === '') {
                 toastr.error('Please enter all the fields.', {
                     closeButton: true
                 })
               }else{
                 if (validateEmail($scope.accountdata.userName)) {
                   console.log("checkbox",$scope.accountdata.allowEpd ,$scope.accountdata.allowFma
 )
                    AccountSettingService.addAdditionalAccount($scope.accountdata).then(function(result) {
                       getAdditionalAccounts();
                       $scope.accountdata = {};
                       $('#demo-modal').css('display', '');
                       toastr.success(''+result.success+'', {
                           closeButton: true
                       })
                     })
                 }else{
                   toastr.error('Please enter valid email.', {
                       closeButton: true
                   })
                 }
               }
           }
         /*Validate Email */
          function validateEmail(email) {
             var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
             return re.test(email);
           }
                $scope.changeStatus = function(id, index){
                event.stopPropagation();
                var id = id;
                var statusData = "status=" + $scope.additionalAccounts[index].status + "&id=" + $scope.additionalAccounts[index].id + "&firstName=" + $scope.additionalAccounts[index].firstName
                + "&lastName=" + $scope.additionalAccounts[index].lastName + "&username=" + $scope.additionalAccounts[index].userName + "&password=" + $scope.additionalAccounts[index].password
                + "&allowEpd=" + $scope.additionalAccounts[index].allowEpd + "&allowFma=" + $scope.additionalAccounts[index].allowFma;
                AccountSettingService.updateStatus(statusData).then(function(result) {
                    if(result.success){
                      toastr.success('Updated Successfully', {
                            closeButton: true
                        })
                    }
                })
             }
            var deleteAccnId = "";
            $scope.deleteAdditionalAccount = function(id) {
              $('#delete1').css('display', 'block');
                deleteAccnId = id;
            }
            $scope.accnDelete = function(){
              AccountSettingService.deleteAccount(deleteAccnId).then(function(result) {
                getAdditionalAccounts();
                $('#delete1').css('display', 'none');
                    if(result.success){
                      toastr.success('Deleted Successfully', {
                            closeButton: true
                        })
                    }
                })
            }
            $scope.cancelDelete = function(){
              $('#delete1').css('display', 'none');
            }
+           $scope.resetPassword = function(email) {
+             console.log("emailid",email)
+             AccountSettingService.resetPassword(email).then(function(result){
+                if(typeof result == 'object') {
+                  toastr.info("Password generated successfully. Please check your email for new password");
+                  //localStorage.setItem('requiredChangePwd', "Y");
+                  //$state.go('login');
+                } else {
+                  toastr.info("Error in generating password");
+                }
+              })
+            }
       }
 })();

app/partials/accountSetting/accountSetting.Service.js

Diff comments View file @9b112a5

 (function() {
 	'use strict';
 	angular.module('acufuel').service(
 			'AccountSettingService',
 			[ '$rootScope', '$q', '$http', '$state', 'BASE_URL',
 					AccountSettingService ]);
 	function AccountSettingService($rootScope, $q, $http, $state, BASE_URL) {
 		this.getProducts = function() {
 			var deferred = $q.defer();
 			$http({
 				method : 'GET',
 				url : BASE_URL.url + '/user/products',
 				headers : {
 					'Content-Type' : 'application/json'
 				},
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.updateProducts = function(data) {
 			var deferred = $q.defer();
 			$http({
 				method : 'PUT',
 				url : BASE_URL.url + '/fuelPricing/product',
 				data : data,
 				headers : {
 					'Content-Type' : 'application/json'
 				},
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.loginUserData = function(id) {
 			var deferred = $q.defer();
 			$http({
 				method : 'GET',
 				url : BASE_URL.url + '/account/user/' + id,
 				headers : {
 					'Content-Type' : 'application/json'
 				},
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.checkEmail = function(email) {
 			var deferred = $q.defer();
 			$http({
 				method : 'GET',
 				url : BASE_URL.url + '/user/email/status?email=' + email,
 				headers : {
 					'Content-Type' : 'application/json'
 				},
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.updateUserProfile = function(data) {
 			var deferred = $q.defer();
 			$http({
 				method : 'PUT',
 				url : BASE_URL.url + '/account/updateProfile',
 				headers : {
 					'Content-Type' : 'application/x-www-form-urlencoded'
 				},
 				data : data
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.addAdditionalAccount = function(data) {
 			console.log('----$scope.accountdata--', data);
 			var deferred = $q.defer();
 			$http({
 				method : 'POST',
 				url : BASE_URL.url + '/additionalAccount',
 				headers : {
 					'Content-Type' : 'application/json'
 				},
 				data : data
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.getAdditionalAccounts = function() {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BASE_URL.url +'/user/additionalAccount',
               headers : {'Content-Type': 'application/json'},
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
             //console.log(result.data)
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
 		this.updateStatus = function(data) {
 			var deferred = $q.defer();
 			$http({
 				method : 'PUT',
 				url : BASE_URL.url + '/additionalAccount',
 				headers : {
 					'Content-Type' : 'application/x-www-form-urlencoded'
 				},
 				data : data
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
 		this.deleteAccount = function(id) {
 			var deferred = $q.defer();
 			$http({
 				method : 'DELETE',
 				url : BASE_URL.url + '/additionalAccount/'+id,
 				headers : {
 					'Content-Type' : 'application/x-www-form-urlencoded'
 				}
 			}).then(function(result) {
 				deferred.resolve(result.data);
 			}, function(result) {
 				//console.log(result.data)
 				deferred.resolve(result.data);
 			})
 			return deferred.promise;
 		}
+		this.resetPassword = function(email) {
+          var param = 'email='+ email;
+          var deferred = $q.defer();
+          $http({
+              method : 'PUT',
+              url : BASE_URL.url +'/user/recoverpassword',
+              headers : {'Content-Type': 'application/x-www-form-urlencoded'},
+              data: param
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
 	}
 })();

app/partials/accountSetting/accountSetting.html

Diff comments View file @9b112a5

1	<div class="col-xs-12 col-md-11">	1	<div class="col-xs-12 col-md-11">
2	<div class="row" style="margin-left:0px">	2	<div class="row" style="margin-left:0px">
3	<div class="col-md-5">	3	<div class="col-md-5">
4	<div class="widget">	4	<div class="widget">
5	<div class="widget-header">	5	<div class="widget-header">
6	<i class="fa fa-user" aria-hidden="true"></i>	6	<i class="fa fa-user" aria-hidden="true"></i>
7	<h3>Account Setting</h3>	7	<h3>Account Setting</h3>
8	</div>	8	</div>
9	<!-- /widget-header -->	9	<!-- /widget-header -->
10	<div class="widget-content">	10	<div class="widget-content">
11	<h3 style="color: #666;margin-left: 10px; text-transform: capitalize;"><b>{{userData.companyName}}</b> </h3></br>	11	<h3 style="color: #666;margin-left: 10px; text-transform: capitalize;"><b>{{userData.companyName}}</b> </h3></br>
12		12
13	<form role="form">	13	<form role="form">
14	<div class="col-sm-6">	14	<div class="col-sm-6">
15	<div class="form-group"><label>Email Username</label> <input type="email" placeholder="Username" ng-model="userData.email" ng-blur="checkEmail(userData.email, 'user')" class="form-control"></div>	15	<div class="form-group"><label>Email Username</label> <input type="email" placeholder="Username" ng-model="userData.email" ng-blur="checkEmail(userData.email, 'user')" class="form-control"></div>
16	<div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="userData.firstName" class="form-control"></div>	16	<div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="userData.firstName" class="form-control"></div>
17	<div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="userData.lastName" class="form-control"></div>	17	<div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="userData.lastName" class="form-control"></div>
18	</div>	18	</div>
19		19
20	<div class="col-sm-6">	20	<div class="col-sm-6">
21	<!-- <div class="form-group"><label>Password</label> <input type="password" ng-model="userData.password" placeholder="Password" class="form-control"></div> -->	21	<!-- <div class="form-group"><label>Password</label> <input type="password" ng-model="userData.password" placeholder="Password" class="form-control"></div> -->
22	<div class="form-group"><label>Phone</label> <input type="tel" ng-model="userData.phone" placeholder="Phone" class="form-control"></div>	22	<div class="form-group"><label>Phone</label> <input type="tel" ng-model="userData.phone" placeholder="Phone" class="form-control"></div>
23	<div class="form-group"><label>Mobile</label> <input type="tel" ng-model="userData.mobile" placeholder="Mobile" class="form-control"></div>	23	<div class="form-group"><label>Mobile</label> <input type="tel" ng-model="userData.mobile" placeholder="Mobile" class="form-control"></div>
24	<div class="form-group"><label>Company Name</label> <input type="tel" ng-model="userData.companyName" placeholder="Company Name" class="form-control"></div>	24	<div class="form-group"><label>Company Name</label> <input type="tel" ng-model="userData.companyName" placeholder="Company Name" class="form-control"></div>
25	</div>	25	</div>
26	<div class="col-xs-12">	26	<div class="col-xs-12">
27	<div class="col-xs-12">	27	<div class="col-xs-12">
28	<div class="form-group">	28	<div class="form-group">
29	<div class="row">	29	<div class="row">
30	<div class="col-md-5">	30	<div class="col-md-5">
31	<label class="new-input-label"><b>Fuel Types Offered </b></label>	31	<label class="new-input-label"><b>Fuel Types Offered </b></label>
32	</div>	32	</div>
33	<div class="col-md-7" >	33	<div class="col-md-7" >
34	<label ng-repeat="product in productList" style="width: 100%; font-weight: normal;">	34	<label ng-repeat="product in productList" style="width: 100%; font-weight: normal;">
35	<!-- <input type="checkbox" ng-model="product.status" ng-click="checkProduct(product)"> {{product.name}}<br> -->	35	<!-- <input type="checkbox" ng-model="product.status" ng-click="checkProduct(product)"> {{product.name}}<br> -->
36	<input type="checkbox" id="Weekdays" ng-model="product.status" ng-click="checkProduct(productList, product, $index)">{{product.name}}	36	<input type="checkbox" id="Weekdays" ng-model="product.status" ng-click="checkProduct(productList, product, $index)">{{product.name}}
37	</label>	37	</label>
38	</div>	38	</div>
39	</div>	39	</div>
40	</div>	40	</div>
41	</div>	41	</div>
42	</div>	42	</div>
43	<div class="clearfix"></div>	43	<div class="clearfix"></div>
44	<div class="row" style="text-align: center;">	44	<div class="row" style="text-align: center;">
45	<button type="button" class="btn btn-primary" ng-click="updateUser()">Save</button>	45	<button type="button" class="btn btn-primary" ng-click="updateUser()">Save</button>
46	<button type="button" class="btn btn-default">Cancel</button>	46	<button type="button" class="btn btn-default">Cancel</button>
47	</div>	47	</div>
48	</form>	48	</form>
49	</div>	49	</div>
50	<!-- /widget-content -->	50	<!-- /widget-content -->
51	</div>	51	</div>
52	<!-- /widget -->	52	<!-- /widget -->
53	</div>	53	</div>
54	<div class="col-md-7">	54	<div class="col-md-7">
55	<div class="widget">	55	<div class="widget">
56	<div class="widget-header">	56	<div class="widget-header">
57	<i class="fa fa-tasks" aria-hidden="true"></i>	57	<i class="fa fa-tasks" aria-hidden="true"></i>
58	<h3>Additional User Accounts</h3>	58	<h3>Additional User Accounts</h3>
59	<div class="pull-right">	59	<div class="pull-right">
60	<button type="submit" style="margin-top: 4px;margin-right: 9px;" ng-click="addAccount()" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>	60	<button type="submit" style="margin-top: 4px;margin-right: 9px;" ng-click="addAccount()" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>
61	</div>	61	</div>
62	<div class="clearfix"></div>	62	<div class="clearfix"></div>
63	</div>	63	</div>
64	<!-- /widget-header -->	64	<!-- /widget-header -->
65	<div class="widget-content">	65	<div class="widget-content">
66	<div class="table-responsive">	66	<div class="table-responsive">
67	<table class="table table-bordered table-hover table-striped">	67	<table class="table table-bordered table-hover table-striped">
68	<thead>	68	<thead>
69	<tr>	69	<tr>
70	<th></th>	70	<th></th>
71	<th>First Name</th>	71	<th>First Name</th>
72	<th>Last Name</th>	72	<th>Last Name</th>
73	<th>Email Username</th>	73	<th>Email Username</th>
74	<th>Password</th>	74	<th>Password</th>
75	<th>Control</th>	75	<th>Control</th>
76	</tr>	76	</tr>
77	</thead>	77	</thead>
78	<tbody>	78	<tbody>
79	<tr ng-repeat="additionalAccount in additionalAccounts">	79	<tr ng-repeat="additionalAccount in additionalAccounts">
80	<td>	80	<td>
81	<i class="fa fa-trash-o deleteTierIcon" ng-click="deleteAdditionalAccount(additionalAccount.id)" aria-hidden="true"></i>	81	<i class="fa fa-trash-o deleteTierIcon" ng-click="deleteAdditionalAccount(additionalAccount.id)" aria-hidden="true"></i>
82	</td>	82	</td>
83	<td>{{additionalAccount.firstName}}</td>	83	<td>{{additionalAccount.firstName}}</td>
84	<td>{{additionalAccount.lastName}}</td>	84	<td>{{additionalAccount.lastName}}</td>
85	<td>{{additionalAccount.userName}}</td>	85	<td>{{additionalAccount.userName}}</td>
86	<!-- <td>{{additionalAccount.password}}</td> -->	86	<!-- <td>{{additionalAccount.password}}</td> -->
87	<td> <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="resetPassword()" >Reset Password</button></td>	87	<td> <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="resetPassword(additionalAccount.userName)" >Reset Password</button></td>
88	<td>	88	<td>
89	<toggle ng-model="additionalAccount.status" ng-change="changeStatus(additionalAccount.id, $index)" size="customToogle"></toggle>	89	<toggle ng-model="additionalAccount.status" ng-change="changeStatus(additionalAccount.id, $index)" size="customToogle"></toggle>
90	</td>	90	</td>
91	</tr>	91	</tr>
92	</tbody>	92	</tbody>
93	</table>	93	</table>
94	</div>	94	</div>
95	</div>	95	</div>
96	<!-- /widget-content -->	96	<!-- /widget-content -->
97	</div>	97	</div>
98	<!-- /widget -->	98	<!-- /widget -->
99	</div>	99	</div>
100	<!-- /span6 -->	100	<!-- /span6 -->
101	</div>	101	</div>
102	<!-- /widget -->	102	<!-- /widget -->
103	</div>	103	</div>
104	<!-- /container -->	104	<!-- /container -->
105	<div class="clearfix"></div>	105	<div class="clearfix"></div>
106		106
107	<form class="modal multi-step" id="demo-modal" name="fuelOrderUpdateForm">	107	<form class="modal multi-step" id="demo-modal" name="fuelOrderUpdateForm">
108	<div class="modal-dialog modal-m">	108	<div class="modal-dialog modal-m">
109	<div class="modal-content">	109	<div class="modal-content">
110	<div class="modal-body step-1" data-step="1" style="padding: 0;">	110	<div class="modal-body step-1" data-step="1" style="padding: 0;">
111	<div>	111	<div>
112	<div class="row" style="margin: 0;">	112	<div class="row" style="margin: 0;">
113	<div>	113	<div>
114	<div class="widget" style="margin-bottom: 0;">	114	<div class="widget" style="margin-bottom: 0;">
115	<div class="widget-header">	115	<div class="widget-header">
116	<i class="icon-pencil"></i>	116	<i class="icon-pencil"></i>
117	<i class="fa fa-user" aria-hidden="true"></i>	117	<i class="fa fa-user" aria-hidden="true"></i>
118	<h3>Account Settings</h3>	118	<h3>Account Settings</h3>
119	<div class="pull-right" style="margin-top: 5px; margin-right: 10px;">	119	<div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
120	<toggle ng-model="accountdata.status" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>	120	<toggle ng-model="accountdata.status" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
121	</div>	121	</div>
122	<div class="clearfix"></div>	122	<div class="clearfix"></div>
123	</div>	123	</div>
124	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	124	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
125	<div class="col-xs-12">	125	<div class="col-xs-12">
126	<div class="col-xs-12">	126	<div class="col-xs-12">
127	<h2 style="color:#666;">Additional User Control</h2>	127	<h2 style="color:#666;">Additional User Control</h2>
128	</div>	128	</div>
129	<div class="clearfix"></div><br>	129	<div class="clearfix"></div><br>
130		130
131	<div class="col-xs-12">	131	<div class="col-xs-12">
132		132
133	<div class="col-md-6">	133	<div class="col-md-6">
134	<div class="pull-left" style="width: 110px;">	134	<div class="pull-left" style="width: 110px;">
135	<label class="new-input-label"><b>First Name</b></label>	135	<label class="new-input-label"><b>First Name</b></label>
136	</div>	136	</div>
137		137
138		138
139	</div>	139	</div>
140	<div class="col-md-6">	140	<div class="col-md-6">
141	<div class="pull-left" style="width: 110px;">	141	<div class="pull-left" style="width: 110px;">
142	<label class="new-input-label"><b>Last Name</b></label>	142	<label class="new-input-label"><b>Last Name</b></label>
143	</div>	143	</div>
144		144
145		145
146	</div>	146	</div>
147		147
148	</div>	148	</div>
149		149
150	<br/>	150	<br/>
151		151
152		152
153	<div class="col-xs-12">	153	<div class="col-xs-12">
154		154
155	<div class="col-md-6">	155	<div class="col-md-6">
156	<div class="pull-left" style="width: calc(140% - 170px);">	156	<div class="pull-left" style="width: calc(140% - 170px);">
157	<input type="text" ng-model="accountdata.firstName" placeholder="First Name" class="form-control" >	157	<input type="text" ng-model="accountdata.firstName" placeholder="First Name" class="form-control" >
158	</div>	158	</div>
159		159
160	<div class="clearfix"></div>	160	<div class="clearfix"></div>
161	</div>	161	</div>
162	<div class="col-md-6">	162	<div class="col-md-6">
163	<div class="pull-left" style="width: calc(140% - 170px);">	163	<div class="pull-left" style="width: calc(140% - 170px);">
164	<input type="text" ng-model="accountdata.lastName" placeholder="Last Name" class="form-control" >	164	<input type="text" ng-model="accountdata.lastName" placeholder="Last Name" class="form-control" >
165	</div>	165	</div>
166		166
167	<div class="clearfix"></div>	167	<div class="clearfix"></div>
168	</div>	168	</div>
169	</div>	169	</div>
170	<div class="clearfix"></div>	170	<div class="clearfix"></div>
171	<br/>	171	<br/>
172		172
173	<div class="col-xs-12">	173	<div class="col-xs-12">
174		174
175	<div class="col-md-6">	175	<div class="col-md-6">
176	<div class="pull-left" style="width: 110px;">	176	<div class="pull-left" style="width: 110px;">
177	<label class="new-input-label"><b>Email Username</b></label>	177	<label class="new-input-label"><b>Email Username</b></label>
178	</div>	178	</div>
179		179
180		180
181	</div>	181	</div>
182	<div class="col-md-6">	182	<div class="col-md-6">
183	<div class="pull-left" style="width: 110px;">	183	<div class="pull-left" style="width: 110px;">
184	<label class="new-input-label"><b>Password</b></label>	184	<label class="new-input-label"><b>Password</b></label>
185	</div>	185	</div>
186		186
187		187
188	</div>	188	</div>
189		189
190	</div>	190	</div>
191		191
192	<br/>	192	<br/>
193	<div class="col-xs-12">	193	<div class="col-xs-12">
194		194
195	<div class="col-md-6">	195	<div class="col-md-6">
196	<div class="pull-left" style="width: calc(140% - 170px);">	196	<div class="pull-left" style="width: calc(140% - 170px);">
197	<input type="email" ng-model="accountdata.userName" ng-blur="checkEmail(accountdata.userName, 'additional')" placeholder="XYZfbo@gmail.com" class="form-control" required >	197	<input type="email" ng-model="accountdata.userName" ng-blur="checkEmail(accountdata.userName, 'additional')" placeholder="XYZfbo@gmail.com" class="form-control" required >
198	</div>	198	</div>
199		199
200	<div class="clearfix"></div>	200	<div class="clearfix"></div>
201	</div>	201	</div>
202	<div class="col-md-6">	202	<div class="col-md-6">
203	<div class="pull-left" style="width: calc(140% - 170px);">	203	<div class="pull-left" style="width: calc(140% - 170px);">
204	<input type="text" ng-model="accountdata.password" placeholder="Password" class="form-control" >	204	<input type="text" ng-model="accountdata.password" placeholder="Password" class="form-control" >
205	</div>	205	</div>
206		206
207	<div class="clearfix"></div>	207	<div class="clearfix"></div>
208	</div>	208	</div>
209	</div>	209	</div>
210	<div class="clearfix"></div>	210	<div class="clearfix"></div>
211	<div class="clearfix"></div>	211	<div class="clearfix"></div>
212	<br/>	212	<br/>
213	<div class="col-xs-12">	213	<div class="col-xs-12">
214	<div class="col-md-6">	214	<div class="col-md-6">
215	<input type="checkbox" id="Weekdays" ng-model="accountdata.allowFma" >&nbsp Allow Fuel Manager Access	215	<input type="checkbox" id="Weekdays" ng-model="accountdata.allowFma" >&nbsp Allow Fuel Manager Access
216	<br>	216	<br>
217	<input type="checkbox" id="Weekdays" ng-model="accountdata.allowEpd" >&nbsp Allow Emailed Price Distribution	217	<input type="checkbox" id="Weekdays" ng-model="accountdata.allowEpd" >&nbsp Allow Emailed Price Distribution
218	</div>	218	</div>
219	</div>	219	</div>
220	<div class="clearfix"></div>	220	<div class="clearfix"></div>
221	<br/>	221	<br/>
222	<div class="col-xs-12">	222	<div class="col-xs-12">
223		223
224	</div>	224	</div>
225		225
226		226
227	</div>	227	</div>
228	</div>	228	</div>
229		229
230	</div>	230	</div>
231	</div>	231	</div>
232	</div>	232	</div>
233	</div>	233	</div>
234		234
235	<div class="modal-footer" style="border-top: 0;">	235	<div class="modal-footer" style="border-top: 0;">
236	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()" >Save</button>	236	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()" >Save</button>
237	<button type="button" class="btn btn-default" ng-click="cancelAddAccount()" data-dismiss="modal">Cancel</button>	237	<button type="button" class="btn btn-default" ng-click="cancelAddAccount()" data-dismiss="modal">Cancel</button>
238	</div>	238	</div>
239	</div>	239	</div>
240	</div>	240	</div>
241	</div>	241	</div>
242	</form>	242	</form>
243	<div class="customConfirmPopBackdrop" id="delete1">	243	<div class="customConfirmPopBackdrop" id="delete1">
244	<div class="customModalInner" style="max-width: 400px;">	244	<div class="customModalInner" style="max-width: 400px;">
245	<div class="customModelBody" style="border-radius: 5px 5px 0 0;">	245	<div class="customModelBody" style="border-radius: 5px 5px 0 0;">
246	<table>	246	<table>
247	<tr>	247	<tr>
248	<td>	248	<td>
249	<img src="img/info.png" style="width: 50px;">	249	<img src="img/info.png" style="width: 50px;">
250	</td>	250	</td>
251	<td>	251	<td>
252	<p style="padding: 5px 10px; margin-bottom: 0;">Please confirm! Are you sure you want to DELETE this Account?</p>	252	<p style="padding: 5px 10px; margin-bottom: 0;">Please confirm! Are you sure you want to DELETE this Account?</p>
253	</td>	253	</td>
254	</tr>	254	</tr>
255	</table>	255	</table>
256	</div>	256	</div>
257	<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">	257	<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
258	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="accnDelete()">Accept</button>	258	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="accnDelete()">Accept</button>
259	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>	259	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>
260	</div>	260	</div>
261	</div>	261	</div>
262	</div>	262	</div>
263		263
264		264