Commit 08d5cc49 by Tobin

Merge branch 'master' into 'dev_production'

Master See merge request !139
parents bf93a835 e2a1085a
......@@ -46,19 +46,21 @@ class Organizer_model extends CI_Model {
try {
$organizer_id = $data['organiser_id'];
$this->db->query("SET SESSION group_concat_max_len = 20000");
$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,venue.id AS venue_id,
GROUP_CONCAT(DISTINCT event_tags.tag_id) AS tag_ids,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time,translator_event.event_name,translator_venue.venue_name,translator_region.region_name
FROM events
INNER JOIN event_date_time ON events.event_id = event_date_time.event_id
INNER JOIN translator_event ON events.event_id = translator_event.event_id
INNER JOIN translator_venue ON events.venue_id = translator_venue.venue_id
INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN translator_region ON venue.region_id = translator_region.region_id
LEFT JOIN event_tags ON events.event_id=event_tags.event_id
WHERE events.provider_id='$organizer_id' AND translator_event.language_code='EN' AND translator_venue.language_code='EN' AND translator_region.language_code='EN' AND events.event_id=".$data['event_id'];
$sql = "SELECT EVT.has_payment,EVT.event_id,EVT.custom_seat_layout,
EVT.seat_pricing,VNE.layout,VNE.layout_details,EVT.max_booking,
VNE.location,VNE.location_lat AS lat,VNE.location_lng AS lng,VNE.id AS venue_id,
GROUP_CONCAT(DISTINCT EVTG.tag_id) AS tag_ids,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',EVDT.id,EVDT.date,EVDT.time)) AS
date_time,TSEVT.event_name,TSVNE.venue_name,TSREG.region_name
FROM events AS EVT
INNER JOIN event_date_time AS EVDT ON EVT.event_id = EVDT.event_id
INNER JOIN translator_event AS TSEVT ON EVT.event_id = TSEVT.event_id
INNER JOIN translator_venue AS TSVNE ON EVT.venue_id = TSVNE.venue_id
INNER JOIN venue AS VNE ON VNE.id = EVT.venue_id
INNER JOIN translator_region AS TSREG ON VNE.region_id = TSREG.region_id
LEFT JOIN event_tags AS EVTG ON EVT.event_id=EVTG.event_id
WHERE EVT.provider_id='$organizer_id' AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSREG.language_code='EN' AND EVT.event_id=".$data['event_id'];
$result = $this->db->query($sql)->row();
if(empty($result->event_id)){
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
......@@ -95,9 +97,8 @@ class Organizer_model extends CI_Model {
}
}
}
$tagArr = array();
$resData = array();
//$resData = array();
$resData['ticket_price'] = $price;
$resData['scheduled_for'] = ($startDate[1] == $endDate[1])?$startDate[1]:$startDate[1].' - '.$endDate[1];
......@@ -129,8 +130,8 @@ class Organizer_model extends CI_Model {
$tagArr = array('tag'=>array('0'=>'tag_EN'));
}
$resData = array_merge($resData,$tagArr);
array_push($resultData, $resData);
$res = array('status'=>1,'data'=>$resultData);
//array_push($resultData, $resData);
$res = array('status'=>1,'data'=>$resData);
} catch(Exception $e) {
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
}
......
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