From 52f1874fe6fd24735b47d88d4e599b38fb861c65 Mon Sep 17 00:00:00 2001 From: Jaideep Singh Date: Fri, 9 Jun 2017 17:52:17 +0530 Subject: [PATCH] dashboard price manager update and primary contact bug fix --- app/partials/dashboard/dashboard.service.js | 8 ++++---- .../viewVendorContact/viewVendorContact.Controller.js | 8 +++++++- app/partials/viewcontact/viewcontact.controller.js | 12 +++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/partials/dashboard/dashboard.service.js b/app/partials/dashboard/dashboard.service.js index f5e6e1e..e6ed9a8 100644 --- a/app/partials/dashboard/dashboard.service.js +++ b/app/partials/dashboard/dashboard.service.js @@ -38,13 +38,13 @@ return deferred.promise; } - this.getFuelPricingNew = function() { - + this.updateFuelPricing = function(data){ var deferred = $q.defer(); $http({ - method : 'GET', - url : BASE_URL.url +'/user/products', + method : 'POST', + url : BASE_URL.url +'/fuelPricing', headers : {'Content-Type': 'application/json'}, + data: data }) .then(function (result){ deferred.resolve(result.data); diff --git a/app/partials/viewVendorContact/viewVendorContact.Controller.js b/app/partials/viewVendorContact/viewVendorContact.Controller.js index 41a696c..21957db 100644 --- a/app/partials/viewVendorContact/viewVendorContact.Controller.js +++ b/app/partials/viewVendorContact/viewVendorContact.Controller.js @@ -171,10 +171,16 @@ if($scope.contactDetail.primaryContact == true){ ViewFuelVendorService.checkPrimaryContact(companyId).then(function(result) { console.log(result) - if(result.status == 422){ + if(result.status == 422 || result.status == 200){ $('#primaryContact').css('display', 'block'); } }) + }else{ + var primaryContactData = "companyContactId=" + $scope.contactDetail.id + "&primary=false"; + + ViewCompanyService.addPrimaryContact(primaryContactData).then(function(result) { + console.log(result) + }) } } diff --git a/app/partials/viewcontact/viewcontact.controller.js b/app/partials/viewcontact/viewcontact.controller.js index a61890e..3828456 100644 --- a/app/partials/viewcontact/viewcontact.controller.js +++ b/app/partials/viewcontact/viewcontact.controller.js @@ -176,10 +176,16 @@ if($scope.contactDetail.primaryContact == true){ ViewCompanyService.checkPrimaryContact(companyId).then(function(result) { console.log(result) - if(result.status == 422){ + if(result.status == 422 || result.status == 200){ $('#primaryContact').css('display', 'block'); } }) + }else{ + var primaryContactData = "companyContactId=" + $scope.contactDetail.id + "&primary=false"; + + ViewCompanyService.addPrimaryContact(primaryContactData).then(function(result) { + console.log(result) + }) } } @@ -191,9 +197,9 @@ $scope.sendPrimaryContact = function(id){ $('#primaryContact').css('display', 'none'); - var priamryContactData = "companyContactId=" + id + "&primary=" + $scope.contactDetail.primaryContact; + var primaryContactData = "companyContactId=" + id + "&primary=" + $scope.contactDetail.primaryContact; - ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) { + ViewCompanyService.addPrimaryContact(primaryContactData).then(function(result) { console.log(result) }) -- 2.0.0