Skip to content

T
TimeOutAdmin
Commit e74db1a4 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !153
parents 91f81652 a0d0a5b2
Showing with 54 additions and 24 deletions
application/config/database.php
......@@ -76,9 +76,9 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => 'localhost',
'username' => 'nuvento_timeout',
'username' => 'root',
'password' => 'Golden_123',
'database' => 'nuvento_timeout',
'database' => 'timeout_uat',
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,
......
application/controllers/OrganizerServices.php
......@@ -210,6 +210,16 @@ class OrganizerServices extends CI_Controller {
}
}
public function checkerDelete(){
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->checkerDelete($data);
if($res['status'] != 0){
$this->successResponse($res);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function getTagList(){
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->getTagList($data);
......
application/controllers/Webservice.php
......@@ -564,10 +564,9 @@ class Webservice extends CI_Controller {
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->validate_promo_code($data);
if($res['status']!=0){
if($res['status'] == 1 || $res['status'] == 5){
$this->response($res['data']);
}
else{
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
......
application/models/Organizer_model.php
......@@ -222,7 +222,7 @@ class Organizer_model extends CI_Model {
$this->db->insert_batch('event_tags',$insertTag);
}
}
$res = array('status'=>1,'message'=>'Event Added Successfully');
$res = array('status'=>1,'message'=>'Event Updated Successfully');
} catch (Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South!!','code'=>'ER08');
}
......@@ -509,9 +509,9 @@ class Organizer_model extends CI_Model {
$err = 0;
$postData['seat_pricing'] = $postData['custom_seat_layout'] = '';
if(isset($postData['layout_type']) && $postData['layout_type'] == 1){
if(isset($postData['layout_type'],$postData['fare_type']) && $postData['layout_type'] == 1 && $postData['fare_type'] == 2){
$postData['custom_seat_layout'] = $postData['layout'];
} else {
} else if($postData['layout_type'] == 2){
$postData['seat_pricing'] = $postData['layout'];
}
$eventData = array('venue_id'=>$postData['venue_id'],
......@@ -947,6 +947,21 @@ class Organizer_model extends CI_Model {
return $res;
}
public function checkerDelete($data){
try{
$count = $this->db->get_where('checker',array('id'=>$data['checker_id'],'provider_id'=>$data['organiser_id']))->num_rows();
if($count < 1){
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
return $res;
}
$this->db->update('checker',array('status'=>2),array('id'=>$data['checker_id'],'provider_id'=>$data['organiser_id']));
$res = array('status'=>1,'message'=>'Checker Deleted Successfully');
} catch (Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South!!','code'=>'ER08');
}
return $res;
}
}
?>
application/models/Validation_app_model.php
......@@ -49,9 +49,9 @@ class Validation_app_model extends CI_Model {
'no_of_ticket'=>array('required'=>array('code'=>'ER31', 'message'=>'Number of ticket is null or empty')),
'ticket_details'=>array('required'=>array('code'=>'ER32', 'message'=>'Ticket details is null or empty'))),
'cancel_booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty')),),
'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty'))),
'update_fcm_token'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty')),),
'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty'))),
'get_favorites_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
'get_booking_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
'settings'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
......
application/models/Validation_organizer_model.php
......@@ -274,12 +274,6 @@ class Validation_organizer_model extends CI_Model {
'message' => 'Tag is null or empty'
)
),
'layout' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Layout is null or empty'
)
),
),
'getLanguages'=>array(),
'getCategories'=>array(),
......@@ -363,6 +357,20 @@ class Validation_organizer_model extends CI_Model {
)
),
),
'checkerDelete'=>array(
'organiser_id'=>array(
'required'=>array(
'code'=>'ER30',
'message'=>'Organizer Id is null or empty'
)
),
'checker_id'=>array(
'required'=>array(
'code'=>'ER30',
'message'=>'Checker Id is null or empty'
)
),
),
);
public function _consruct(){
......
application/models/Webservice_model.php
......@@ -1700,6 +1700,7 @@ class Webservice_model extends CI_Model {
ORDER BY EVT.event_id DESC
LIMIT $limit";
$resp = array();
$result = $this->db->query($sql)->result();
foreach ($result AS $key => $rs) {
if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
......@@ -1713,13 +1714,16 @@ class Webservice_model extends CI_Model {
}
if($checkTime == count($dates)){
unset($result[$key]);
continue;
}
} else {
unset($result[$key]);
continue;
}
unset($result[$key]->date_time);
$resp[] = $result[$key];
}
$res = array('status'=>1,'data'=>array('events'=>$result,'meta'=>$meta));
$res = array('status'=>1,'data'=>array('events'=>$resp,'meta'=>$meta));
} else {
$res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));
}
......@@ -1896,9 +1900,8 @@ class Webservice_model extends CI_Model {
continue;
}
$sql = "SELECT CUST.name,CUST.phone,CUST.profile_image,CUST.profile_image_qr,
CUST.customer_id,CAUTH.auth_token AS fcm_token
CUST.customer_id,CUST.fcm_token
FROM customer AS CUST
INNER JOIN customer_auth AS CAUTH ON (CAUTH.user_id=CUST.customer_id)
WHERE CUST.customer_id='$fromUsrId'";
$cust = $this->db->query($sql);
if(!empty($cust) && !empty($cust = $cust->row_array())){
......
sql/timeOutBackup.sql deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
sql/timeout_run_sql.sql deleted 100644 → 0
INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
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