Skip to content

T
TimeOutAdmin
Commit 7b9924c9 by Tobin
Options

dc

parent b4c188ac
Showing with 19 additions and 42 deletions
application/controllers/Provider.php
......@@ -103,9 +103,6 @@ class Provider extends CI_Controller {
if($err == 0 && (!isset($_POST['display_name']) || empty($_POST['display_name']))){
$err = 1;
$errMsg = 'Provide a Display Name';
}else if($err == 0 && (!isset($_POST['username']) || empty($_POST['username']))){
$err = 1;
$errMsg = 'Provide a User Name';
}else if($err == 0 && (!isset($_POST['password']) || empty($_POST['password']) ||
empty($_POST['password'] = md5($_POST['password'])))){
$err = 1;
......@@ -141,6 +138,7 @@ class Provider extends CI_Controller {
redirect(base_url('Provider/addProvider'));
}
$_POST['username'] = $_POST['email'];
$status = $this->Provider_model->addProvider($_POST);
if($status == 1){
$this->load->model('Api_model');
......@@ -214,15 +212,9 @@ class Provider extends CI_Controller {
if($err == 0 && (!isset($_POST['display_name']) || empty($_POST['display_name']))){
$err = 1;
$errMsg = 'Provide a Display Name';
}else if($err == 0 && (!isset($_POST['username']) || empty($_POST['username']))){
$err = 1;
$errMsg = 'Provide a User Name';
}else if($err == 0 && (!isset($_POST['name']) || empty($_POST['name']))){
$err = 1;
$errMsg = 'Provide a Name';
}else if($err == 0 && (!isset($_POST['email']) || empty($_POST['email']))){
$err = 1;
$errMsg = 'Provide an Email ID';
}else if($err == 0 && (!isset($_POST['phone']) || empty($_POST['phone']))){
$err = 1;
$errMsg = 'Provide a Phone Number';
......
application/models/Api_model.php
......@@ -878,7 +878,7 @@ class Api_model extends CI_Model {
events.custom_seat_layout,venue.layout,venue.layout_details,
event_gallery.media_url,favourite.status AS fav_status,
GROUP_CONCAT(DISTINCT event_tags.tag_id) AS tag_ids,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time,events.directory_listing
FROM events
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id
INNER JOIN venue ON venue.id = events.venue_id
......@@ -944,6 +944,7 @@ class Api_model extends CI_Model {
$resData['rate'] = $rate;
$resData['price'] = $price;
$resData['event_id'] = $rs->event_id;
$resData['is_demo'] = $rs->directory_listing;
$resData['attendees'] = $atte;
$resData['media_url'] = $rs->media_url;
$resData['fav_status'] = $rs->fav_status;
......@@ -1099,7 +1100,8 @@ class Api_model extends CI_Model {
GROUP_CONCAT(DISTINCT event_gallery.media_url) AS media_url,
GROUP_CONCAT(DISTINCT event_tags.tag_id) AS tag_ids,
GROUP_CONCAT(DISTINCT event_date_time.date) AS event_date,
GROUP_CONCAT(DISTINCT event_date_time.time) AS event_time
GROUP_CONCAT(DISTINCT event_date_time.time) AS event_time,
host_categories.customer_choice, events.directory_listing
FROM events
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id
INNER JOIN venue ON venue.id = events.venue_id
......@@ -1159,6 +1161,8 @@ class Api_model extends CI_Model {
$resData['venue_location'] = $rs->location;
$resData['event_attendees'] = $atte;
$resData['event_layout_url'] = $rs->layout;
$resData['is_demo'] = $rs->directory_listing;
$resData['is_requestable'] = $rs->customer_choice;
$resData['event_price_layout'] = $event_layout;
$evtData = langTranslator($rs->event_id,'EVT');
......@@ -1268,7 +1272,7 @@ class Api_model extends CI_Model {
venue.layout,venue.layout_details,events.custom_seat_layout,
event_gallery.media_url,favourite.status AS fav_status,
GROUP_CONCAT(DISTINCT event_tags.tag_id) AS tag_ids,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time,events.directory_listing
FROM events
INNER JOIN event_date_time ON events.event_id=event_date_time.event_id $case
INNER JOIN venue ON venue.id=events.venue_id
......@@ -1337,6 +1341,7 @@ class Api_model extends CI_Model {
$resData['media_url'] = $rs->media_url;
$resData['fav_status'] = $rs->fav_status;
$resData['venue_location'] = $rs->location;
$resData['is_demo'] = $rs->directory_listing;
$evtData = langTranslator($rs->event_id,'EVT');
$resData = array_merge($resData,$evtData);
......
application/models/Provider_model.php
......@@ -63,34 +63,20 @@ class Provider_model extends CI_Model {
function updateProvider($provider_id = '', $provider_data = array()){
if(empty($provider_id) || empty($provider_data))
return 0;
$userIdChk = $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 USR.id!='".$provider_id."' AND
USR.username='".$provider_data['username']."'");
if(!empty($userIdChk) && $userIdChk->num_rows() > 0) { return 4; }
$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 USR.id!='".$provider_id."' AND
PRV.email='".$provider_data['email']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0) { return 2; }
$phoneChk = $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 USR.id!='".$provider_id."' AND
WHERE USR.user_type='2' AND USR.status!='2' AND
USR.id!='".$provider_id."' AND
PRV.phone='".$provider_data['phone']."'");
if(!empty($phoneChk) && $phoneChk->num_rows() > 0) { return 3; }
$upMecArr = array('name'=>$provider_data['name'],
'email'=>$provider_data['email'],
'phone'=>$provider_data['phone']);
$upMecArr = array('name'=>$provider_data['name'],'phone'=>$provider_data['phone']);
$admUpdateArr = array('username'=>$provider_data['username'],
'display_name'=>$provider_data['display_name']);
$admUpdateArr = array('display_name'=>$provider_data['display_name']);
if(isset($provider_data['profile_image']) && !empty($provider_data['profile_image'])){
$upMecArr['profile_image'] = $provider_data['profile_image'];
$admUpdateArr['profile_image'] = $provider_data['profile_image'];
$upMecArr['profile_image'] = $admUpdateArr['profile_image'] = $provider_data['profile_image'];
}
$status = $this->db->update('users',$admUpdateArr,array('id'=>$provider_id));
......
application/views/Provider/providerForm.php
......@@ -42,14 +42,14 @@
placeholder="Enter Display Name" value="<?= (isset($provider_data->display_name))?$provider_data->display_name:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if(!isset($provider_id)){ ?>
<div class="form-group">
<label>User Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="username" required="" value="<?= (isset($provider_data->username))?$provider_data->username:'' ?>"
data-parsley-pattern="^[a-zA-Z0-9\ . _ @ \/]+$" placeholder="Enter User Name">
<label>Email (User Name)</label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email" placeholder="Enter email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if(!isset($provider_id)){ ?>
<div class="form-group">
<label>Password</label>
<input type="password" class="form-control required" name="password" placeholder="Password" required="">
......@@ -86,12 +86,6 @@
name="name" required="" value="<?= (isset($provider_data->name))?$provider_data->name:'' ?>"placeholder="Enter Organizer 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="<?= (isset($provider_data->email))?$provider_data->email:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
......
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