From 456db6321cfb4be78143a6b8573cc96cecb9086c Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Thu, 11 May 2023 15:37:09 +0530
Subject: [PATCH 1/2] change pass:suseendhiran

---
 app/Views/layout/header.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 00eb0c9..5943a3e 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -286,7 +286,14 @@ $(document).ready(function(){
     
                                 <li class="dropdown notification-list topbar-dropdown">
                                     <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-                                        <img src="<?= base_url()."/public"; ?>/assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle">
+
+                                    <?php if ($userdata) { ?>
+                                    <img src='<?php echo base_url()."/public/assets/images/users/avatar-1.jpg" ?>' class="rounded-circle avatar-xl img-thumbnail" alt="profile-image">
+                                    <?php } 
+                                    else { ?>
+                                    <img src='<?php echo base_url()."/public/assets/images/users/"?><?= $userdata->profile; ?>' class="rounded-circle avatar-xl img-thumbnail" alt="profile-image">
+                                    <?php } ?>
+                                    <!-- <img src="<?= base_url()."/public"; ?>/assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle"> -->
                                         <span class="pro-user-name ml-1">
                                            <?= $userdata->name; ?> <i class="mdi mdi-chevron-down"></i> 
                                         </span>

From 3fab83345e1edecb01e96fa61c6b2a5505268574 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Thu, 11 May 2023 18:05:26 +0530
Subject: [PATCH 2/2] changes done:suseendhiran

---
 app/Config/Routes.php                   |  6 +++++
 app/Controllers/Admin_controller.php    | 31 +++++++++++++++++++++++--
 app/Controllers/Member_controller.php   | 22 ++++++++++++++++--
 app/Controllers/Sendmail_controller.php | 11 ++++++---
 app/Models/Member_model.php             |  2 +-
 app/Models/User_model.php               |  2 +-
 app/Views/forgot_password.php           | 25 +++++++++++++-------
 app/Views/layout/header.php             |  4 ++--
 app/Views/member_form.php               | 12 ++++++----
 app/Views/member_registration.php       | 14 +++++++----
 app/Views/members_list.php              | 14 ++++++++---
 app/Views/set_password.php              |  6 +++--
 app/Views/user_form.php                 | 18 +++++++-------
 app/Views/users_list.php                | 11 +++++++--
 14 files changed, 133 insertions(+), 45 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 081e61a..2bb83d5 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -46,6 +46,10 @@ $routes->match(['get','post'],'/set_password/(:any)','Member_controller::set_pas
 $routes->match(['get','post'],'/update_password','Member_controller::update_password');
 $routes->match(['get','post'],'/change_password','Member_controller::change_password');
 $routes->match(['get','post'],'/change_password_form','Member_controller::change_password_form');
+$routes->match(['get','post'],'/member_deactivate/(:any)','Member_controller::member_deactivate/$1');
+$routes->match(['get','post'],'/member_activate/(:any)','Member_controller::member_activate/$1');
+
+
 
 
 
@@ -64,6 +68,8 @@ $routes->match(['get'],'/credits_pack_edit/(:any)','Admin_controller::credits_pa
 $routes->match(['post'],'/credits_pack_edit','Admin_controller::credits_pack_edit');
 $routes->match(['get','post'],'/credits_pack_add','Admin_controller::credits_pack_add');
 $routes->match(['get','post'],'/user_password_change','Admin_controller::user_password_change');
+$routes->match(['get','post'],'/user_deactivate/(:any)','Admin_controller::user_deactivate/$1');
+$routes->match(['get','post'],'/user_activate/(:any)','Admin_controller::user_activate/$1');
 
 $routes->match(['get'],'/admin_home','Dashboard::admin_home');
 $routes->match(['get'],'/member_home','Dashboard::member_home');
diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index afa5771..001a426 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -121,10 +121,21 @@ class Admin_controller extends BaseController
 
 		if($this->request->getmethod() == 'post')
 		{
+			$password = '';
+			$characters = array_merge(range('A','Z'), range('a','z'), range('0','9'), array('!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '_', '+', '='));
+			for($i = 0; $i < 8; $i++) {
+			$password .= $characters[array_rand($characters)];
+			}
 				//insert member details
 				$userData = $this->request->getVar();
-				$this->UserModel->save($userData);
-				return redirect()->to(base_url()."users_list");
+				$userData['password'] = $password; 
+				$userdata = $this->UserModel->save($userData);
+				if ($userdata) 
+				{
+					$sendmail_controller = new Sendmail_controller();
+					$get_data = $sendmail_controller->index($this->request->getVar('email') , $password , 3 );
+					return redirect()->to(base_url()."users_list"); 
+				}
 			
 		}
 		
@@ -136,6 +147,22 @@ class Admin_controller extends BaseController
 		
 	}
 
+	public function user_deactivate($id = null)
+	{
+				
+		$this->UserModel->where('md5(id)', $id )->set(array( 'is_active' => 0))->update();
+		return redirect()->to(base_url()."users_list");
+			
+	}	
+
+	public function user_activate($id = null)
+	{
+				
+		$this->UserModel->where('md5(id)', $id )->set(array( 'is_active' => 1))->update();
+		return redirect()->to(base_url()."users_list");
+			
+	}
+
 
 	public function admin_profile($user_id = null)
 	{
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index f704050..e028cf1 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -53,13 +53,13 @@ class Member_controller extends BaseController
 					}
 				}
 				else{
-					$this->session->setTempdata('error','Sorry your mail does not verified.please check your mail',3);
+					$this->session->setTempdata('error','Sorry your mail is not verified.please check your mail',3);
 					return redirect()->to(base_url());
 				}
 				
 			}else
 			{
-			  $this->session->setTempdata('error','sorry Email does not existe',3);
+			  $this->session->setTempdata('error','sorry Email is not existe',3);
 			  return redirect()->to(base_url());				  
 			}
 		}
@@ -122,6 +122,22 @@ class Member_controller extends BaseController
 		echo view('layout/footer');
 	}
 
+	public function member_deactivate($id = null)
+	{
+				
+		$this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 0))->update();
+		return redirect()->to(base_url()."members_list");
+			
+	}	
+
+	public function member_activate($id = null)
+	{
+				
+		$this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 1))->update();
+		return redirect()->to(base_url()."members_list");
+			
+	}
+
 
 	public function member_edit($member_id = null)
 	{
@@ -192,6 +208,8 @@ class Member_controller extends BaseController
 
 			$email = $this->request->getVar('email');
 			$user_data = $this->MemberModel->where('email', $email)->find();
+			echo $user_data;
+			// echo $user_data; 
 			if ($user_data) 
 			{
 				$otp = rand(1000 , 9999 );
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 2c504d8..a1f73d5 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -14,7 +14,6 @@ class Sendmail_controller extends BaseController
 	}
 	public function index($to,$code,$return)
 	{
-
 		$email = \Config\Services::email();
         $email->setFrom('suseendhiran.1702117@srit.org', 'suseendhiran');
         $email->setTo($to);            
@@ -22,6 +21,12 @@ class Sendmail_controller extends BaseController
         {
             $message = $code;
         }
+        if($return == 3)
+        {
+            $message = "<p>username : $to </p>";
+            $message .= "<p>password : $code </p>";
+            $message .= '<p><a href="'.base_url().'admin">Login here</a></p>';
+        }
         else
         {
             $message = '<p>Please click the following link to verify your email address</p>';
@@ -88,7 +93,7 @@ class Sendmail_controller extends BaseController
       {         
   
         $email = $this->request->getVar('email');
-        $user_data = $this->MemberModel->where('email', $email)->find();
+        $user_data = $this->MemberModel->where('email', $email)->where('is_email_verified', 1 )->find();
         if ($user_data) 
         {
           $otp = rand(1000 , 9999);
@@ -100,7 +105,7 @@ class Sendmail_controller extends BaseController
         else 
         {
           $data['status'] = 'failed';
-          echo $data;
+          echo json_encode($data);
         }
          
       }
diff --git a/app/Models/Member_model.php b/app/Models/Member_model.php
index e825081..c940801 100644
--- a/app/Models/Member_model.php
+++ b/app/Models/Member_model.php
@@ -7,7 +7,7 @@ class Member_model extends Model
     protected $table      = 'member';
     protected $primaryKey = 'id';
 	
-	protected $allowedFields = ['name', 'mobile','email','username', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_email_verified' , 'verification_code' , 'created_by','updated_by'];
+	protected $allowedFields = ['name', 'mobile','email','username', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_email_verified' , 'verification_code' , 'is_active' , 'created_by','updated_by'];
 	
 	protected $beforeInsert = ['beforeInsert'];
 	protected $beforeUpdate = ['beforeUpdate'];
diff --git a/app/Models/User_model.php b/app/Models/User_model.php
index 4a37b41..31b5610 100644
--- a/app/Models/User_model.php
+++ b/app/Models/User_model.php
@@ -7,7 +7,7 @@ class User_model extends Model
     protected $table      = 'users';
     protected $primaryKey = 'id';
 	
-	protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' ,'created_at','updated_at'];
+	protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_active' ,'created_at','updated_at'];
 	
 	protected $beforeInsert = ['beforeInsert'];
 	protected $beforeUpdate = ['beforeUpdate'];
diff --git a/app/Views/forgot_password.php b/app/Views/forgot_password.php
index af4da2c..19d89fd 100644
--- a/app/Views/forgot_password.php
+++ b/app/Views/forgot_password.php
@@ -47,7 +47,9 @@
                                 <form method="post" action="<?php echo base_url();?>change_password_form" method="post">
                                 <input type="hidden" id="verify_otp" name="verify_otp" value="">
                                    
-                                   
+                                <div id="alert1"></div>
+
+
                                 <?php if(session()->getTempdata('error')):?>
                                    <div class="alert alert-danger" id="alert">
                                    <?= session()->getTempdata('error'); ?>
@@ -57,20 +59,20 @@
 
                                     <div class="form-group mb-3">
                                         <label for="emailaddress">Email address</label>
-                                        <input class="form-control" type="email" name="email" id="email" required="" value="" placeholder="Enter your email">
+                                        <input class="form-control" type="email" name="email" id="email" required="required" value="" placeholder="Enter your email">
                                     </div>
 
                                     <div class="form-group mb-3 disable" id="disable">
                                         <label for="otp">OTP</label>
                                         <div class="input-group input-group-merge">
-                                            <input type="text" id="otp" name="otp" value="" class="form-control" placeholder="Enter your otp">
+                                            <input type="text" id="otp" name="otp" value="" required="required" class="form-control" placeholder="Enter your otp">
                                         </div>
                                     </div>
 
                                     </br>
 
                                     <div class="form-group mb-0 text-center" id="re-sub">
-                                        <button class="btn btn-primary btn-block" type="submit"  id="submit"> Get OTP </button>
+                                        <button class="btn btn-primary btn-block" type="submit"  id="submit1"> Get OTP </button>
                                     </div>
 
                                 </form>
@@ -106,8 +108,7 @@ $('#alert').delay(3000).fadeOut('slow');
 // This will disable just the div
 $(".disable").hide();
 
-$(document).on('click','#submit',function(){
-    alert("gaf")
+$(document).on('click','#submit1',function(){
     var email = $("#email").val();
     $.ajax({ 
       type: "post",
@@ -116,13 +117,19 @@ $(document).on('click','#submit',function(){
       json: true,
       success: function(response) {
         response = jQuery.parseJSON(response);
-        if (response.status == "success") {
+        if (response.status == "success") 
+        {
             $(".disable").show();
             $('#verify_otp').val(response.otp);
-            // $('#submit').html('Submit')
             $("#re-sub").html('<button class="btn btn-primary btn-block" type="submit"> Submit </button>');
-           window.stop()
+           window.stop();
         } 
+        else
+        {
+            $('#alert1').addClass('alert alert-danger');
+            $('#alert1').html('Email is not verified.please check your mail.')
+
+        }
        
       },
       error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 5943a3e..81cb8b0 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -108,7 +108,7 @@ $(document).ready(function(){
                             <img src="<?= base_url()."/public"; ?>/assets/images/logo-sm.png" alt="" height="24">
                         </span>
                         <span class="logo-lg">
-                            <img src="<?= base_url()."/public"; ?>/assets/images/logo-light.png" alt="" height="20">
+                            <img src="<?= base_url()."/public"; ?>/assets/images/company-logo/GolfEvolution_White.png" alt="" height="65">
                         </span>
                     </a>
                 </div>
@@ -287,7 +287,7 @@ $(document).ready(function(){
                                 <li class="dropdown notification-list topbar-dropdown">
                                     <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
 
-                                    <?php if ($userdata) { ?>
+                                    <?php if (!$userdata) { ?>
                                     <img src='<?php echo base_url()."/public/assets/images/users/avatar-1.jpg" ?>' class="rounded-circle avatar-xl img-thumbnail" alt="profile-image">
                                     <?php } 
                                     else { ?>
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index bc97683..4257954 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -88,22 +88,24 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control state" name="state" id="state"> 
+                                                <input type="text" required  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State">
+                                                <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['state']; ?>"> <?= $Memberdata[0]['state_name']; ?> </option>   <?php } ?>
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                         
                                              <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control city" name="city" id="city">
+                                                <input type="text" required  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City">
+                                                <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
                                                 <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option>   <?php } ?>
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                             <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">Pin Code<span class="text-danger"></span></label>
+                                                <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
                                                 <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['pincode'];} ?>" placeholder="Pin Code">
                                                 </div>
diff --git a/app/Views/member_registration.php b/app/Views/member_registration.php
index 0ce7ab6..e071125 100644
--- a/app/Views/member_registration.php
+++ b/app/Views/member_registration.php
@@ -170,22 +170,26 @@ $.ajax({
                                     <div class="form-group row">
                                         <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                         <div class="col-7">
-                                        <select id="selectize-select"   class="form-control state" name="state" id="state"> 
+                                        <input type="text"  parsley-type="text" class="form-control"
+                                                id="state" placeholder="State" name="state">
+                                        <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
                                                
-                                               </select>
+                                               </select> -->
                                         </div>
                                     </div>
                                     <div class="form-group row">
                                         <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                         <div class="col-7">
-                                        <select id="selectize-select"   class="form-control city" name="city" id="city">
+                                        <input type="text"  parsley-type="text" class="form-control"
+                                                id="city" placeholder="City" name="city">
+                                        <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
                                               
-                                              </select>
+                                              </select> -->
                                         </div>
                                     </div>
                                    
                                     <div class="form-group row">
-                                        <label for="inputEmail3" class="col-4 col-form-label">pincode<span class="text-danger"></span></label>
+                                        <label for="inputEmail3" class="col-4 col-form-label">Zipcode<span class="text-danger"></span></label>
                                         <div class="col-7">
                                             <input type="text"  parsley-type="text" class="form-control"
                                                 id="pincode" placeholder="pincode" name="pincode">
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index 0d660e4..3773436 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -37,7 +37,7 @@
                                                     <th>Mobile</th>
                                                     <th>Email</th>
                                                     <th>Address</th>
-                                                    <!-- <th>Status</th> -->
+                                                    <th>Status</th>
                                                     <th>Action</th>
                                                 </tr>
                                             </thead>
@@ -51,8 +51,16 @@
                                                         <td><?php echo $row['mobile'];?></td>
                                                         <td><?php echo $row['email'];?></td>
                                                         <td><?php echo $row['address'].",".$row['city_name'].",".$row['state_name'].",".$row['country_name']." - ".$row['pincode'].",";?></td>
-                                                        <!-- <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "In-Active"; }?></td> -->
-                                                        <td><a href="<?= base_url() ?>member_edit/<?php echo md5($row['id']);?>">Edit</a></td>
+                                                        <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "Deactive"; }?></td>
+                                                        <td><a href="<?= base_url() ?>member_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil"  style="font-size:18px;"></i></a>
+                                                        <?php if ($row['is_active'] == 1) { ?>
+                                                            <a href="<?= base_url() ?>member_deactivate/<?php echo md5($row['id']);?>"><i class="mdi mdi-account-check-outline" title="Deactivate" style="font-size:18px;"></i></a>
+                                                        <?php } 
+                                                        else { ?>
+                                                            <a href="<?= base_url() ?>member_activate/<?php echo md5($row['id']);?>"><i class="mdi mdi-account-cancel-outline" title="Activate" style="font-size:18px;"></i></a>
+                                                        <?php }
+                                                        ?>
+                                                        </td>
                                                        
                                                         
                                                 </tr>    
diff --git a/app/Views/set_password.php b/app/Views/set_password.php
index 2fea39f..e4a8b31 100644
--- a/app/Views/set_password.php
+++ b/app/Views/set_password.php
@@ -70,8 +70,10 @@
                                     <div class="form-group row">
                                         <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
                                         <div class="col-7">
-                                            <input id="hori-pass1" type="password" placeholder="Password" required
-                                                class="form-control" name="password">
+                                            <input id="hori-pass1" type="password" placeholder="Password"  
+                                            pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" 
+                                            title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" 
+                                            required class="form-control" name="password">
                                         </div>
                                     </div>
                                     <div class="form-group row">
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index eff71e5..b74a36e 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -68,7 +68,7 @@
                                                 </div>
                                             </div>
 
-                                            <?php if(! isset($userList)){ ?>
+                                            <!-- <?php if(! isset($userList)){ ?> -->
                                             <!-- <div class="form-group row">
                                                 <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
                                                 <div class="col-7">
@@ -83,7 +83,7 @@
                                                 </div>
                                             </div> -->
 
-                                            <div class="form-group row">
+                                            <!-- <div class="form-group row">
                                         <label for="hori-pass1" class="col-4 col-form-label">Password<span class="text-danger">*</span></label>
                                         <div class="col-7">
                                             <input id="hori-pass1" type="password" placeholder="Password" required
@@ -98,7 +98,7 @@
                                                 placeholder="Password" class="form-control" id="hori-pass2">
                                         </div>
                                     </div>
-                                            <?php } ?>
+                                            <?php } ?> -->
                                            
 
                                             <div class="form-group row">
@@ -119,21 +119,23 @@
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control state" name="state" id="state"> 
+                                                <input type="text"   class="form-control"  name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="State">
+                                                <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
                                                 <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['state']; ?>"> <?= $userList[0]['state_name']; ?> </option>   <?php } ?>
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                              <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <select id="selectize-select"   class="form-control city" name="city" id="city">
+                                                <input type="text"   class="form-control"  name="city" value="<?php if(isset($userList)){echo $userList[0]['city'];} ?>" placeholder="City">
+                                                <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
                                                 <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['city']; ?>"> <?= $userList[0]['city_name']; ?> </option>   <?php } ?>
-                                                </select>
+                                                </select> -->
                                                 </div>
                                             </div>
                                             <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">Pin Code<span class="text-danger"></span></label>
+                                                <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
                                                 <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($userList)){echo $userList[0]['pincode'];} ?>" placeholder="Pin Code">
                                                 </div>
diff --git a/app/Views/users_list.php b/app/Views/users_list.php
index 6ff85de..f589b08 100644
--- a/app/Views/users_list.php
+++ b/app/Views/users_list.php
@@ -53,8 +53,15 @@
                                                         <td><?php echo $row['email'];?></td>
                                                         <td><?php echo $row['role'];?></td>
                                                         <td><?php echo $row['address'].",".$row['city_name'].",".$row['state_name'].",".$row['country_name']." - ".$row['pincode'].",";?></td>
-                                                        <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "In-Active"; }?></td>
-                                                        <td><a href="<?= base_url() ?>user_edit/<?php echo md5($row['id']);?>">Edit</a></td>
+                                                        <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "Deactive"; }?></td>
+                                                        <td><a href="<?= base_url() ?>user_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil"  style="font-size:18px;"></i></a>
+                                                        <?php if ($row['is_active'] == 1) { ?>
+                                                            <a href="<?= base_url() ?>user_deactivate/<?php echo md5($row['id']);?>"><i class="mdi mdi-account-check-outline" title="Deactivate" style="font-size:18px;"></i></a>
+                                                        <?php } 
+                                                        else { ?>
+                                                            <a href="<?= base_url() ?>user_activate/<?php echo md5($row['id']);?>"><i class="mdi mdi-account-cancel-outline" title="Activate" style="font-size:18px;"></i></a>
+                                                        <?php }
+                                                        ?></td>
                                                        
                                                         
                                                 </tr>