Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend
This commit is contained in:
suseendhiran17
commit
6cbd911849
@ -44,6 +44,8 @@ $routes->match(['get'],'/users_list','Admin_controller::users_list');
|
||||
$routes->match(['get'],'/user_edit/(:any)','Admin_controller::user_edit/$1');
|
||||
$routes->match(['post'],'/user_edit','Admin_controller::user_edit');
|
||||
$routes->match(['get','post'],'/user_add','Admin_controller::user_add');
|
||||
$routes->match(['get'],'/admin_profile/(:any)','Admin_controller::admin_profile/$1');
|
||||
$routes->match(['post'],'/admin_profile','Admin_controller::admin_profile');
|
||||
|
||||
$routes->match(['get'],'/admin_home','Dashboard::admin_home');
|
||||
$routes->match(['get'],'/member_home','Dashboard::member_home');
|
||||
|
||||
@ -128,5 +128,37 @@ class Admin_controller extends BaseController
|
||||
echo view('layout/footer');
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function admin_profile($user_id = null)
|
||||
{
|
||||
|
||||
if($this->request->getmethod() == 'post')
|
||||
{
|
||||
//update member details
|
||||
|
||||
$UserData = $this->request->getVar();
|
||||
$user_id = $this->request->getVar('id');
|
||||
$this->UserModel->where('id', $user_id )->set($UserData)->update();
|
||||
return redirect()->to(base_url()."users_list");
|
||||
|
||||
}
|
||||
|
||||
|
||||
$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
|
||||
|
||||
$data['userList'] = $this->UserModel->select('users.* , country.name as country_name , state.name as state_name ,city.name as city_name')
|
||||
->join('country', 'users.country = country.id', 'left')
|
||||
->join('state', 'users.state = state.id', 'left')
|
||||
->join('city', 'users.city = city.id', 'left')
|
||||
->where('md5(users.id)', $user_id )
|
||||
->find();
|
||||
|
||||
print_r($data);die();
|
||||
echo view('layout/header',$userdata);
|
||||
echo view('user_form',$data);
|
||||
echo view('layout/footer');
|
||||
|
||||
}
|
||||
// -----------------------------------------------
|
||||
}
|
||||
|
||||
@ -56,6 +56,7 @@ class Member_controller extends BaseController
|
||||
return redirect()->to(base_url());
|
||||
}
|
||||
}
|
||||
|
||||
return view('member_login');
|
||||
}
|
||||
|
||||
@ -94,7 +95,8 @@ class Member_controller extends BaseController
|
||||
// return redirect()->to(base_url());
|
||||
|
||||
}
|
||||
return view('member_registration');
|
||||
$data['country']=$this->cModel->fetch_country();
|
||||
return view('member_registration',$data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -44,6 +44,13 @@
|
||||
</br>
|
||||
<form method="post" action="<?= base_url()."admin"; ?>">
|
||||
|
||||
|
||||
|
||||
<?php if(session()->getTempdata('error')):?>
|
||||
<div class="alert alert-danger" >
|
||||
<?= session()->getTempdata('error'); ?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<div class="form-group mb-3">
|
||||
<label for="emailaddress">Email address</label>
|
||||
<input class="form-control" type="email" name="email" id="emailaddress" required="" value="admin@gmail.com" placeholder="Enter your email">
|
||||
|
||||
@ -119,22 +119,13 @@ $(document).ready(function(){
|
||||
<ul id="side-menu">
|
||||
|
||||
<li class="menu-title">Navigation</li>
|
||||
|
||||
<li>
|
||||
<a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
|
||||
<a href="<?= base_url()."admin_home"; ?>">
|
||||
<i class="mdi mdi-view-dashboard"></i>
|
||||
<span class="menu-arrow"></span>
|
||||
<span> Dashboards </span>
|
||||
</a>
|
||||
<div class="collapse" id="sidebarDashboards">
|
||||
<ul class="nav-second-level">
|
||||
<li>
|
||||
<a href="index.html">Sales</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li>
|
||||
<a href="#sidebarLayouts" data-toggle="collapse">
|
||||
@ -156,7 +147,7 @@ $(document).ready(function(){
|
||||
|
||||
<li>
|
||||
<a href="#sidebarTables" data-toggle="collapse">
|
||||
<i class="mdi mdi-account-group"></i>
|
||||
<i class="mdi mdi-account-multiple"></i>
|
||||
<span> Users </span>
|
||||
<span class="menu-arrow"></span>
|
||||
</a>
|
||||
@ -244,7 +235,7 @@ $(document).ready(function(){
|
||||
</div>
|
||||
|
||||
<!-- item-->
|
||||
<a href="javascript:void(0);" class="dropdown-item notify-item">
|
||||
<a href="<?= base_url()."admin_profile/". md5($userdata->id); ?>" class="dropdown-item notify-item">
|
||||
<i class="ri-account-circle-line"></i>
|
||||
<span>My Account</span>
|
||||
</a>
|
||||
|
||||
@ -29,6 +29,56 @@
|
||||
|
||||
|
||||
</style>
|
||||
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
|
||||
<script>
|
||||
|
||||
|
||||
|
||||
$(document).ready(function(){
|
||||
//fetch state and sity values
|
||||
$('.country').change(function(){
|
||||
var country_id = $('.country').val();
|
||||
|
||||
if(country_id != '')
|
||||
{
|
||||
|
||||
$.ajax({
|
||||
url:"<?= base_url(); ?>/fetch_state",
|
||||
method:"POST",
|
||||
data:{country_id:country_id},
|
||||
success:function(data)
|
||||
{
|
||||
$('.state').html(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
$('.state').html('<option value="">Select State</option>');
|
||||
}
|
||||
});
|
||||
|
||||
$('.state').change(function(){
|
||||
var state_id = $('.state').val();
|
||||
if(state_id != '')
|
||||
{
|
||||
$.ajax({
|
||||
url:"<?= base_url(); ?>/fetch_city",
|
||||
method:"POST",
|
||||
data:{state_id:state_id},
|
||||
success:function(data)
|
||||
{
|
||||
$('.city').html(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
$('.city').html('<option value="">Select City</option>');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body class="loading">
|
||||
@ -83,51 +133,48 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Address<span class="text-danger">*</span></label>
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Address<span class="text-danger"></span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" required parsley-type="text" class="form-control"
|
||||
<input type="text" parsley-type="text" class="form-control"
|
||||
id="address" placeholder="Address" name="address">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger">*</span></label>
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" required parsley-type="text" class="form-control"
|
||||
id="city" placeholder="City" name="city">
|
||||
<select id="selectize-select" class="form-control country" name="country" id="country">
|
||||
<?= $country; ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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">
|
||||
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger">*</span></label>
|
||||
<label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" required parsley-type="text" class="form-control"
|
||||
id="state" placeholder="State" name="state">
|
||||
<select id="selectize-select" class="form-control city" name="city" id="city">
|
||||
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger">*</span></label>
|
||||
<label for="inputEmail3" class="col-4 col-form-label">pincode<span class="text-danger"></span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" required parsley-type="text" class="form-control"
|
||||
id="country" placeholder="Country" name="country">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputEmail3" class="col-4 col-form-label">pincode<span class="text-danger">*</span></label>
|
||||
<div class="col-7">
|
||||
<input type="text" required parsley-type="text" class="form-control"
|
||||
<input type="text" parsley-type="text" class="form-control"
|
||||
id="pincode" placeholder="pincode" name="pincode">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-8 offset-4">
|
||||
<div class="checkbox checkbox-purple">
|
||||
<input id="checkbox6" type="checkbox">
|
||||
<label for="checkbox6">
|
||||
Remember me
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-8 offset-4">
|
||||
<button type="submit" class="btn btn-primary waves-effect waves-light mr-1">
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
<th>Mobile</th>
|
||||
<th>Email</th>
|
||||
<th>Address</th>
|
||||
<th>Status</th>
|
||||
<!-- <th>Status</th> -->
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -50,8 +50,8 @@
|
||||
<td><?php echo $row['name'];?></td>
|
||||
<td><?php echo $row['mobile'];?></td>
|
||||
<td><?php echo $row['email'];?></td>
|
||||
<td><?php echo $row['address'];?></td>
|
||||
<td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "In-Active"; }?></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>
|
||||
|
||||
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
<th>Mobile</th>
|
||||
<th>Email</th>
|
||||
<th>Role</th>
|
||||
<th>Address</th>
|
||||
<th>Status</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
@ -51,6 +52,7 @@
|
||||
<td><?php echo $row['mobile'];?></td>
|
||||
<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>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user