From c16768a2a89848d631e6871bd13b292ef8bc59a1 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 7 Jan 2019 10:21:35 +0530 Subject: [PATCH] call tracking branch change --- Apollo/api/application/models/Employee_model.php | 2 +- Apollo/assets/js/controllers/sessionCtrl.js | 7 +++++-- Apollo/assets/views/partials/top-navbar.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php index cc76ec8a..24e5efbd 100755 --- a/Apollo/api/application/models/Employee_model.php +++ b/Apollo/api/application/models/Employee_model.php @@ -124,7 +124,7 @@ class Employee_model extends CI_Model } else { // get branch details for admin & staff $result['details'] = $responseDetails; - $this->db->select('t3.BranchCode, t3.BranchName, t2.ListCode , t4.ListName, t2.FinanceModuleAccess'); + $this->db->select('t3.BranchCode, t3.BranchName, t2.ListCode , t4.ListName, t2.FinanceModuleAccess,t2.CallModuleAccess'); $this->db->from('' . STAFF_BRANCH . ' as t2'); $this->db->where('t2.StaffID', $EmpId); $this->db->where('t2.IsActive', 1); diff --git a/Apollo/assets/js/controllers/sessionCtrl.js b/Apollo/assets/js/controllers/sessionCtrl.js index 6a2b3b66..105c9ea6 100755 --- a/Apollo/assets/js/controllers/sessionCtrl.js +++ b/Apollo/assets/js/controllers/sessionCtrl.js @@ -195,20 +195,23 @@ app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", $scope.getCurrentBran = currArr.find(item => item.BranchCode === localDetails.localBranchID); } + //console.log($scope.loginUser);return false; + } else { } }); }; - $scope.upDateLocalBran = function (Id, listCode, financeAccess) { - + $scope.upDateLocalBran = function (Id, listCode, financeAccess,calltrackAccess) { +//console.log(calltrackAccess);return false; localDetail.localBranchID = Id; localDetails.localBranchID = Id; localDetail.localType = listCode; localDetails.localType = listCode; localDetail.is_DayBookApproval_Access = financeAccess; localDetails.is_DayBookApproval_Access = financeAccess; + localDetails.is_CalltrackApproval_Access = calltrackAccess; ipCookie('cookiechk', localDetails, { expires: 21 }); localStorage.setItem('localObj', JSON.stringify(localDetail)); $window.location.reload(); diff --git a/Apollo/assets/views/partials/top-navbar.html b/Apollo/assets/views/partials/top-navbar.html index 66b18791..7af0d511 100755 --- a/Apollo/assets/views/partials/top-navbar.html +++ b/Apollo/assets/views/partials/top-navbar.html @@ -139,7 +139,7 @@