Skip to content

T
TimeOutAdmin
Commit 8f3541db by Jansa Jose
Options

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

parents fdf69b24 7aae725e
Showing with 181 additions and 82 deletions
application/controllers/Api.php
......@@ -338,7 +338,7 @@ class Api extends CI_Controller {
}
public function paymentGateway($amount='0',$last_id='0',$event_id='0',$booking_id='0',
$custData=array(),$cardData=''){
$custData=array(),$cardData=array()){
$customerName = array();
if(isset($custData->name) && !empty($custData->name)){
$customerName = explode(' ',$custData->name);
......@@ -352,25 +352,58 @@ class Api extends CI_Controller {
$add1 = $add2 = $city = $state = 'Saudi Arabia';
$pincode = '61961';
$holder = 'Basanta Mahunta';
$cardType = 'MasterCard';
$cardNo = '5111111111111118';
$cvv = '100';
$expMonth = '06';
$expYear = '2022';
// if(!empty($cardData)){
// if(isset($cardData['tocken'])){
// } else {
// }
// }
$noCard = 0;
$saveCard = 1;
$savedCard = 0;
if(!empty($cardData)){
if(isset($cardData['cvv']) && !empty($cardData['cvv']) &&
isset($cardData['tocken']) && !empty($cardData['tocken'])){
$savedCard = 1;
} else if(isset($cardData['cvv']) && !empty($cardData['cvv']) ||
isset($cardData['cardType']) && !empty($cardData['cardType']) ||
isset($cardData['cardNumber']) && !empty($cardData['cardNumber']) ||
isset($cardData['expMonthYear']) && !empty($cardData['expMonthYear']) ||
isset($cardData['cardHolderName']) && !empty($cardData['cardHolderName'])){
$cvv = $cardData['cvv'];
$cardNo = $cardData['cardNumber'];
$holder = $cardData['cardHolderName'];
$cardType = $cardData['cardType'];
$expMonth = substr($cardData['expMonthYear'],0,2);
$expYear = '20'.substr($cardData['expMonthYear'],2,2);
$saveCard = (isset($cardData['saveCard'])&&!empty($cardData['saveCard'])&&$cardData['saveCard']==0)?0:1;
} else {
$noCard = 1;
}
} else {
$noCard = 1;
}
$failureUrl = base_url('Api/paymentFailureUrl');
$successUrl = base_url('Api/paymentSuccessUrl');
$pText = '1111110||11111111|'.$last_id.'|'.$amount.'|'.$successUrl.'|'.$failureUrl.'|INTERNET|DD|01|SAR||1111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.'|SA|'.$email.'|'.$phone.'|34|344|34355344||111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.'|SA|'.$phone.'|34|344|34355344||11111100000|'.$cardNo.'|'.$expMonth.'|'.$expYear.'|'.$cvv.'|'.$holder.'|'.$cardType.'||1110000|'.$last_id.'|'.$event_id.'|'.$booking_id.'||1000000|'.$userId;
$pText = '1111110||';
$pText .= '11111111|'.$last_id.'|'.$amount.'|'.$successUrl.'|'.$failureUrl.'|INTERNET|DD|01|SAR||';
$pText .= '1111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
'|SA|'.$email.'|'.$phone.'|34|344|34355344||';
$pText .= '111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
'|SA|'.$phone.'|34|344|34355344||';
if($savedCard == 1){
$pText .= '00010000001|'.$cardData['cvv'].'|'.$cardData['tocken'].'||';
} else {
if($noCard == 0){
$pText .= '11111100000|'.$cardNo.'|'.$expMonth.'|'.$expYear.'|'.$cvv.'|'.$holder.'|'.$cardType.'||';
} else {
// No Card Payment Method Logic.
// $holder = 'Basanta Mahunta'; $cardType = 'MasterCard'; $cardNo = '5111111111111118';
// $cvv = '100'; $expMonth = '06'; $expYear = '2022';
}
}
$pText .= '1110000|'.$last_id.'|'.$event_id.'|'.$booking_id.'||';
if($saveCard == 1){
$pText .= '1000000|'.$userId;
}
$settings = getSettings();
$iv = $settings['merchant_iv'];
......
application/controllers/Booking.php
......@@ -190,6 +190,19 @@ class Booking extends CI_Controller {
}
}
if(isset($data['trans_status'])){
switch ($data['trans_status']) {
case '0': $reportData[$key]['trans_status'] = 'Failed '; break;
case '1': $reportData[$key]['trans_status'] = 'Completed '; break;
case '2': $reportData[$key]['trans_status'] = 'Processing '; break;
case '3': $reportData[$key]['trans_status'] = 'Payment Timeout '; break;
}
}
if(isset($data['has_payment'])){
$reportData[$key]['has_payment'] = ($data['has_payment'] == 1)?'Yes ':'No ';
}
if(!empty($data['Ticket_Details'])){
$tktDtls = json_decode($data['Ticket_Details'],true);
if(isset($tktDtls['price'],$tktDtls['no_ticket'],$tktDtls['total_price']) &&
......@@ -200,8 +213,11 @@ class Booking extends CI_Controller {
$pDiv .= $tktDtls['price'].' * '.$tktDtls['no_ticket'].'(Seats) = '.$tktDtls['total_price'];
$reportData[$key]['Ticket_Details'] = $pDiv;
} else {
$reportData[$key]['Ticket_Details'] = '';
}
} else {
$reportData[$key]['Ticket_Details'] = '';
}
}
return $reportData;
......
application/controllers/Event.php
......@@ -109,10 +109,10 @@ class Event extends CI_Controller {
'weekend_price'=>$_POST['weekend_price'][$i]);
}
$_POST['custom_seat_layout'] = json_encode($cstmSeatLayout);
} else {
} else if (isset($_POST['price']) && !empty($_POST['price']) &&
isset($_POST['capacity']) && !empty($_POST['capacity'])){
$seatPriceArr = array('price'=>$_POST['price'],'capacity'=>$_POST['capacity']);
foreach($language AS $lang) {
$details = $_POST['price_details_EN'];
if(isset($_POST['price_details_'.$lang]) && !empty($_POST['price_details_'.$lang])){
$details = $_POST['price_details_'.$lang];
}
......@@ -179,6 +179,7 @@ class Event extends CI_Controller {
}
// START - NEW EVENT NOTIFICATION MAIL \\
if($this->session->userdata['user_type'] != 1){
$settings = getSettings();
$this->load->model('Api_model');
......@@ -188,6 +189,7 @@ class Event extends CI_Controller {
New Event Created, event name: <strong>".$_POST['event_name_en']."</strong>. Event URL : ".base_url()."eventdetail?event_id=$event_id
</body></html>";
$this->Api_model->send_mail($subject,$emailId,$message);
}
// END - NEW EVENT NOTIFICATION MAIL \\
$flashMsg['class'] = 'success';
......@@ -275,7 +277,6 @@ class Event extends CI_Controller {
}
$_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?'1':'0';
$_POST['seat_pricing'] = $_POST['custom_seat_layout'] = '';
if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){
$cstmSeatLayout = array();
......@@ -289,10 +290,10 @@ class Event extends CI_Controller {
'weekend_price'=>$_POST['weekend_price'][$i]);
}
$_POST['custom_seat_layout'] = json_encode($cstmSeatLayout);
} else {
} else if(isset($_POST['price']) && !empty($_POST['price']) &&
isset($_POST['capacity']) && !empty($_POST['capacity'])){
$seatPriceArr = array('price'=>$_POST['price'],'capacity'=>$_POST['capacity']);
foreach($language AS $lang) {
$details = $_POST['price_details_EN'];
if(isset($_POST['price_details_'.$lang]) && !empty($_POST['price_details_'.$lang])){
$details = $_POST['price_details_'.$lang];
}
......
application/controllers/Webservice.php
......@@ -29,8 +29,8 @@ class Webservice extends CI_Controller {
if($method == 'profile') {
$data = $_POST;
}
if (isset(apache_request_headers()['Auth'])) {
$this->auth_token = apache_request_headers()['Auth'];
if (isset(apache_request_headers()['Auth']) || isset(apache_request_headers()['auth'])) {
$this->auth_token = (isset(apache_request_headers()['Auth']))?apache_request_headers()['Auth']:apache_request_headers()['auth'];
$data['auth_token'] = $this->auth_token;
}
$res = $this->Validation_app_model->validation_check($method, $data);
......
application/controllers/bookingStatusCrone.php
<?php
date_default_timezone_set("Asia/Riyadh");
$conn = mysqli_connect("localhost","nuvento_timeout","Golden_123","nuvento_timeout");
if($conn->connect_error){
return;
}
$todate = date('Y-m-d');
$date_time = date('Y-m-d H:i:s',strtotime('- 15 minutes'));
$sql = "UPDATE booking
INNER JOIN event_date_time ON event_date_time.id = booking.event_date_id
SET booking.status = '2'
WHERE event_date_time.date < '$todate' and event_date_time.time < now() and booking.status='1'";
WHERE event_date_time.date < '$todate' and event_date_time.time < 'now()' and booking.status='1'";
$result = mysqli_query($conn, $sql);
$date_time = date('Y-m-d H:i:s',strtotime('- 15 minutes'));
$sql = "UPDATE booking
INNER JOIN transaction ON transaction.booking_id = booking.bookId
SET booking.status = '5',transaction.status='3'
WHERE transaction.datetime > '$date_time'";
WHERE transaction.datetime<'$date_time'";
mysqli_query($conn, $sql);
$conn->close();
?>
application/controllers/notificationRemainder.php
<?php
$conn = mysqli_connect("localhost","nuvento_timeout","Golden_123","nuvento_timeout");
if($conn->connect_error){
date_default_timezone_set("Asia/Riyadh");
$conn = mysqli_connect("localhost","nuvento_timeout","Golden_123","nuvento_timeout");
if($conn->connect_error){
return;
}
$result = mysqli_query($conn, "SELECT app_id FROM setting");
}
$result = mysqli_query($conn, "SELECT app_id FROM setting");
if(mysqli_num_rows($result) <= 0 || empty($row = mysqli_fetch_assoc($result)) ||
if(mysqli_num_rows($result) <= 0 || empty($row = mysqli_fetch_assoc($result)) ||
!isset($row['app_id']) || empty($key = $row['app_id'])){
return;
}
}
$date = date('Y-m-d',strtotime(date("Y-m-d H:i:s")." +30 minutes"));
$sTime = date('H:i',strtotime(date("Y-m-d H:i:s")." +30 minutes"));
$eTime = date("H:i",strtotime(date("Y-m-d H:i:s")." +31 minutes"));
$date = date('Y-m-d',strtotime(date("Y-m-d H:i:s")." +30 minutes"));
$sTime = date('H:i',strtotime(date("Y-m-d H:i:s")." +30 minutes"));
$eTime = date("H:i",strtotime(date("Y-m-d H:i:s")." +31 minutes"));
$sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,EVT.event_name_en
$sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,EVT.event_name
FROM booking AS BOK
INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
......@@ -24,12 +25,12 @@ $sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,E
WHERE EVT.status='1' AND BOK.status='1' AND USR.status='1' AND EDATE.status='1' AND
EDATE.date='$date' AND EDATE.time<='$eTime' AND EDATE.time>='$sTime'
GROUP BY BOK.id,CUST.customer_id";
$result = mysqli_query($conn, $sql);
$result = mysqli_query($conn, $sql);
if(mysqli_num_rows($result) > 0) {
if(mysqli_num_rows($result) > 0) {
while($row = mysqli_fetch_assoc($result)) {
$data = "{ \"notification\": { \"title\": \"".$row['event_name_en']."\", \"text\": \"Booking Reminder\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"booking_id\" : \"".$row['bookId']."\", \"trip_status\" : 0}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$row['fcm_token']."\"}";
$data = "{ \"notification\": { \"title\": \"".$row['event_name']."\", \"text\": \"Booking Reminder\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"booking_id\" : \"".$row['bookId']."\", \"trip_status\" : 0}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$row['fcm_token']."\"}";
$ch = curl_init("https://fcm.googleapis.com/fcm/send");
$header = array('Content-Type: application/json', 'Authorization: key='.$key);
......@@ -43,7 +44,6 @@ if(mysqli_num_rows($result) > 0) {
curl_close($ch);
}
mysqli_query($conn, "INSERT INTO crontab_notif VALUES ('',".date('Y-m-d').",".date('H:i:s').")");
}
$conn->close();
}
$conn->close();
?>
application/helpers/generals_helper.php
......@@ -156,25 +156,24 @@
case 1:
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4),
'CMS'=>array(1,2,3,4),'Event'=>array(1,2,3,4),'Organizer'=>array(1,2,3,4),
'Checker'=>array(1,2,3,4),'Category'=>array(1,2,3,4),
'Venue'=>array(1,2,3,4),'Staff'=>array(1,2,3,4),'City'=>array(1,2,3,4),
'Customer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),
'Commission'=>array(1,2,3,4),'Notification'=>array(1,2,3,4),
'Settings'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4),
'Country'=>array(1,2,3,4));
'Checker'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Staff'=>array(1,2,3,4),
'Venue'=>array(1,2,3,4),'City'=>array(1,2,3,4),'Commission'=>array(1,2,3,4),
'Customer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),'Settings'=>array(1,2,3,4),
'Notification'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4),
'Country'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4));
break;
case 2:
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(),'Host'=>array(1),
'City'=>array(),'Category'=>array(),'Venue'=>array(1,2,3,4),
'City'=>array(),'Category'=>array(),'Promocode'=>array(1,2,3,4),
'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(),
'Booking'=>array(1,2,3,4),'Promocode'=>array(1,2,3,4));
'Booking'=>array(1,2,3,4),'Venue'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4));
break;
case 4:
$menus = array('Dashboard'=>array(1,2,3,4),'Tag'=>array(1,2,3,4),'Host'=>array(1,2,3,4),
'City'=>array(1,2,3,4),'Category'=>array(1,2,3,4),'Venue'=>array(1,2,3,4),
'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),
'Organizer'=>array(1,2,3,4),'Customer'=>array(1,2,3,4),
'Booking'=>array(1,2,3,4),'Notification'=>array(1,2,3,4));
'Event'=>array(1,2,3,4),'Checker'=>array(1,2,3,4),'Customer'=>array(1,2,3,4),
'Organizer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),
'Notification'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4));
break;
}
return $menus;
......@@ -305,6 +304,27 @@
$langArr['region_name'.$code] = $name;
}
break;
case 'HCTY':
$cond .= "hotel_city_id='$id'";
$sql = "SELECT * FROM translator_hotel_city WHERE $cond $orderBy";
$resp = $thisObj->db->query($sql)->result_array();
$regName = '';
if(empty($lngCode)){
$languages = getLanguages();
foreach ($languages AS $lang) {
$langArr['hotel_city_name_'.$lang] = '';
}
} else {
$langArr['hotel_city_name'] = '';
}
foreach ($resp AS $data) {
$code = (empty($lngCode))?'_'.$data['language_code']:'';
$regName = ($code=='en')?$data['hotel_city_name']:'';
$name = (!empty($data['hotel_city_name']))?$data['hotel_city_name']:$regName;
$langArr['hotel_city_name'.$code] = $name;
}
break;
case 'TAG':
$cond .= "tag_id='$id'";
$sql = "SELECT * FROM translator_tag WHERE $cond $orderBy";
......
application/models/Api_model.php
......@@ -54,7 +54,7 @@ class Api_model extends CI_Model {
$res = array('status'=>0,'message'=>'Already have an account with email id and phone no. Please login','code'=>'ER12');
} else if($res_count->email == $data['email_id']){
$res = array('status'=>0,'message'=>'Email id already exists','code'=>'ER09');
} else if($res_count->phone == $data['phone']) {
} else if(strpos($res_count->phone,$data['phone']) !== false) {
$res = array('status'=>0,'message'=>'Phone no already exists','code'=>'ER10');
}
} else {
......@@ -703,7 +703,7 @@ class Api_model extends CI_Model {
FROM events
INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id
WHERE events.status = 1 AND
WHERE events.status = 1 AND event_date_time.status='1' AND
event_date_time.date >= DATE_FORMAT(NOW(),'%Y-%m-%d') $locCond
GROUP BY events.event_id")->num_rows();
if($count > 0) {
......@@ -717,7 +717,7 @@ class Api_model extends CI_Model {
$page_limit = ($page - 1) * $per_page;
if($count > $page_limit) {
$this->db->query("SET SESSION group_concat_max_len = 20000");
$this->db->query("SET SESSION group_concat_max_len = 200000");
$sql = "SELECT events.event_id,venue.location,events.seat_pricing,venue.id AS venue_id,
events.custom_seat_layout,venue.layout,venue.layout_details,
event_gallery.media_url,favourite.status AS fav_status,
......@@ -732,7 +732,7 @@ class Api_model extends CI_Model {
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
WHERE events.status = 1 AND
WHERE events.status = 1 AND event_date_time.status='1' AND
event_date_time.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') $locCond
GROUP BY events.event_id
LIMIT $page_limit,$per_page";
......@@ -848,7 +848,7 @@ class Api_model extends CI_Model {
$cat_id = $data['cat_id'];
$city_id = $data['city'];
$category = $this->db->where('cat_id',$cat_id)->get('event_category')->row();
$this->db->query("SET SESSION group_concat_max_len = 20000");
$this->db->query("SET SESSION group_concat_max_len = 200000");
$sql = "SELECT events.event_id,events.seat_pricing,events.custom_seat_layout,venue.layout,
venue.layout_details,event_gallery.media_url,GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time
FROM events
......@@ -857,7 +857,8 @@ class Api_model extends CI_Model {
event_date_time.date>=DATE_FORMAT(NOW(),'%Y-%m-%d')
LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND
event_gallery.media_type=0
WHERE events.status=1 AND events.category_id='$cat_id' AND venue.region_id='$city_id'
WHERE events.status=1 AND events.category_id='$cat_id' AND
event_date_time.status='1' AND venue.region_id='$city_id'
GROUP BY events.event_id";
$result = $this->db->query($sql)->result();
......@@ -933,7 +934,7 @@ class Api_model extends CI_Model {
}
}
$this->db->query("SET SESSION group_concat_max_len = 20000");
$this->db->query("SET SESSION group_concat_max_len = 200000");
$sql = "SELECT events.has_payment,events.event_id,events.seat_pricing,events.custom_seat_layout,
events.seat_pricing,venue.layout,venue.layout_details,events.max_booking,
venue.location,venue.location_lat AS lat,venue.location_lng AS lng,
......@@ -949,7 +950,7 @@ class Api_model extends CI_Model {
LEFT JOIN favourite ON favourite.event_id=events.event_id AND favourite.status=1 AND favourite.user_id='$user_id'
LEFT JOIN event_tags ON events.event_id=event_tags.event_id
INNER JOIN host_categories ON venue.host_cat_id=host_categories.host_cat_id
WHERE events.event_id='$event_id'
WHERE events.event_id='$event_id' AND event_date_time.status='1'
GROUP BY events.event_id, event_date_time.event_id";
$result = $this->db->query($sql)->result();
......@@ -1095,7 +1096,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();
$sql = "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 AND event_date_time.status='1' $where
GROUP BY events.event_id";
$count = $this->db->query()->num_rows($sql);
if(isset($data['venue_id']) && !empty($data['venue_id'])) {
$where .= " AND locality.id ='".$data['venue_id']."'";
......@@ -1114,7 +1119,7 @@ class Api_model extends CI_Model {
$page_limit = ($page - 1) * $per_page;
if($count > $page_limit) {
$this->db->query("SET SESSION group_concat_max_len = 20000");
$this->db->query("SET SESSION group_concat_max_len = 200000");
$result = $this->db->query("
SELECT events.event_id,venue.id AS venue_id,venue.location,events.seat_pricing,
venue.layout,venue.layout_details,events.custom_seat_layout,
......@@ -1130,7 +1135,8 @@ class Api_model extends CI_Model {
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 AND event_tags.status=1
WHERE events.status=1 AND event_date_time.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') $where
WHERE events.status=1 AND event_date_time.status='1' AND
event_date_time.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') $where
GROUP BY events.event_id
ORDER BY events.event_id DESC LIMIT $page_limit,$per_page")->result();
......@@ -1404,6 +1410,7 @@ class Api_model extends CI_Model {
public function save_organizer($data){
try{
$data['phone'] = preg_replace('/\D/', '', $data['phone']);
$userNameChk = $this->db->query("SELECT * FROM users
WHERE user_type='2' AND status!='2' AND
username='".$data['email_id']."'");
......@@ -1424,7 +1431,7 @@ class Api_model extends CI_Model {
$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
PRV.phone='".$data['phone']."'");
PRV.phone LIKE '%".$data['phone']."%'");
if(!empty($phoneChk) && $phoneChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Phone Number Already Exist','code'=>'ER09');
return $res;
......@@ -1514,7 +1521,7 @@ class Api_model extends CI_Model {
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
INNER JOIN host_categories AS HST ON (VEN.host_cat_id=HST.host_cat_id)
WHERE EVT.event_id='$event_id' AND EDATE.id='$evtTimeId' AND
WHERE EVT.event_id='$event_id' AND EDATE.id='$evtTimeId' AND EDATE.status='1' AND
EDATE.date >= DATE_FORMAT(NOW(),'%Y-%m-%d')";
$evtSql = $this->db->query($sql);
......@@ -1531,7 +1538,7 @@ class Api_model extends CI_Model {
FROM booking AS BOK
INNER JOIN event_date_time AS EDATE ON (BOK.event_date_id=EDATE.id)
WHERE BOK.event_id='$event_id' AND BOK.customer_id='$user_id' AND
EDATE.id='$evtTimeId' AND BOK.status IN (1,2)";
EDATE.id='$evtTimeId' AND EDATE.status='1' AND BOK.status IN (1,2)";
$result = $this->db->query($sql)->row_array();
$usrBooked = (!empty($result))?$result['bookCount']:0;
......@@ -1554,7 +1561,7 @@ class Api_model extends CI_Model {
$sql = "SELECT BOOK.no_of_ticket,BOOK.ticket_details
FROM booking AS BOOK
INNER JOIN event_date_time AS EDATE ON (BOOK.event_date_id=EDATE.id)
WHERE BOOK.event_id='$event_id' AND BOOK.event_date_id='$evtTimeId'";
WHERE EDATE.status='1' AND BOOK.event_id='$event_id' AND BOOK.event_date_id='$evtTimeId'";
if(!empty($result = $this->db->query($sql)->result_array())){
foreach($result AS $value) {
......@@ -1765,7 +1772,6 @@ class Api_model extends CI_Model {
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
WHERE EVT.provider_id=CHK.provider_id AND BOOK.status='1'";
pr($sql);
$count = $this->db->query($sql)->num_rows();
if($count > 0) {
......
application/models/Booking_model.php
......@@ -12,11 +12,11 @@ class Booking_model extends CI_Model {
$sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name AS customer_name,EVT.provider_id,
CUST.phone AS customer_phone,CUST.email AS customer_email,CUST.gender,EVT.venue_id,
CUST.dob,CUST.city,CUST.profile_image,BOK.event_id,BOK.bookId,BOK.event_date_id,
CUST.dob,CUST.profile_city,CUST.profile_image,BOK.event_id,BOK.bookId,BOK.event_date_id,
BOK.qrcode,BOK.no_of_ticket,BOK.ticket_details,BOK.amount,EVT.has_payment,
BOK.reserved_by,BOK.status AS book_status,EVT.category_id,EVT.max_booking,
EVT.seat_pricing,EVT.custom_seat_layout,EVT.status AS evt_status,EDT.time,
HCAT.host_category,HCAT.show_layout,EDT.date,PRV.name AS provider_name,
HCAT.host_category,HCAT.show_layout,EDT.date,PRV.name AS provider_name,BOK.booking_date,
PRV.email AS provider_email,PRV.phone AS provider_phone,VEN.location,
PRV.profile_image AS provider_image,TRANS.transaction_id,TRANS.status AS trans_status
FROM booking AS BOK
......@@ -114,11 +114,10 @@ class Booking_model extends CI_Model {
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
INNER JOIN region AS REG ON (REG.id=VEN.region_id)
LEFT JOIN region AS REG ON (REG.id=VEN.region_id)
LEFT JOIN provider AS PRV ON (PRV.provider_id=EVT.provider_id)
LEFT JOIN transaction AS TRANS ON (TRANS.booking_id=BOK.bookId)
".$where_clause."
GROUP BY Booking_ID
ORDER BY BOK.id ASC";
$reportData = $this->db->query($sql);
......
application/models/Event_model.php
......@@ -209,7 +209,7 @@ class Event_model extends CI_Model {
if(empty($event_id) || empty($eventData)){
return 0;
}
$this->db->delete('event_date_time',array('event_id'=>$event_id));
$this->db->update('event_date_time',array('status'=>'0'),array('event_id'=>$event_id));
$status = $this->db->insert_batch('event_date_time',$eventData);
return $status;
}
......
application/models/Validation_app_model.php
......@@ -47,8 +47,7 @@ class Validation_app_model extends CI_Model {
'customer_id'=>array('required'=>array('code'=>'ER29', 'message'=>'Customer id is null or empty')),
'event_date_id'=>array('required'=>array('code'=>'ER30', 'message'=>'Event date id is null or empty')),
'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')),
'amount'=>array('required'=>array('code'=>'ER33', 'message'=>'Amount 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')),),
'update_fcm_token'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
......
application/views/Booking/generate.php
......@@ -126,6 +126,7 @@
'BOK.ticket_details AS Ticket_Details'=>'Ticked Details',
'BOK.amount AS Amount'=>'Booking Amount',
'BOK.reserved_by AS Reserved_By'=>'Reserved By',
'BOK.booking_date AS Booking_Time'=>'Booking Time',
'BOK.status AS Book_Status'=>'Booking Status'
)
),
......@@ -141,7 +142,7 @@
array('CUST.name AS Customer_Name'=>'Customer Name',
'CUST.phone AS Customer_Phone'=>'Customer Phone',
'CUST.email AS Customer_Email'=>'Customer Email',
'CUST.city AS Customer_City'=>'Customer City'
'CUST.profile_city AS Customer_City'=>'Customer City'
)
),
array('name' => 'Provider Details',
......
application/views/Booking/viewBookingDetails.php
......@@ -124,6 +124,18 @@
<div class="row">
<div class="col-md-2">
Booking Time
</div>
<div class="col-md-1" style="padding-left: 52px;">
:
</div>
<div class="col-md-9">
<?= $bookData->booking_date ?>
</div>
</div>
<div class="row">
<div class="col-md-2">
Event Name
</div>
<div class="col-md-1" style="padding-left: 52px;">
......@@ -206,6 +218,17 @@
</div>
</div>
<div class="col-md-6">
<div class="row">
<div class="col-md-5">
Customer City
</div>
<div class="col-md-1">
:
</div>
<div class="col-md-5">
<?= $bookData->profile_city ?>
</div>
</div>
</div>
</div>
......
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