diff --git a/app/partials/accountSetting/accountSetting.Controller.js b/app/partials/accountSetting/accountSetting.Controller.js index ef26614..d038290 100644 --- a/app/partials/accountSetting/accountSetting.Controller.js +++ b/app/partials/accountSetting/accountSetting.Controller.js @@ -57,6 +57,25 @@ }) } + + $scope.addAccount = function(){ + $('#demo-modal').css('display', 'block'); + } + + $scope.cancelAddAccount = function(){ + $('#demo-modal').css('display', ''); + } + + $scope.createAddAccount = function(){ + AccountSettingService.addUserProfile(updateData).then(function(result) { + + toastr.success(''+result.success+'', { + closeButton: true + }) + }) + + } + } })(); diff --git a/app/partials/accountSetting/accountSetting.Service.js b/app/partials/accountSetting/accountSetting.Service.js index 9e69d66..40cdc27 100644 --- a/app/partials/accountSetting/accountSetting.Service.js +++ b/app/partials/accountSetting/accountSetting.Service.js @@ -75,6 +75,25 @@ return deferred.promise; } + + this.addUserProfile = 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; + } + } })(); \ No newline at end of file diff --git a/app/partials/accountSetting/accountSetting.html b/app/partials/accountSetting/accountSetting.html index 826f18a..34383df 100644 --- a/app/partials/accountSetting/accountSetting.html +++ b/app/partials/accountSetting/accountSetting.html @@ -4,7 +4,7 @@
-

Account Sertting

+

Account Setting

@@ -55,7 +55,7 @@

Additional User Accounts

- +
@@ -97,3 +97,141 @@
+ + + \ No newline at end of file diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js index 2e8fbb0..e3c0d99 100644 --- a/app/partials/analytics/analytics.controller.js +++ b/app/partials/analytics/analytics.controller.js @@ -218,6 +218,9 @@ ]; + + + }]); diff --git a/app/partials/analytics/analytics.html b/app/partials/analytics/analytics.html index 78aebca..9b146ff 100644 --- a/app/partials/analytics/analytics.html +++ b/app/partials/analytics/analytics.html @@ -14,6 +14,8 @@ .subnavbar .mainnav > li:nth-child(3) > a{ color: #ff9900; } + +
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js index 1d6ead0..56a25e9 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js +++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js @@ -82,6 +82,9 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, $scope.order.departingDate = new Date($scope.order.departingDate); $scope.order.departingDate = $scope.order.departingDate.getTime(); } + + $scope.order.status = 'Pending'; + console.log($scope.order.quotePrice); var obj =JSON.parse($scope.order.priceQuote); console.log('obj.papMargin',obj.papMargin);