Commit be763f0b by Jansa Jose

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

# Conflicts: # application/controllers/Webservice.php # application/models/Webservice_model.php
parents 4dbcccdc c5265aab
...@@ -75,10 +75,10 @@ $query_builder = TRUE; ...@@ -75,10 +75,10 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => 'localhost', 'hostname' => '192.168.140.123',
'username' => 'nuvento_timeout', 'username' => 'root',
'password' => 'Golden_123', 'password' => 'Golden_123',
'database' => 'nuvento_timeout', 'database' => 'tobin_eventTimeOut',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,
......
...@@ -245,10 +245,12 @@ class Webservice_model extends CI_Model { ...@@ -245,10 +245,12 @@ class Webservice_model extends CI_Model {
INNER JOIN region ON customer.city=region.id INNER JOIN region ON customer.city=region.id
WHERE customer.customer_id='$user_id' AND region.status='1'"; WHERE customer.customer_id='$user_id' AND region.status='1'";
$cityName = $this->db->query($sql)->row_array(); $cityName = $this->db->query($sql)->row_array();
$cityName['city'] = 'null';
if(!empty($cityName)){ if(!empty($cityName)){
$regData = langTranslator($cityName['id'],'REG','EN'); $regData = langTranslator($cityName['id'],'REG',$lang);
$cityName['city'] = $regData['region_name']; $cityName['city'] = $regData['region_name'];
} else {
$cityName['city'] = 'null';
} }
if(isset($data['category_id'])) { if(isset($data['category_id'])) {
$where = ' AND events.category_id = '.$data['category_id']; $where = ' AND events.category_id = '.$data['category_id'];
...@@ -368,14 +370,10 @@ class Webservice_model extends CI_Model { ...@@ -368,14 +370,10 @@ class Webservice_model extends CI_Model {
if($count > 0) { if($count > 0) {
$page = (isset($data['page']))?$data['page']:1; $page = (isset($data['page']))?$data['page']:1;
$page_limit = ($page - 1)*$per_page; $page_limit = ($page - 1)*$per_page;
if($lang == 'ar') {
$cat_field = 'event_category.category_ar';
} else {
$cat_field = 'event_category.category_en';
}
if($count > $page_limit) { if($count > $page_limit) {
$result = $this->db->query(" $result = $this->db->query("
SELECT events.seat_pricing,events.custom_seat_layout,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id, events.event_name AS name,events.event_name_ar AS name_ar,`event_gallery`.`media_url` AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees, $cat_field AS category, CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating, venue.venue_name, venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time SELECT events.seat_pricing,events.custom_seat_layout,event_category.cat_id,venue.id AS venue_id,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id,event_gallery.media_url AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees,CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating,venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time
FROM events FROM events
INNER JOIN venue ON venue.id = events.venue_id INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id INNER JOIN event_date_time ON events.event_id = event_date_time.event_id
...@@ -413,15 +411,27 @@ class Webservice_model extends CI_Model { ...@@ -413,15 +411,27 @@ class Webservice_model extends CI_Model {
$pricelist = json_decode($rs->seat_pricing, TRUE); $pricelist = json_decode($rs->seat_pricing, TRUE);
$price = $pricelist['price']; $price = $pricelist['price'];
} }
$transData = array('event'=>'','category'=>'','venue'=>'');
if(!empty($lanTrans = langTranslator($rs->event_id,'EVT',$lang))){
$transData['event'] = $lanTrans['event_name'];
}
if(!empty($lanTrans = langTranslator($rs->cat_id,'CAT',$lang))){
$transData['category'] = $lanTrans['category_name'];
}
if(!empty($lanTrans = langTranslator($rs->venue_id,'VEN',$lang))){
$transData['venue'] = $lanTrans['venue_name'];
}
$resData = array( $resData = array(
'id' => "$key", 'id' => "$key",
'event_id'=>$rs->event_id, 'event_id'=>$rs->event_id,
'image'=>$rs->image, 'image'=>$rs->image,
'attendees'=>(!empty($rs->attendees))?$rs->attendees:'0', 'attendees'=>(!empty($rs->attendees))?$rs->attendees:'0',
'category'=>$rs->category, 'category'=>$transData['category'],
'name'=>($lang == 'en')?$rs->name:$rs->name_ar, 'name'=>$transData['event'],
'rating'=>(!empty($rs->rating))?$rs->rating:'0', 'rating'=>(!empty($rs->rating))?$rs->rating:'0',
'location'=>$rs->venue_name.', '.$rs->location, 'location'=>$transData['venue'].', '.$rs->location,
'rate'=>$price, 'rate'=>$price,
'is_editors_choice'=>$rs->is_editors_choice, 'is_editors_choice'=>$rs->is_editors_choice,
'is_favorite'=>$rs->is_favorite === 'true'? true: false, 'is_favorite'=>$rs->is_favorite === 'true'? true: false,
...@@ -966,25 +976,68 @@ class Webservice_model extends CI_Model { ...@@ -966,25 +976,68 @@ class Webservice_model extends CI_Model {
$post_data = $data; $post_data = $data;
$post_data['customer_id'] = $user_id; $post_data['customer_id'] = $user_id;
$post_data['ticket_details'] = json_encode($post_data['ticket_details']); $post_data['ticket_details'] = json_encode($post_data['ticket_details']);
$post_data['status'] = (isset($post_data['has_payment']) && $post_data['has_payment'] == 0)?'1':'3'; $post_data['status'] = '3';
unset($post_data['auth_token'],$post_data['has_payment']);
if(isset($post_data['has_payment']) && $post_data['has_payment'] == 0){
$post_data['status'] = '1';
}
if(isset($post_data['promo_code']) && !empty($post_data['promo_code']) &&
isset($post_data['discounted_price']) && !empty($post_data['discounted_price'])){
$promoData = $this->db->get_where('promocode_management',array('status'=>'1',
'promocode_name'=>$post_data['promo_code']))->row_array();
$promo_id = $promoData['promocode_id'];
$redeem_amount = $post_data['amount']-$post_data['discounted_price'];
$post_data['amount'] = $redeem_amount;
$this->db->insert('promocode_used',
array('user_id'=>$user_id,'event_id'=>$post_data['event_id'],
'promocode_id'=>$promo_id,'redeem_amount'=>$redeem_amount,
'created_date'=>date('Y-m-d H:i:s')));
}
$invite_ids = (isset($post_data['friends_ids']))?$post_data['friends_ids']:'';
$invite_phone = (isset($post_data['invite_list']))?$post_data['invite_list']:'';
unset($post_data['auth_token'],$post_data['has_payment'],$post_data['friends_ids'],
$post_data['promo_code'],$post_data['discounted_price'],$post_data['invite_list']);
$code = 'TO'; $code = 'TO';
$ymd = date('ymd'); $ymd = date('ymd');
$squence = rand(1111,9999); $squence = rand(1111,9999);
$squence = str_pad($squence,4,0,STR_PAD_LEFT); $squence = str_pad($squence,4,0,STR_PAD_LEFT);
$post_data['bookId'] = $code.$ymd.$squence; $book_id = $code.$ymd.$squence;
$post_data['bookId'] = $book_id;
$post_data['qrcode'] = genQRcode($post_data['bookId']); $post_data['qrcode'] = genQRcode($post_data['bookId']);
$post_data['booking_date'] = date('Y-m-d H:i:s'); $post_data['booking_date'] = date('Y-m-d H:i:s');
$rs = $this->db->insert('booking', $post_data); $rs = $this->db->insert('booking', $post_data);
$id = $this->db->insert_id(); $id = $this->db->insert_id();
if($id){ if($id){
$res = array('status'=>1,'data'=>array('bookingCode'=>$post_data['bookId'])); $res = array('status'=>1,'data'=>array('bookingCode'=>$post_data['bookId']));
$insertArr = array();
$inStatus = ($post_data['status'] == 1)?'1':'0';
if(!empty($invite_ids)){
foreach($invite_ids AS $userId) {
$insertArr[] = array('book_id'=>$book_id,'phone'=>'',
'user_id'=>$userId,'status'=>$inStatus);
}
}
if(!empty($invite_phone)){
foreach($invite_phone AS $key => $phone) {
$phone = preg_replace('/\D/','',$phone);
$insertArr[] = array('book_id'=>$book_id,'user_id'=>'',
'phone'=>$phone,'status'=>$inStatus);
}
}
if(!empty($insertArr)){
$this->db->insert_batch('event_invites',$insertArr);
}
if($post_data['status'] == 1){ if($post_data['status'] == 1){
$bkData = $this->db->query(" $bkData = $this->db->query("
SELECT EVT.event_name,CUST.name,CUST.email,CUST.phone, SELECT EVT.event_name,CUST.name,CUST.email,CUST.phone,
CONCAT(EDATE.date,' ',EDATE.time) AS show_time CONCAT(EDATE.date,' ',EDATE.time) AS show_time
FROM booking AS BK FROM booking AS BK
INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id) INNER JOIN events_bak AS EVT ON (EVT.event_id=BK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id) 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) INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
WHERE BK.bookId='".$post_data['bookId']."' AND EVT.status='1' AND WHERE BK.bookId='".$post_data['bookId']."' AND EVT.status='1' AND
...@@ -1010,6 +1063,20 @@ class Webservice_model extends CI_Model { ...@@ -1010,6 +1063,20 @@ class Webservice_model extends CI_Model {
$template['booking_sms']); $template['booking_sms']);
} }
$this->sendSMS($bkData['phone'],$msgContent); $this->sendSMS($bkData['phone'],$msgContent);
$msg = "Hi, You are invited for the event '".$bkData['event_name']."', and show is on '".$showTime."'. Booking ID ".$post_data['bookId'];
if(!empty($invite_ids)){
foreach($invite_ids AS $userId) {
$usrData = $this->db->get_where('customer',
array('customer_id'=>$userId))->row_array();
$this->sendSMS($usrData['phone'],$msg);
}
}
if(!empty($invite_phone)){
foreach($invite_phone AS $key => $phone) {
$this->sendSMS($phone,$msg);
}
}
} }
} else { } else {
$res = array('status'=>0,'message'=>'Seat booking failed','code'=>'ER37'); $res = array('status'=>0,'message'=>'Seat booking failed','code'=>'ER37');
...@@ -1731,9 +1798,14 @@ class Webservice_model extends CI_Model { ...@@ -1731,9 +1798,14 @@ class Webservice_model extends CI_Model {
} }
public function getCountryData($user_id){ public function getCountryData($user_id){
$ctryData = $this->db->query("SELECT CTRY.* FROM customer AS CUST $ctryData = '';
if(!empty($user_id)){
$sql = "SELECT CTRY.* FROM customer AS CUST
INNER JOIN country AS CTRY ON (CTRY.country_id=CUST.country_id) INNER JOIN country AS CTRY ON (CTRY.country_id=CUST.country_id)
WHERE CUST.customer_id='$user_id'")->row_array(); WHERE CUST.customer_id='$user_id'";
$ctryData = $this->db->query($sql)->row_array();
}
if(empty($ctryData)){ if(empty($ctryData)){
$ctryData = $this->db->query("SELECT * FROM country WHERE language_code='EN'")->row_array(); $ctryData = $this->db->query("SELECT * FROM country WHERE language_code='EN'")->row_array();
} }
......
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