Skip to content

T
TimeOutAdmin
Commit 2b48a2a1 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !325
parents ae118e3b 2a910426
Showing with 8 additions and 44 deletions
application/controllers/User.php
......@@ -124,10 +124,6 @@ class User extends CI_Controller {
$flashMsg = array('message'=>'Provide a valid Phone Number..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['email']) || empty($_POST['email'])){
$flashMsg = array('message'=>'Provide a valid Email ID..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
}
} else if ($user_type == 3) {
if (!isset($_POST['name']) || empty($_POST['name'])){
......
application/models/Api_model.php
......@@ -394,7 +394,7 @@ class Api_model extends CI_Model {
$sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id
FROM orders AS ODR
INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,3,5,6)
WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,5,6)
GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC $cond";
......
application/models/Organizer_model.php
......@@ -473,20 +473,12 @@ class Organizer_model extends CI_Model {
public function organiserSignUp($data){
try{
$userNameChk = $this->db->query("SELECT * FROM users
WHERE user_type='2' AND status!='2' AND
WHERE status!='2' AND
username='".$data['username']."'");
if(!empty($userNameChk) && $userNameChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Username Already Exist','code'=>'ER07');
return $res;
}
$emailChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.user_type='2' AND USR.status!='2' AND
PRV.email='".$data['email_id']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER08');
return $res;
}
$data['contact_no'] = preg_replace('/\D/', '', $data['contact_no']);
$phoneChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
......@@ -515,7 +507,7 @@ class Organizer_model extends CI_Model {
$sql = $this->db->query("SELECT USR.* FROM users AS USR
INNER JOIN provider AS PDR ON (PDR.provider_id = USR.id)
WHERE USR.password='".md5($data['password'])."' AND
( PDR.email='".$data['email_id']."' OR USR.username='".$data['email_id']."') AND
USR.username='".$data['email_id']."' AND
USR.user_type='".$data['user_type']."' AND
USR.status='1'");
}else{
......
application/models/User_model.php
......@@ -41,7 +41,7 @@ class User_model extends CI_Model {
}
$chkUser = $this->db->query("SELECT * FROM users WHERE status!='2' AND id!='".$user_id."' AND
username='".$user_data['username']."' AND user_type='".$user_type."'");
username='".$user_data['username']."'");
if(!empty($chkUser) && $chkUser->num_rows() > 0) {
return 4;
......@@ -52,18 +52,11 @@ class User_model extends CI_Model {
$chkUser = $this->db->query("SELECT * FROM users AS USR
INNER JOIN provider AS PRV ON (USR.id = PRV.provider_id)
WHERE USR.status!='2' AND USR.id!='".$user_id."' AND
PRV.email='".$user_data['email']."'");
if(!empty($chkUser) && $chkUser->num_rows() > 0) return 5;
$chkUser = $this->db->query("SELECT * FROM users AS USR
INNER JOIN provider AS PRV ON (USR.id = PRV.provider_id)
WHERE USR.status!='2' AND USR.id!='".$user_id."' AND
PRV.phone='".$user_data['phone']."'");
if(!empty($chkUser) && $chkUser->num_rows() > 0) return 6;
$status = $this->db->update('provider',array('name'=>$user_data['name'],
'email'=>$user_data['email'],
'email'=>$user_data['username'],
'phone'=>$user_data['phone']),
array('provider_id'=>$user_id));
......@@ -87,7 +80,7 @@ class User_model extends CI_Model {
array('customer_id'=>$user_id));
}
if($user_type == 1 || $user_type == 4){
if($user_type != 3){
$userData['username'] = $user_data['username'];
$userData['display_name'] = $user_data['display_name'];
if(isset($user_data['password']) && !empty($user_data['password'])){
......
application/views/User/editProfile.php
......@@ -46,7 +46,7 @@
</div>
<div class="form-group">
<label>User Name</label>
<label>User Name (E-mail) </label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="username" required=""
data-parsley-pattern="^[a-zA-Z0-9\ . _ @ \/]+$"
......@@ -87,13 +87,6 @@
placeholder="Enter First Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email" placeholder="Enter email ID"
value="<?= $provider->email ?>" >
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
......
application/views/User/viewProfile.php
......@@ -55,7 +55,7 @@
</div>
</div>
<div class="row">
<div class="col-md-5"><span>User Name </span></div>
<div class="col-md-5"><span>User Name (E-mail) </span></div>
<div class="col-md-7">
<span>:</span>
<label class="padLeft20">
......@@ -77,16 +77,6 @@
</div>
<div class="row">
<div class="col-md-5"><span>Email </span></div>
<div class="col-md-7">
<span>:</span>
<label class="padLeft20">
<?= $provider->email ?>
</label>
</div>
</div>
<div class="row">
<div class="col-md-5"><span>Phone Number </span></div>
<div class="col-md-7">
<span>:</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment