From e9a2edf03381ab10d6d932f248d67df527ea9289 Mon Sep 17 00:00:00 2001 From: Rishav Date: Mon, 29 May 2017 16:26:38 +0530 Subject: [PATCH] update custom field --- app/partials/viewCompany/viewCompany.controller.js | 64 +++++++++++++++++++--- app/partials/viewCompany/viewCompany.html | 36 ++++++++++-- app/partials/viewCompany/viewCompany.service.js | 16 ++++++ 3 files changed, 105 insertions(+), 11 deletions(-) diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index 7070801..60c5c0c 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -19,13 +19,18 @@ var value = ""; var companyId = $stateParams.id; - ViewCompanyService.getCompany(companyId).then(function(result) { - $scope.companyData = result; - if(result.margin != null){ - $scope.companyData.masterMargin = result.margin.id; - } - $scope.showLoader = false; - }) + + getCompanyDetail(); + function getCompanyDetail(){ + ViewCompanyService.getCompany(companyId).then(function(result) { + $scope.companyData = result; + if(result.margin != null){ + $scope.companyData.masterMargin = result.margin.id; + } + $scope.showLoader = false; + }) + } + $scope.changeCompanyStatus = function(){ var statusData = "status=" + $scope.companyData.activate; @@ -263,11 +268,55 @@ } + var newContactName = ""; + $scope.updateData = "" + $scope.showContact = function(data, value){ + $('#updateContact').css('display', 'block'); + $scope.updateData = data; + newContactName = value; + console.log($scope.updateData) + if($scope.updateData.email == null){ + $scope.updateData.content = data.contactNumber; + }else{ + $scope.updateData.content = data.email; + } + } + + $scope.acceptUpdateField = function(){ + console.log($scope.updateData) + if($scope.updateData.content == undefined){ + toastr.error('Please add some content', { + closeButton: true + }) + }else{ + if(newContactName == 'phone'){ + var updateCustomData = "companyId=" + companyId + "&contactNumber=" + $scope.updateData.content + "&contactId=" + $scope.updateData.id + + "&title=" + $scope.updateData.title; + }else{ + var updateCustomData = "companyId=" + companyId + "&email=" + $scope.updateData.content + "&contactId=" + $scope.updateData.id + + "&title=" + $scope.updateData.title; + } + ViewCompanyService.updateCustomField(updateCustomData).then(function(result) { + console.log(result) + if(result != null && result.success){ + $('#updateContact').css('display', 'none'); + getCompanyDetail(); + } + }) + } + } + + $scope.cancelUpdateField = function(){ + $('#updateContact').css('display', 'none'); + } + $scope.showEditTier2 = function(number){ console.log(number) $scope.contactNumber = number; } + + var contactName = ''; $scope.addCustom = function(value){ console.log(value) @@ -300,6 +349,7 @@ console.log(result) if(result != null && result.success){ $('#customField').css('display', 'none'); + getCompanyDetail(); } }) } diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index f0167cd..8f00771 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -200,21 +200,28 @@ -

+
+

--> +

+ + {{data.contactNumber}}   + + +

{{data.email}}   - + - +

@@ -707,6 +714,27 @@
+
+
+
+
+
+
+ Title:
+
+ Content:
+ +
+
+
+
+
+ + +
+
+
+
diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index b885617..ae06745 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -70,6 +70,22 @@ return deferred.promise; } + this.updateCustomField = function(data){ + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/company/custom/contacts', + data : data, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.addPrimaryContact = function(data){ var deferred = $q.defer(); $http({ -- 2.0.0