From 541e146eb8b7c0b97cea2959dcd34ed24de83ee5 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 2 May 2018 18:01:02 +0530
Subject: [PATCH] code merged for forget password and multiple role access

---
 .../controllers/Employee_Controller.php       |  3 ++-
 .../api/application/models/Employee_model.php |  7 +++---
 .../api/application/models/Forgot_model.php   | 25 +++++++++++++++++--
 Apollo/assets/js/controllers/employeeCtrl.js  |  3 ++-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Apollo/api/application/controllers/Employee_Controller.php b/Apollo/api/application/controllers/Employee_Controller.php
index 8c2c53e9..b281cbe4 100755
--- a/Apollo/api/application/controllers/Employee_Controller.php
+++ b/Apollo/api/application/controllers/Employee_Controller.php
@@ -133,7 +133,8 @@ class Employee_Controller extends REST_Controller {
     public function getMasterBranchDetails_post () {
         $reqRoleID = $this->post('reqRoleID');
         $reqUserID = $this->post('reqUserID');
-        $resMasterBranchDetails = $this->employee_model->get_req_master_branch_detail( $reqRoleID, $reqUserID );// Check if the employee exist
+        $branchId= $this->post('branchId');
+        $resMasterBranchDetails = $this->employee_model->get_req_master_branch_detail( $reqRoleID, $reqUserID,$branchId);// Check if the employee exist
         if ($resMasterBranchDetails)
             {
                 $resMasterBranchDetails['status'] = REST_Controller::HTTP_OK;
diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php
index d08a72d7..9deb1444 100755
--- a/Apollo/api/application/models/Employee_model.php
+++ b/Apollo/api/application/models/Employee_model.php
@@ -274,7 +274,7 @@ class Employee_model extends CI_Model
     }
     
     // get branch details based on login user
-    public function get_req_master_branch_detail($reqRoleId, $reqUserID)
+    public function get_req_master_branch_detail($reqRoleId, $reqUserID,$branchId)
     {
         if ($reqRoleId == SUPER_ADMIN) {
             // res for SuperAdmin
@@ -290,6 +290,7 @@ class Employee_model extends CI_Model
             $subQuery = "SELECT t1.BranchCode, t1.BranchName
                             FROM T_BranchMaster as t1
                             LEFT JOIN T_Staff_BranchAccess as t2 ON t2.StaffID = '$staffId'
+                            WHERE t1.BranchCode='$branchId' and t2.ListCode='$listcode'
                             WHERE t2.BranchCode = t1.BranchCode
                             AND t1.IsActive = 1
                             AND t2.IsActive = 1";   
@@ -365,8 +366,8 @@ class Employee_model extends CI_Model
                 if ($this->db->affected_rows() == '1') {
                     $loginArr['StaffID']      = $empArr['StaffID'];
                     $loginArr['ListCode']     = $empArr['ListCode'];
-                    // $loginArr['MobileNumber'] = $empArr['MobileNumber'];
-                    $loginArr['MobileNumber'] = $empArr['StaffID'];
+                    $loginArr['MobileNumber'] = $empArr['MobileNumber'];
+                    //$loginArr['MobileNumber'] = $empArr['StaffID'];
                     $loginArr['EmailId']      = $empArr['EmailID'];
                     $loginArr['IsActive']     = $empArr['IsActive'];
                     $loginArr['CreatedBy']    = $createdBy;
diff --git a/Apollo/api/application/models/Forgot_model.php b/Apollo/api/application/models/Forgot_model.php
index cbeada85..bc1f5f25 100755
--- a/Apollo/api/application/models/Forgot_model.php
+++ b/Apollo/api/application/models/Forgot_model.php
@@ -12,12 +12,33 @@ class Forgot_model extends CI_Model {
     //
     function forget($user=null, $password)
     {
-        $this->db->select('ID,Emailid,MobileNumber,Password');
+        $this->db->select('ID,Emailid,MobileNumber,Password,StaffID');
         $this->db->from(LOGIN);
         $this->db->where('MobileNumber', $user['MobileNumber']);
+        $this->db->or_where('StaffID', $user['MobileNumber']);
         $forgotDetails1 = $this->db->get()->first_row();
         // echo $forgotDetails->MobileNumber;exit();
         // $result = $query->result_array();
+
+        $mobile='';
+        $emid=$forgotDetails1->StaffID;
+        
+        if($forgotDetails1->MobileNumber == $forgotDetails1->StaffID)
+        {
+             $this->db->select('MobileNumber');
+             $this->db->from(STAFF);
+             $this->db->where('StaffID',$emid);
+             
+             $empphone = $this->db->get()->first_row();
+
+             $mobile=$empphone->MobileNumber;
+        }
+
+        else
+        {
+            $mobile=$forgotDetails1->MobileNumber;
+        }
+        
         if($forgotDetails1){
                 $this->db->select('ID,Emailid,MobileNumber,Password');
                 $this->db->from(LOGIN);
@@ -31,7 +52,7 @@ class Forgot_model extends CI_Model {
                             // print_r  ($upatePassword) ;
                             //exit();
                             if($upatePassword) {
-                                $this->smssend($user['MobileNumber'], $password);
+                                $this->smssend($mobile, $password);
                                 $result['forgotstatus'] = true;
                                 $result['resPass'] = "Check your registered Mobile Number!!";
                                 $result['message'] = "Password updated successfully";
diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js
index c3eeafb7..516d77d7 100755
--- a/Apollo/assets/js/controllers/employeeCtrl.js
+++ b/Apollo/assets/js/controllers/employeeCtrl.js
@@ -69,7 +69,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
         if (localDetail != null) {
             $scope.currentDate = new Date();
  $scope.localUserListCode = localDetail.localType;
-
+$scope.localBranchID = localDetails.localBranchID;
             // $scope.currentPage = 1;
             $scope.getEmployeeList();
             $scope.getRoleList();
@@ -459,6 +459,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
             data: {
                 reqRoleID: localDetails.localType,
                 reqUserID: localDetails.localUserID,
+                branchId : localDetails.localBranchID,
             }
         };
         $http(req).then(function (response) {