Apollo-DEC/apollo_developers
Apollo-DEC/apollo_developers
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset password

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-24 15:47:20 +05:30
parent 1809bcf9c9
commit 5b1c6865ed
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/application/models/Employee_model.php
View File

@ -363,8 +363,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;
@ -404,8 +404,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;

7
api/application/models/Forgot_model.php
View File

@ -15,13 +15,16 @@ class Forgot_model extends CI_Model {
$this->db->select('ID,Emailid,MobileNumber,Password');
$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();
$mobile=$forgotDetails1->MobileNumber;
// $result = $query->result_array();
if($forgotDetails1){
$this->db->select('ID,Emailid,MobileNumber,Password');
$this->db->from(LOGIN);
$this->db->where('MobileNumber', $user['MobileNumber']);
$this->db->where('MobileNumber', $mobile);
$this->db->where('IsActive', 1);
$forgotDetails = $this->db->get()->first_row();
if($forgotDetails) {
@ -31,7 +34,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";

25
api/application/models/Login_model.php
View File

@ -22,26 +22,39 @@ class Login_model extends CI_Model
public function login($mobile = null, $password = null)
{
$this->db->select('t1.MobileNumber, t1.Password,t1.ListCode');
$this->db->select('t1.MobileNumber, t1.Password,t1.ListCode,t1.StaffID');
$this->db->from('' . LOGIN . ' as t1');
$this->db->where('t1.MobileNumber', $mobile);
$this->db->or_where('t1.StaffID', $mobile);
// $this->db->join('' . STAFF . ' as t2', 't1.StaffID = t2.StaffID', 'LEFT');
$this->db->where('t1.IsActive', 1);
//$this->db->where('t2.IsActive', 1);
$loginDetails = $this->db->get(LOGIN)->first_row();
// print_r($loginDetails);exit();
$mobileno= $loginDetails->MobileNumber;
// echo $mobileno;
// die();
//print_r($loginDetails);exit();
if ($loginDetails) {
if ($mobile == $loginDetails->MobileNumber) {
if ($mobile == $loginDetails->MobileNumber || $mobile == $loginDetails->StaffID) {
if ($password == $loginDetails->Password) {
if($loginDetails->ListCode == SUPER_ADMIN){
//print_r($loginDetails);exit();
// echo "Super";
// print_r($loginDetails);exit();
$this->db->select('t1.MobileNumber, t1.ListCode, t1.ID, t2.BranchCode, t2.FinanceModuleAccess');
$this->db->from('' . LOGIN . ' as t1');
$this->db->join('' . STAFF . ' as t2', 't1.StaffID = t2.StaffID', 'LEFT');
$this->db->where('t1.MobileNumber', $mobile);
$this->db->or_where('t1.StaffID', $mobile);
$this->db->where('t2.IsActive', 1);
$responseDetails = $this->db->get()->first_row();
// print_r($responseDetails);
// die();
if($responseDetails){
if ($responseDetails->ListCode == SUPER_ADMIN) {
// For First time Super admin login, will set all branch detail
@ -58,12 +71,14 @@ class Login_model extends CI_Model
$result['message'] = "Your login is de-activated.";
}
} else if ($loginDetails->ListCode == ADMIN || $loginDetails->ListCode == EMPLOYEE) {
//print_r($loginDetails);exit();
$this->db->select('t1.MobileNumber, t3.ListCode, t1.ID, t3.BranchCode, t3.FinanceModuleAccess');
$this->db->from('' . LOGIN . ' as t1');
$this->db->join('' . STAFF . ' as t2', 't1.StaffID = t2.StaffID', 'LEFT');
$this->db->join('' . STAFF_BRANCH . ' as t3', 't3.StaffID = t2.StaffID', 'LEFT');
$this->db->where('t1.MobileNumber', $mobile);
$this->db->or_where('t1.StaffID', $mobile);
$this->db->where('t2.IsActive', 1);
$this->db->where('t3.IsActive', 1);
$this->db->order_by('t3.CreatedOn', 'ASC');

4
assets/views/login_forgot.html
View File

@ -14,11 +14,11 @@
Forget Password?
</legend>
<p style="color: sandybrown;">
Enter your Registered Mobile Number below to reset your password.
Enter your Registered Mobile Number/EmpID below to reset your password.
</p>
<div class="form-group" ng-class="{'has-error':form.mobilenumber.$dirty && form.mobilenumber.$invalid, 'has-success':form.mobilenumber.$valid}">
<span class="input-icon">
<input type="text" class="form-control" ng-pattern="/^[0-9]*$/" ng-minlength="10" ng-maxlength="12" ng-model="myModel.userMobile" name="mobilenumber" placeholder="MobileNumber" required> <i class="fa fa-mobile"></i>
<input type="text" class="form-control" ng-maxlength="12" ng-model="myModel.userMobile" name="mobilenumber" placeholder="MobileNumber/EmpID" required> <i class="fa fa-mobile"></i>
</span>
<span class="error text-small block" ng-if="form.mobilenumber.$dirty && form.mobilenumber.$error.required"> mobile number is required. </span>