Skip to content

T
TimeOutAdmin
Commit dc7cdfea by Tobin
Options

dc

parent 3bd08006
Showing with 98 additions and 31 deletions
application/controllers/Api.php
...@@ -119,8 +119,8 @@ class Api extends CI_Controller { ...@@ -119,8 +119,8 @@ class Api extends CI_Controller {
} }
} }
public function locality() { public function locality($city_id = '') {
$res = $this->Api_model->locality(); $res = $this->Api_model->locality($city_id);
if($res['status']!=0){ if($res['status']!=0){
$this->response($res['data']); $this->response($res['data']);
} }
......
application/controllers/CMS.php
...@@ -43,18 +43,24 @@ class CMS extends CI_Controller { ...@@ -43,18 +43,24 @@ class CMS extends CI_Controller {
if(!isset($_POST['faq_en']) || empty($_POST['faq_en'])){ if(!isset($_POST['faq_en']) || empty($_POST['faq_en'])){
unset($_POST['faq_en']); unset($_POST['faq_en']);
} }
if(!isset($_POST['privacy_policy_en']) || empty($_POST['privacy_policy_en'])){
unset($_POST['privacy_policy_en']);
}
if(!isset($_POST['terms_and_conditions_en']) || empty($_POST['terms_and_conditions_en'])){
unset($_POST['terms_and_conditions_en']);
}
if(!isset($_POST['faq_ar']) || empty($_POST['faq_ar'])){ if(!isset($_POST['faq_ar']) || empty($_POST['faq_ar'])){
unset($_POST['faq_ar']); unset($_POST['faq_ar']);
} }
if(!isset($_POST['instruction_en']) || empty($_POST['instruction_en'])){
unset($_POST['instruction_en']);
}
if(!isset($_POST['instruction_ar']) || empty($_POST['instruction_ar'])){
unset($_POST['instruction_ar']);
}
if(!isset($_POST['privacy_policy_en']) || empty($_POST['privacy_policy_en'])){
unset($_POST['privacy_policy_en']);
}
if(!isset($_POST['privacy_policy_ar']) || empty($_POST['privacy_policy_ar'])){ if(!isset($_POST['privacy_policy_ar']) || empty($_POST['privacy_policy_ar'])){
unset($_POST['privacy_policy_ar']); unset($_POST['privacy_policy_ar']);
} }
if(!isset($_POST['terms_and_conditions_en']) || empty($_POST['terms_and_conditions_en'])){
unset($_POST['terms_and_conditions_en']);
}
if(!isset($_POST['terms_and_conditions_ar']) || empty($_POST['terms_and_conditions_ar'])){ if(!isset($_POST['terms_and_conditions_ar']) || empty($_POST['terms_and_conditions_ar'])){
unset($_POST['terms_and_conditions_ar']); unset($_POST['terms_and_conditions_ar']);
} }
......
application/controllers/Webservice.php
...@@ -74,15 +74,18 @@ class Webservice extends CI_Controller { ...@@ -74,15 +74,18 @@ class Webservice extends CI_Controller {
} }
public function get_events_list() { public function get_events_list() {
$data = $_GET; $data = $_GET;
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->discover($data); $res = $this->Webservice_model->discover($data);
if($res['status']!=0){ if(sizeof($res['data']) && $res['status']!=0){
$this->responseEventList($res['data']);
}elseif(sizeof($res['data'] == 0) && $res['status']!=0){
$this->response($res['data']); $this->response($res['data']);
} }else{
else{
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
} }
} }
public function events_details($event_id = null) { public function events_details($event_id = null) {
...@@ -181,7 +184,7 @@ class Webservice extends CI_Controller { ...@@ -181,7 +184,7 @@ class Webservice extends CI_Controller {
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->update_city($data); $res = $this->Webservice_model->update_city($data);
if($res['status']!=0){ if($res['status']!=0){
$this->successResponse($res); $this->response($res['data']);
} }
else{ else{
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
...@@ -310,13 +313,14 @@ class Webservice extends CI_Controller { ...@@ -310,13 +313,14 @@ class Webservice extends CI_Controller {
} }
public function get_booking_list() { public function get_booking_list() {
$data = (array) json_decode(file_get_contents('php://input')); $data = $_GET;
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->bookedlist($data); $res = $this->Webservice_model->bookedlist($data);
if($res['status']!=0){ if(sizeof($res['data']) && $res['status']!=0){
$this->responseBookList($res['data']);
}elseif(sizeof($res['data'] == 0) && $res['status']!=0){
$this->response($res['data']); $this->response($res['data']);
} }else{
else{
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
} }
} }
...@@ -344,6 +348,19 @@ class Webservice extends CI_Controller { ...@@ -344,6 +348,19 @@ class Webservice extends CI_Controller {
} }
} }
public function responseEventList($data) {
//print_r($data);exit();
$result = array(
'status' => 'success',
'data' => array(
'is_last_booking_avail' =>$data['is_last_booking_avail'],
'city_name' =>$data['city_name'],
'events' =>$data['events']),
'meta' =>$data['meta']
);
print json_encode($result);
}
public function get_last_booking() { public function get_last_booking() {
...@@ -358,6 +375,16 @@ class Webservice extends CI_Controller { ...@@ -358,6 +375,16 @@ class Webservice extends CI_Controller {
} }
public function responseBookList($data) {
$result = array(
'status' => 'success',
'data' => array(
'bookings' =>$data['bookings']),
'meta' =>$data['meta']
);
print json_encode($result);
}
public function filters() { public function filters() {
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->filters($data); $res = $this->Webservice_model->filters($data);
......
application/models/Api_model.php
...@@ -16,6 +16,7 @@ class Api_model extends CI_Model { ...@@ -16,6 +16,7 @@ class Api_model extends CI_Model {
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob):'';
$result->auth_token = md5(microtime().rand()); $result->auth_token = md5(microtime().rand());
$this->generateAuth($result->userId,$result->auth_token); $this->generateAuth($result->userId,$result->auth_token);
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
...@@ -74,7 +75,7 @@ class Api_model extends CI_Model { ...@@ -74,7 +75,7 @@ class Api_model extends CI_Model {
$email_id = $data['email_id']; $email_id = $data['email_id'];
$template = getNotifTemplate(); $template = getNotifTemplate();
$message .= "<html> $message = "<html>
<body> <body>
Hi,\n\r Welcome to TimeOut. \r\n Please use username: Hi,\n\r Welcome to TimeOut. \r\n Please use username:
".$email_id." and Password: ".$temp_password." ".$email_id." and Password: ".$temp_password."
...@@ -84,12 +85,13 @@ class Api_model extends CI_Model { ...@@ -84,12 +85,13 @@ class Api_model extends CI_Model {
</html>"; </html>";
$this->send_mail($subject,$email_id,$message); $this->send_mail($subject,$email_id,$message);
$this->db->select('customer.name,customer.dob,customer.phone,customer.email,customer.profile_image AS image,customer.gender,users.id AS userId, customer.city,customer.dob'); $this->db->select('customer.name,customer.dob,customer.phone,customer.email,customer.profile_image AS image,customer.gender,users.id AS userId, customer.city');
$this->db->where('users.id',$id); $this->db->where('users.id',$id);
$this->db->from('users'); $this->db->from('users');
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob):'';
$result->auth_token = md5(microtime().rand()); $result->auth_token = md5(microtime().rand());
$this->generateAuth($result->userId,$result->auth_token); $this->generateAuth($result->userId,$result->auth_token);
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
...@@ -195,9 +197,15 @@ class Api_model extends CI_Model { ...@@ -195,9 +197,15 @@ class Api_model extends CI_Model {
return $res; return $res;
} }
function locality() { function locality($city_id = '') {
try { try {
$rs = $this->db->select('id AS locality_id,venue_id,locality')->where('status',1)->get('locality')->result(); $cond['status'] = '1';
if(!empty($city_id)){
$cond['region_id'] = $city_id;
}
$rs = $this->db->select('id AS locality_id,venue_id,locality')
->get_where('locality',$cond)->result();
if(count($rs) > 0) { if(count($rs) > 0) {
$res = array('status'=>1,'data'=>$rs); $res = array('status'=>1,'data'=>$rs);
} else { } else {
...@@ -322,7 +330,7 @@ class Api_model extends CI_Model { ...@@ -322,7 +330,7 @@ class Api_model extends CI_Model {
$page_limit = ($page - 1) * $per_page; $page_limit = ($page - 1) * $per_page;
if($count > $page_limit) { if($count > $page_limit) {
$result = $this->db->select('booking.id AS book_id,booking.event_id,booking.bookId AS bookingCode,booking.qrcode,booking.no_of_ticket,booking.amount,booking.status AS book_status,events.event_name,events.event_discription,event_gallery.media_url,venue.location')->where('customer_id',$user_id)->where('booking.status!=',3)->from('booking')->join('events','booking.event_id = events.event_id')->join('event_date_time','booking.event_date_id = event_date_time.id')->join('venue', 'venue.id = events.venue_id')->join('event_gallery', 'events.event_id = event_gallery.event_id AND event_gallery.media_type = 0', 'LEFT')->group_by('booking.id')->limit($per_page,$page_limit)->get()->result(); $result = $this->db->select('booking.id AS book_id,booking.event_id,booking.bookId AS bookingCode,booking.qrcode,booking.no_of_ticket,booking.amount,booking.status AS book_status,events.event_name,events.event_discription,event_gallery.media_url,venue.location,event_date_time.date AS event_date,event_date_time.time AS event_time')->where('customer_id',$user_id)->where('booking.status!=',3)->from('booking')->join('events','booking.event_id = events.event_id')->join('event_date_time','booking.event_date_id = event_date_time.id')->join('venue', 'venue.id = events.venue_id')->join('event_gallery', 'events.event_id = event_gallery.event_id AND event_gallery.media_type = 0', 'LEFT')->group_by('booking.id')->limit($per_page,$page_limit)->get()->result();
$meta = array('total_pages'=>ceil($count/$per_page), $meta = array('total_pages'=>ceil($count/$per_page),
'total'=>$count, 'total'=>$count,
'current_page'=>$page, 'current_page'=>$page,
...@@ -452,6 +460,7 @@ class Api_model extends CI_Model { ...@@ -452,6 +460,7 @@ class Api_model extends CI_Model {
$post_data = $data; $post_data = $data;
unset($post_data['file']); unset($post_data['file']);
unset($post_data['auth_token']); unset($post_data['auth_token']);
$post_data['dob'] = (!empty($post_data['dob']))?strtotime($post_data['dob']):'';
if(isset($data['file'])){ if(isset($data['file'])){
$img=$data['file']['name']; $img=$data['file']['name'];
$expbanner = explode('.',$img); $expbanner = explode('.',$img);
...@@ -488,6 +497,7 @@ class Api_model extends CI_Model { ...@@ -488,6 +497,7 @@ class Api_model extends CI_Model {
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y", $result->dob):'';
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
} else { } else {
$res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19'); $res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19');
...@@ -809,7 +819,11 @@ class Api_model extends CI_Model { ...@@ -809,7 +819,11 @@ class Api_model extends CI_Model {
$count = $this->db->query("SELECT events.event_id FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id $case WHERE events.status = 1 $where GROUP BY events.event_id")->num_rows(); $count = $this->db->query("SELECT events.event_id FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id $case WHERE events.status = 1 $where GROUP BY events.event_id")->num_rows();
if(isset($data['venue_id']) && !empty($data['venue_id'])) { if(isset($data['venue_id']) && !empty($data['venue_id'])) {
$where = ' AND locality.id ='.$data['venue_id']; $where .= ' AND locality.id ='.$data['venue_id'];
}
if(isset($data['city_id']) && !empty($data['city_id'])) {
$where .= ' AND locality.region_id = '.$data['city_id'];
} }
if($count > 0) { if($count > 0) {
...@@ -831,16 +845,16 @@ class Api_model extends CI_Model { ...@@ -831,16 +845,16 @@ class Api_model extends CI_Model {
`event_gallery`.`media_url`,favourite.status AS fav_status, `event_gallery`.`media_url`,favourite.status AS fav_status,
GROUP_CONCAT(DISTINCT tags.tag_name) AS tag GROUP_CONCAT(DISTINCT tags.tag_name) AS tag
FROM events FROM events
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id $case INNER JOIN event_date_time ON events.event_id=event_date_time.event_id $case
INNER JOIN venue ON venue.id = events.venue_id INNER JOIN venue ON venue.id=events.venue_id
LEFT JOIN locality ON locality.id = venue.locality_id LEFT JOIN locality ON locality.id=venue.locality_id
LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`media_type` = 0 LEFT JOIN `event_gallery` ON `events`.`event_id`=`event_gallery`.`event_id` AND `event_gallery`.`media_type`=0
LEFT JOIN booking on booking.event_id = events.event_id LEFT JOIN booking on booking.event_id=events.event_id
LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id = '$user_id' AND favourite.status = 1 LEFT JOIN favourite ON favourite.event_id=events.event_id AND favourite.user_id='$user_id' AND favourite.status=1
LEFT JOIN event_tags ON events.event_id = event_tags.event_id LEFT JOIN event_tags ON events.event_id=event_tags.event_id
LEFT JOIN tags on tags.tag_id = event_tags.tag_id LEFT JOIN tags on tags.tag_id = event_tags.tag_id
LEFT JOIN review ON events.event_id = review.event_id LEFT JOIN review ON events.event_id=review.event_id
WHERE events.status = 1 $where GROUP BY events.event_id ORDER BY attendees DESC LIMIT ". $page_limit.", ".$per_page)->result(); WHERE events.status=1 $where GROUP BY events.event_id ORDER BY attendees DESC LIMIT ". $page_limit.", ".$per_page)->result();
if(count($result)>0){ if(count($result)>0){
$resultData = array(); $resultData = array();
...@@ -943,10 +957,12 @@ class Api_model extends CI_Model { ...@@ -943,10 +957,12 @@ class Api_model extends CI_Model {
if($cms){ if($cms){
$language['ar'] = array( $language['ar'] = array(
'faq'=>$cms['faq_ar'], 'faq'=>$cms['faq_ar'],
'instruction'=>$cms['instruction_ar'],
'privacy_policy'=>$cms['privacy_policy_ar'], 'privacy_policy'=>$cms['privacy_policy_ar'],
'terms_and_conditions'=>$cms['terms_and_conditions_ar']); 'terms_and_conditions'=>$cms['terms_and_conditions_ar']);
$language['en'] = array( $language['en'] = array(
'faq'=>$cms['faq_en'], 'faq'=>$cms['faq_en'],
'instruction'=>$cms['instruction_en'],
'privacy_policy'=>$cms['privacy_policy_en'], 'privacy_policy'=>$cms['privacy_policy_en'],
'terms_and_conditions'=>$cms['terms_and_conditions_en']); 'terms_and_conditions'=>$cms['terms_and_conditions_en']);
$res = array('status'=>1,'data'=>$language); $res = array('status'=>1,'data'=>$language);
......
application/models/Validation_app_model.php
...@@ -18,6 +18,8 @@ class Validation_app_model extends CI_Model { ...@@ -18,6 +18,8 @@ class Validation_app_model extends CI_Model {
'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone no is null or empty'), 'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone no is null or empty'),
'phone'=>array('code'=>'ER08', 'message'=>'Invalid Phone no'), 'phone'=>array('code'=>'ER08', 'message'=>'Invalid Phone no'),
), ),
'name'=>array('required'=>array('code'=>'ER04', 'message'=>'Name is null or empty'),
),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'), 'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),
) )
), ),
......
application/views/CMS/cms_management.php
...@@ -43,6 +43,20 @@ ...@@ -43,6 +43,20 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label>Instruction (English)</label>
<textarea id="rich_editor_6" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Instruction English" name="instruction_en" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->instruction_en ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Instruction (Arabic)</label>
<textarea id="rich_editor_7" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Instruction Arabic" name="instruction_ar" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->instruction_ar ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Privacy Policy (English)</label> <label>Privacy Policy (English)</label>
<textarea id="rich_editor_1" type="text" placeholder="Privacy Policy English" class="ip_reg_form_input form-control reset-form-custom" name="privacy_policy_en" style="height:108px;" data-parsley-minlength="2" data-parsley-trigger="change"><?= $cmsData->privacy_policy_en ?></textarea> <textarea id="rich_editor_1" type="text" placeholder="Privacy Policy English" class="ip_reg_form_input form-control reset-form-custom" name="privacy_policy_en" style="height:108px;" data-parsley-minlength="2" data-parsley-trigger="change"><?= $cmsData->privacy_policy_en ?></textarea>
</div> </div>
......
application/views/Templates/footer-script.php
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
if(jQuery('#rich_editor').length==1){ CKEDITOR.replace('rich_editor'); } if(jQuery('#rich_editor').length==1){ CKEDITOR.replace('rich_editor'); }
if(jQuery('#rich_editor_1').length==1){CKEDITOR.replace('rich_editor_1'); } if(jQuery('#rich_editor_1').length==1){CKEDITOR.replace('rich_editor_1'); }
if(jQuery('#rich_editor_2').length==1){CKEDITOR.replace('rich_editor_2'); } if(jQuery('#rich_editor_2').length==1){CKEDITOR.replace('rich_editor_2'); }
if(jQuery('#rich_editor_6').length==1){CKEDITOR.replace('rich_editor_6'); }
if(jQuery('#rich_editor_3').length==1){CKEDITOR.replace('rich_editor_3',{language:'ar'});} if(jQuery('#rich_editor_3').length==1){CKEDITOR.replace('rich_editor_3',{language:'ar'});}
if(jQuery('#rich_editor_4').length==1){CKEDITOR.replace('rich_editor_4',{language:'ar'});} if(jQuery('#rich_editor_4').length==1){CKEDITOR.replace('rich_editor_4',{language:'ar'});}
if(jQuery('#rich_editor_5').length==1){CKEDITOR.replace('rich_editor_5',{language:'ar'});} if(jQuery('#rich_editor_5').length==1){CKEDITOR.replace('rich_editor_5',{language:'ar'});}
if(jQuery('#rich_editor_7').length==1){CKEDITOR.replace('rich_editor_7',{language:'ar'});}
}); });
function doconfirm(){ function doconfirm(){
......
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