Skip to content

T
TimeOutAdmin
Commit c65d1d6e by Tobin
Options

dc

parent 99a87bee
Showing with 60 additions and 59 deletions
application/controllers/Api.php
...@@ -466,7 +466,7 @@ class Api extends CI_Controller { ...@@ -466,7 +466,7 @@ class Api extends CI_Controller {
} }
if(!empty($transaction_id) && !empty($last_id)){ if(!empty($transaction_id) && !empty($last_id)){
$this->Api_model->update_payment($response,$transaction_id,$last_id,'1') ; $this->Api_model->update_payment($response,$transaction_id,$last_id,'1');
} }
if(!empty($booking_id)){ if(!empty($booking_id)){
......
application/models/Api_model.php
...@@ -394,7 +394,7 @@ class Api_model extends CI_Model { ...@@ -394,7 +394,7 @@ class Api_model extends CI_Model {
JOIN venue ON venue.id=events.venue_id JOIN venue ON venue.id=events.venue_id
LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND
event_gallery.media_type=0 event_gallery.media_type=0
WHERE customer_id='$user_id' AND booking.status IN(0,1,2) WHERE customer_id='$user_id' AND booking.status IN(0,1,2,6)
GROUP BY booking.id ORDER BY booking.id DESC LIMIT 10"; GROUP BY booking.id ORDER BY booking.id DESC LIMIT 10";
$result = $this->db->query($sql)->result_array(); $result = $this->db->query($sql)->result_array();
...@@ -451,17 +451,12 @@ class Api_model extends CI_Model { ...@@ -451,17 +451,12 @@ class Api_model extends CI_Model {
try { try {
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$res_count = $this->db->where('bookId',$data['bookingCode'])->where('status',1)->get('booking')->num_rows(); $rs = $this->db->where('bookId',$data['bookingCode'])->update('booking',array('status'=>0));
if($res_count > 0) { if($rs) {
$rs = $this->db->where('bookId',$data['bookingCode'])->update('booking',array('status'=>0)); $res = array('status'=>1,'data'=>null);
if($rs) { } else {
$res = array('status'=>1,'data'=>null); $res = array('status'=>0,'message'=>'Cancel submission failed','code'=>'ER25');
} else { }
$res = array('status'=>0,'message'=>'Cancel submission failed','code'=>'ER25');
}
} else {
$res = array('status'=>0,'message'=>'Invalid booking code','code'=>'ER24');
}
} else { } else {
$res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19'); $res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19');
} }
...@@ -599,29 +594,35 @@ class Api_model extends CI_Model { ...@@ -599,29 +594,35 @@ class Api_model extends CI_Model {
try{ try{
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$post_data = $data; $post_data = $data;
$status = (isset($post_data['has_payment']) && $post_data['has_payment'] == 0)?'1':'3'; $status = (isset($post_data['has_payment']) && $post_data['has_payment'] == 0)?'1':'3';
$post_data['status'] = $status; $post_data['status'] = $status;
$post_data['bookId'] = 'TO'.date('ymd').str_pad(rand(1111,9999),4,0,STR_PAD_LEFT); $post_data['bookId'] = 'TO'.date('ymd').str_pad(rand(1111,9999),4,0,STR_PAD_LEFT);
$post_data['qrcode'] = genQRcode($post_data['bookId']); $post_data['qrcode'] = genQRcode($post_data['bookId']);
$post_data['customer_id'] = $user_id; $post_data['customer_id'] = $user_id;
$post_data['booking_date'] = date('Y-m-d H:i:s'); $post_data['booking_date'] = date('Y-m-d H:i:s');
$post_data['ticket_details'] = json_encode($post_data['ticket_details']); $post_data['ticket_details'] = json_encode($post_data['ticket_details']);
if(!isset($post_data['amount']) || $post_data['amount'] == ''){ if(!isset($post_data['amount']) || $post_data['amount'] == ''){
$post_data['amount'] = 0; $post_data['amount'] = 0;
} }
$evtData = $this->db->get_where('events',array('event_id'=>$post_data['event_id']));
$evtData = $evtData->row_array();
if(!empty($evtData) && isset($evtData['approve_booking']) && $evtData['approve_booking']=='1'){
$post_data['status'] = '6';
}
$promocodeData = array(); $promocodeData = array();
if(isset($post_data['promocode_id']) && !empty($post_data['promocode_id']) && if(isset($post_data['promocode_id']) && !empty($post_data['promocode_id']) &&
isset($post_data['redeem_amount']) && !empty($post_data['redeem_amount'])){ isset($post_data['redeem_amount']) && !empty($post_data['redeem_amount'])){
$status = ($post_data['status'] == '1')?1:0; $promoStatus = ($post_data['status'] == '1')?1:0;
$promocodeData = array('user_id'=>$user_id,'booking_id'=>$post_data['bookId'], $promocodeData = array('user_id'=>$user_id,'booking_id'=>$post_data['bookId'],
'promocode_id'=>$post_data['promocode_id'], 'promocode_id'=>$post_data['promocode_id'],
'redeem_amount'=>$post_data['redeem_amount'], 'redeem_amount'=>$post_data['redeem_amount'],
'created_date'=>date('Y-m-d H:i:s'),'status'=>$status); 'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
} }
unset($post_data['auth_token'],$post_data['has_payment'], unset($post_data['auth_token'],$post_data['has_payment'],
$post_data['promocode_id'],$post_data['redeem_amount']); $post_data['promocode_id'],$post_data['redeem_amount']);
...@@ -1336,31 +1337,29 @@ class Api_model extends CI_Model { ...@@ -1336,31 +1337,29 @@ class Api_model extends CI_Model {
if(empty($last_id)){ if(empty($last_id)){
return; return;
} }
$this->db->update('transaction', $this->db->update('transaction',array('transaction_id'=>$transactionid,
array('transaction_id'=>$transactionid, 'transaction_response'=>json_encode($response),
'transaction_response'=>json_encode($response), 'status'=>$status),
'status'=>$status), array('id'=>$last_id));
array('id'=>$last_id));
if($status == 1){ if($status == 1){
$trBook = $this->db->get_where('transaction',array('id'=>$last_id))->row_array(); $trBook = $this->db->get_where('transaction',array('id'=>$last_id))->row_array();
$book_id = $trBook['booking_id']; $book_id = $trBook['booking_id'];
$this->db->update('booking',array('status'=>'1'),array('bookId'=>$book_id)); $sql = "SELECT TEVT.event_name,CONCAT(EDATE.date,' ',EDATE.time) AS show_time,
$this->db->update('event_invites',array('status'=>'1'),array('book_id'=>$book_id)); CUST.name,CUST.email,CUST.phone,EVT.approve_booking
$this->db->update('promocode_used',array('status'=>'1'),array('booking_id'=>$book_id)); FROM booking AS BK
INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id)
$bkData = $this->db->query(" INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
SELECT TEVT.event_name,CONCAT(EDATE.date,' ',EDATE.time) AS show_time, INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
CUST.name,CUST.email,CUST.phone INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
FROM booking AS BK WHERE BK.bookId='".$trBook['booking_id']."' AND EVT.status='1' AND
INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id) BK.status='3' AND EDATE.status='1' AND TEVT.language_code='EN'";
INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id) $bkData = $this->db->query($sql)->row_array();
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id) $bokStatus = '1';
WHERE BK.bookId='".$trBook['booking_id']."' AND EVT.status='1' AND
BK.status='1' AND EDATE.status='1' AND TEVT.language_code='EN'")->row_array();
if(!empty($bkData)){ if(!empty($bkData)){
$bokStatus = (isset($bkData['approve_booking'])&&$bkData['approve_booking']=='1')?'6':'1';
$subject = "Your Tickets - TimeOut"; $subject = "Your Tickets - TimeOut";
$showTime = date("d'S F Y - h:i, (l)",strtotime($bkData['show_time'])); $showTime = date("d'S F Y - h:i, (l)",strtotime($bkData['show_time']));
$msgContent = "Hi, Your booking is confirmed for the event '".$bkData['event_name']. $msgContent = "Hi, Your booking is confirmed for the event '".$bkData['event_name'].
...@@ -1377,13 +1376,15 @@ class Api_model extends CI_Model { ...@@ -1377,13 +1376,15 @@ class Api_model extends CI_Model {
$this->send_mail($subject,$bkData['email'],$message); $this->send_mail($subject,$bkData['email'],$message);
if(isset($template['booking_sms']) && !empty($template['booking_sms'])){ if(isset($template['booking_sms']) && !empty($template['booking_sms'])){
$msgContent = str_replace( $msgContent = str_replace(array('{:event_name}','{:booking_id}','{:time}'),
array('{:event_name}','{:booking_id}','{:time}'), array($bkData['event_name'],$trBook['booking_id'],$showTime),
array($bkData['event_name'],$trBook['booking_id'],$showTime), $template['booking_sms']);
$template['booking_sms']);
} }
$this->sendSMS($bkData['phone'],$msgContent); $this->sendSMS($bkData['phone'],$msgContent);
} }
$this->db->update('booking',array('status'=>$bokStatus),array('bookId'=>$book_id));
$this->db->update('event_invites',array('status'=>'1'),array('book_id'=>$book_id));
$this->db->update('promocode_used',array('status'=>'1'),array('booking_id'=>$book_id));
} }
$res = array('status'=>1); $res = array('status'=>1);
}catch(Exception $e){ }catch(Exception $e){
......
application/models/Webservice_model.php
...@@ -1061,7 +1061,7 @@ class Webservice_model extends CI_Model { ...@@ -1061,7 +1061,7 @@ class Webservice_model extends CI_Model {
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$post_data = $data; $post_data = $data;
$status = '3';
$book_id = 'TO'.date('ymd').str_pad(rand(1111,9999),4,0,STR_PAD_LEFT); $book_id = 'TO'.date('ymd').str_pad(rand(1111,9999),4,0,STR_PAD_LEFT);
$post_data['bookId'] = $book_id; $post_data['bookId'] = $book_id;
$post_data['qrcode'] = genQRcode($post_data['bookId']); $post_data['qrcode'] = genQRcode($post_data['bookId']);
...@@ -1073,9 +1073,14 @@ class Webservice_model extends CI_Model { ...@@ -1073,9 +1073,14 @@ class Webservice_model extends CI_Model {
if(!isset($post_data['amount']) || empty($post_data['amount'])){ if(!isset($post_data['amount']) || empty($post_data['amount'])){
$post_data['amount'] = 0; $post_data['amount'] = 0;
} }
if(isset($post_data['has_payment']) && $post_data['has_payment'] == 0){ if(isset($post_data['has_payment']) && $post_data['has_payment'] == 0){
$post_data['status'] = '1'; $status = $post_data['status'] = '1';
}
$evtData = $this->db->get_where('events',array('event_id'=>$post_data['event_id']));
$evtData = $evtData->row_array();
if(!empty($evtData) && isset($evtData['approve_booking']) && $evtData['approve_booking']=='1'){
$post_data['status'] = '6';
} }
$promocodeData = array(); $promocodeData = array();
...@@ -1089,10 +1094,10 @@ class Webservice_model extends CI_Model { ...@@ -1089,10 +1094,10 @@ class Webservice_model extends CI_Model {
$post_data['amount'] = $post_data['discounted_price']; $post_data['amount'] = $post_data['discounted_price'];
$redeem_amount = $post_data['amount']-$post_data['discounted_price']; $redeem_amount = $post_data['amount']-$post_data['discounted_price'];
$status = ($post_data['status'] == '1')? 1 : 0; $promoStatus = ($post_data['status'] == '1')? 1 : 0;
$promocodeData = array('user_id'=>$user_id,'booking_id'=>$book_id, $promocodeData = array('user_id'=>$user_id,'booking_id'=>$book_id,
'promocode_id'=>$promo_id,'redeem_amount'=>$redeem_amount, 'promocode_id'=>$promo_id,'redeem_amount'=>$redeem_amount,
'created_date'=>date('Y-m-d H:i:s'),'status'=>$status); 'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
} }
$invite_ids = (isset($post_data['friends_ids']))?$post_data['friends_ids']:''; $invite_ids = (isset($post_data['friends_ids']))?$post_data['friends_ids']:'';
$invite_phone = (isset($post_data['invite_list']))?$post_data['invite_list']:''; $invite_phone = (isset($post_data['invite_list']))?$post_data['invite_list']:'';
...@@ -1127,7 +1132,7 @@ class Webservice_model extends CI_Model { ...@@ -1127,7 +1132,7 @@ class Webservice_model extends CI_Model {
$this->db->insert_batch('event_invites',$insertArr); $this->db->insert_batch('event_invites',$insertArr);
} }
if($post_data['status'] == 1){ if($status == 1){
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
...@@ -1197,16 +1202,11 @@ class Webservice_model extends CI_Model { ...@@ -1197,16 +1202,11 @@ class Webservice_model extends CI_Model {
try { try {
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$res_count = $this->db->where('bookId',$data['booking_id'])->where('status',1)->get('booking')->num_rows(); $rs = $this->db->where('bookId',$data['booking_id'])->update('booking',array('status'=>0));
if($res_count > 0) { if($rs) {
$rs = $this->db->where('bookId',$data['booking_id'])->update('booking',array('status'=>0)); $res = array('status'=>1,'data'=>null);
if($rs) {
$res = array('status'=>1,'data'=>null);
} else {
$res = array('status'=>0,'message'=>'Cancel submission failed','code'=>'ER25');
}
} else { } else {
$res = array('status'=>0,'message'=>'Invalid booking code','code'=>'ER24'); $res = array('status'=>0,'message'=>'Cancel submission failed','code'=>'ER25');
} }
} else { } else {
$res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19'); $res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19');
...@@ -1374,7 +1374,7 @@ class Webservice_model extends CI_Model { ...@@ -1374,7 +1374,7 @@ class Webservice_model extends CI_Model {
SELECT BOK.id FROM booking AS BOK SELECT BOK.id FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN event_date_time AS EDT ON (EVT.event_id=EVT.event_id) INNER JOIN event_date_time AS EDT ON (EVT.event_id=EVT.event_id)
WHERE BOK.customer_id='$user_id' AND BOK.status IN (0,1,2) AND EVT.status='1' WHERE BOK.customer_id='$user_id' AND BOK.status IN (0,1,2,6) AND EVT.status='1'
GROUP BY BOK.id")->num_rows(); GROUP BY BOK.id")->num_rows();
if($count > 0) { if($count > 0) {
...@@ -1399,7 +1399,7 @@ class Webservice_model extends CI_Model { ...@@ -1399,7 +1399,7 @@ class Webservice_model extends CI_Model {
INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id
INNER JOIN venue ON venue.id = events.venue_id INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN translator_event ON translator_event.event_id = events.event_id INNER JOIN translator_event ON translator_event.event_id = events.event_id
WHERE booking.customer_id = '$user_id' AND booking.status IN(0, 1, 2) AND WHERE booking.customer_id = '$user_id' AND booking.status IN(0,1,2,6) AND
(translator_event.language_code='$lang' OR translator_event.language_code='EN') (translator_event.language_code='$lang' OR translator_event.language_code='EN')
GROUP BY booking.id GROUP BY booking.id
ORDER BY booking.id DESC ORDER BY booking.id DESC
......
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