Skip to content

T
TimeOutAdmin
Commit f805fac4 by Tobin
Options

dc

parent 10a8a4bd
Showing with 187 additions and 158 deletions
application/controllers/Notification.php
...@@ -122,7 +122,7 @@ class Notification extends CI_Controller { ...@@ -122,7 +122,7 @@ class Notification extends CI_Controller {
foreach($users AS $user){ foreach($users AS $user){
$userData = array('id'=>$event_data->event_id, $userData = array('id'=>$event_data->event_id,
'title'=>$event_data->event_name_en, 'title'=>$event_data->event_name_EN,
'message'=>$message); 'message'=>$message);
$this->push_sent_cancel('1',$user['fcm_token'],$userData); $this->push_sent_cancel('1',$user['fcm_token'],$userData);
} }
......
application/controllers/Webservice.php
...@@ -98,18 +98,17 @@ class Webservice extends CI_Controller { ...@@ -98,18 +98,17 @@ class Webservice extends CI_Controller {
} }
} }
public function events_details($event_id = null) { public function events_details($event_id = '') {
$data['event_id'] = $_GET['event_id']; if(empty($event_id) && (!isset($_GET['event_id']) || empty($event_id = $_GET['event_id']))){
$data['auth_token'] = $this->auth_token;
$data['event_date_id'] = '';
if($data['event_id'] == null) {
$this->errorResponse("ER16","Event id is null or empty");die; $this->errorResponse("ER16","Event id is null or empty");die;
} }
if (isset($_GET['event_date_id']) && !empty($_GET['event_date_id'])){ $data['event_id'] = $event_id;
$data['event_date_id'] = $_GET['event_date_id']; $data['auth_token'] = $this->auth_token;
} $data['event_date_id'] = (isset($_GET['event_date_id']) && !empty($_GET['event_date_id']))?
$_GET['event_date_id']:'';
$res = $this->Webservice_model->event($data); $res = $this->Webservice_model->event($data);
if($res['status']!=0){ if($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']);
......
application/models/Event_model.php
...@@ -205,6 +205,15 @@ class Event_model extends CI_Model { ...@@ -205,6 +205,15 @@ class Event_model extends CI_Model {
return $status; return $status;
} }
public function updateEventDateTime($event_id = '', $eventData = array()){
if(empty($event_id) || empty($eventData)){
return 0;
}
$this->db->delete('event_date_time',array('event_id'=>$event_id));
$status = $this->db->insert_batch('event_date_time',$eventData);
return $status;
}
public function createEventMedia($eventData = array()){ public function createEventMedia($eventData = array()){
if(empty($eventData)){ if(empty($eventData)){
return 0; return 0;
......
application/models/Notification_model.php
...@@ -26,11 +26,11 @@ class Notification_model extends CI_Model { ...@@ -26,11 +26,11 @@ class Notification_model extends CI_Model {
return 0; return 0;
} }
$cond = ($view != '')?" USR.status IN ($view)":" USR.status!='2'"; $cond = ($view != '')?" USR.status IN ($view)":" USR.status!='2'";
$cond .= ($cities != '')?" AND CUST.profile_city IN ($cities)":""; $cond .= ($cities != '')?" AND CUST.city IN ($cities)":"";
$cityData = $this->db->query("SELECT CUST.* FROM customer AS CUST $cityData = $this->db->query("SELECT CUST.* FROM customer AS CUST
INNER JOIN users AS USR ON (USR.id=CUST.customer_id) INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
WHERE ".$cond); WHERE ".$cond);
if(!empty($cityData)){ if(!empty($cityData)){
return $cityData->result_array(); return $cityData->result_array();
......
application/models/Webservice_model.php
...@@ -241,6 +241,7 @@ class Webservice_model extends CI_Model { ...@@ -241,6 +241,7 @@ class Webservice_model extends CI_Model {
$where = ''; $where = '';
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$rate = (!empty($countryData['conversion_rate']))?$countryData['conversion_rate']:1;
$sql = "SELECT region.id FROM customer $sql = "SELECT region.id FROM customer
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'";
...@@ -402,14 +403,14 @@ class Webservice_model extends CI_Model { ...@@ -402,14 +403,14 @@ class Webservice_model extends CI_Model {
if($rs->layout!=''){ if($rs->layout!=''){
if($rs->custom_seat_layout!=''){ if($rs->custom_seat_layout!=''){
$pricelist = json_decode($rs->custom_seat_layout, TRUE); $pricelist = json_decode($rs->custom_seat_layout, TRUE);
$price = min(array_column($pricelist, 'price')); $price = $rate*min(array_column($pricelist, 'price'));
} else { } else {
$pricelist = json_decode($rs->layout_details, TRUE); $pricelist = json_decode($rs->layout_details, TRUE);
$price = min(array_column($pricelist, 'price')); $price = $rate*min(array_column($pricelist, 'price'));
} }
} else { } else {
$pricelist = json_decode($rs->seat_pricing, TRUE); $pricelist = json_decode($rs->seat_pricing, TRUE);
$price = $pricelist['price']; $price = $rate*$pricelist['price'];
} }
$transData = array('event'=>'','category'=>'','venue'=>''); $transData = array('event'=>'','category'=>'','venue'=>'');
...@@ -436,7 +437,9 @@ class Webservice_model extends CI_Model { ...@@ -436,7 +437,9 @@ class Webservice_model extends CI_Model {
'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,
'latitude'=>$rs->latitude, 'latitude'=>$rs->latitude,
'longitude'=>$rs->longitude 'longitude'=>$rs->longitude,
'currency'=>$countryData['currency'],
'currency_symbol'=>$countryData['currency_symbol']
); );
array_push($response, $resData); array_push($response, $resData);
} }
...@@ -493,56 +496,68 @@ class Webservice_model extends CI_Model { ...@@ -493,56 +496,68 @@ class Webservice_model extends CI_Model {
if($user_id > 0) { if($user_id > 0) {
$event_id = $data['event_id']; $event_id = $data['event_id'];
$cTime = date("H:i", strtotime('+15 minutes')); $cTime = date("H:i", strtotime('+15 minutes'));
$countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code'];
$rate = (!empty($countryData['conversion_rate']))?$countryData['conversion_rate']:1;
$this->db->query("SET SESSION group_concat_max_len = 20000"); $this->db->query("SET SESSION group_concat_max_len = 20000");
$rs = $this->db->query(" $sql = "SELECT host_categories.show_layout AS is_layout,venue.id AS venue_id,
SELECT host_categories.show_layout AS is_layout,events.has_payment AS is_payment_required, events.has_payment AS is_payment_required,favourite.is_favorite AS is_favorite,
favourite.is_favorite AS is_favorite,events.event_id, events.event_name, events.seat_pricing,events.custom_seat_layout,events.event_id,
events.event_name_ar,events.event_description AS event_description, venue.layout, venue.layout_details,venue.location,venue.location AS address,
events.event_description_ar,events.seat_pricing, events.custom_seat_layout, venue.location_lat AS lat,venue.location_lng AS lng,events.max_booking,
venue.layout, venue.layout_details,venue.venue_name,venue.venue_details, GROUP_CONCAT(DISTINCT event_gallery.media_url) AS media_url,
venue.location,venue.location_lat AS lat,venue.location_lng AS lng, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,
venue.venue_name AS address_name,venue.venue_name_ar AS address_name_ar, event_date_time.time)) AS date_time
venue.location AS address, events.max_booking, FROM events
GROUP_CONCAT(DISTINCT tags.tag_name) AS tag, INNER JOIN venue ON venue.id=events.venue_id
GROUP_CONCAT(DISTINCT tags.tag_name_ar) AS tag_ar, INNER JOIN event_date_time ON events.event_id=event_date_time.event_id
GROUP_CONCAT(DISTINCT `event_gallery`.`media_url`) AS media_url, INNER JOIN host_categories ON venue.host_cat_id = host_categories.host_cat_id
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date, LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND
event_date_time.time)) AS date_time event_gallery.status != 0
FROM events LEFT JOIN favourite ON favourite.event_id = events.event_id AND
INNER JOIN event_date_time ON events.event_id=event_date_time.event_id favourite.user_id=$user_id AND favourite.status = 1
INNER JOIN venue ON venue.id=events.venue_id WHERE event_date_time.date>='".date('Y-m-d')."' AND events.event_id=$event_id
LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND GROUP BY events.event_id, event_date_time.event_id";
event_gallery.status != 0 $rs = $this->db->query($sql)->row();
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 if(count($rs) > 0){
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 review ON events.event_id = review.event_id
INNER JOIN host_categories ON venue.host_cat_id = host_categories.host_cat_id
WHERE event_date_time.date>='".date('Y-m-d')."' AND events.event_id=$event_id
GROUP BY events.event_id, event_date_time.event_id")->row();
if(count($rs)>0){
$event_layout = ''; $event_layout = '';
$colorData = array(); $colorData = array();
$resultData = array(); $resultData = array();
$sql = "SELECT AVG(review.rate) AS rate $sql = "SELECT AVG(review.rate) AS rate FROM review WHERE event_id=$event_id";
FROM review WHERE event_id=$event_id";
$rating = $this->db->query($sql)->row_array(); $rating = $this->db->query($sql)->row_array();
$rate = isset($rating['rate'])&&!empty($rating['rate'])? $rate = isset($rating['rate'])&&!empty($rating['rate'])?round($rating['rate'],1):'0.0';
round($rating['rate'],1):'0.0';
$sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking $sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking
WHERE status IN (1,2) AND event_id=$event_id"; WHERE status IN (1,2) AND event_id=$event_id";
$atten = $this->db->query($sql)->row_array(); $atten = $this->db->query($sql)->row_array();
$atte = isset($atten['attend'])&&!empty($atten['attend'])? $atte = isset($atten['attend'])&&!empty($atten['attend'])?$atten['attend']:'0';
$atten['attend']:'0';
if($rs->layout!=''){ if(!empty($rs->layout)){
if($rs->custom_seat_layout!=''){ if(!empty($rs->custom_seat_layout)){
$event_layout = $rs->custom_seat_layout; $seatLayout = $rs->custom_seat_layout;
if(!empty($seatLayout) && !empty($seatLayout = json_decode($seatLayout,true))){
foreach ($seatLayout AS $key => $seat) {
$seatLayout[$key]['price'] = $seat['price']*$rate;
}
}
$event_layout = json_encode($seatLayout);
} else { } else {
$event_layout = $rs->layout_details; $seatLayout = $rs->layout_details;
if(!empty($seatLayout) && !empty($seatLayout = json_decode($seatLayout,true))){
foreach ($seatLayout AS $key => $seat) {
$seatLayout[$key]['price'] = $seat['price']*$rate;
}
}
$event_layout = json_encode($seatLayout);
} }
} else { } else {
$event_layout = $rs->seat_pricing; $seatLayout = $rs->seat_pricing;
if(!empty($seatLayout) && !empty($seatLayout = json_decode($seatLayout,true))){
$seatLayout['price'] = $seatLayout['price']*$rate;
}
$event_layout = json_encode($seatLayout);
} }
$dates = explode(',', $rs->date_time); $dates = explode(',', $rs->date_time);
$time_spec = array(); $time_spec = array();
...@@ -560,26 +575,34 @@ class Webservice_model extends CI_Model { ...@@ -560,26 +575,34 @@ class Webservice_model extends CI_Model {
foreach ($data_array as $key => $value) { foreach ($data_array as $key => $value) {
$date_list[] = array('date'=>$key, 'time'=>$value); $date_list[] = array('date'=>$key, 'time'=>$value);
} }
$lang = $this->getCountryData($user_id); $custDesc = '';
if($rs->is_layout == 1 && !empty($pData = json_decode($rs->seat_pricing, TRUE))){ if($rs->is_layout == 1 && !empty($pData = json_decode($rs->seat_pricing, TRUE))){
if($lang == 'en'){ $cSymbol = $countryData['currency_symbol'];
$rs->event_description .= '<p>'.$pData['price_details'].' '.'(SAR '.$pData['price'].')'.'</p>'; if(isset($pData['price_details_'.$lang]) && !empty($pData['price_details_'.$lang])){
} $custDesc = '<p>'.$pData['price_details_'.$lang].' ('.$cSymbol.' '.$pData['price']*$rate.')</p>';
if($lang == 'ar'){
$rs->event_description_ar .= '<p>'.$pData['price_details_ar'].' '.'(SAR '.$pData['price'].')'.'</p>';
} }
} }
$event_layouts = []; $event_layouts = [];
if(isset($data['event_date_id']) && !empty($eDateId = $data['event_date_id'])){ if(isset($data['event_date_id']) && !empty($eDateId = $data['event_date_id'])){
$param = array('user_id'=>$user_id,'event_id'=>$event_id,'time_id'=>$eDateId); $param = array('user_id'=>$user_id,'event_id'=>$event_id,'time_id'=>$eDateId);
$event_layouts = $this->checkSeatAvailability($param); $event_layouts = $this->checkSeatAvailability($param);
} }
$tags = ($lang == 'en')? explode(',', $rs->tag) : explode(',', $rs->tag_ar);
$transData = array('event'=>'','description'=>'','category'=>'','venue'=>'');
if(!empty($lanTrans = langTranslator($rs->event_id,'EVT',$lang))){
$transData['event'] = $lanTrans['event_name'];
$transData['description'] = $lanTrans['event_description'].$custDesc;
}
if(!empty($lanTrans = langTranslator($rs->venue_id,'VEN',$lang))){
$transData['venue'] = $lanTrans['venue_name'];
}
$media_url = explode(',', $rs->media_url); $media_url = explode(',', $rs->media_url);
$resData = array( $resData = array(
'event_id'=>$rs->event_id, 'event_id'=>$rs->event_id,
'name'=>($lang == 'en')?$rs->event_name:$rs->event_name_ar, 'name'=>$transData['event'],
'description'=>($lang == 'en')?$rs->event_description:$rs->event_description_ar, 'description'=>$transData['description'],
'rating'=>$rate, 'rating'=>$rate,
'total_attendees'=>$atte, 'total_attendees'=>$atte,
'layout_image'=>$rs->layout, 'layout_image'=>$rs->layout,
...@@ -592,7 +615,7 @@ class Webservice_model extends CI_Model { ...@@ -592,7 +615,7 @@ class Webservice_model extends CI_Model {
'date_list'=>$date_list, 'date_list'=>$date_list,
'classes'=>$event_layouts, 'classes'=>$event_layouts,
'latitude'=>$rs->lat, 'latitude'=>$rs->lat,
'address_name'=>($lang == 'en')?$rs->address_name:$rs->address_name_ar, 'address_name'=>$transData['venue'],
'address'=>$rs->address, 'address'=>$rs->address,
'longitude'=>$rs->lng 'longitude'=>$rs->lng
); );
...@@ -1122,16 +1145,19 @@ class Webservice_model extends CI_Model { ...@@ -1122,16 +1145,19 @@ 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) {
$lang = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
if($lang == 'ar') { $lang = $countryData['language_code'];
$cat_field = 'event_category.category_ar AS category'; $rate = (!empty($countryData['conversion_rate']))?$countryData['conversion_rate']:1;
$cat_field .= ',events.event_name_ar AS event_name';
} else {
$cat_field = 'event_category.category_en AS category';
$cat_field .= ',events.event_name AS event_name';
}
$result = $this->db->query(" $result = $this->db->query("
SELECT events.event_id, event_gallery.media_url, (SELECT COUNT(booking.id) FROM booking WHERE booking.event_id = events.event_id) AS attendees, event_category.category AS category, events.event_name AS event_name, CAST(AVG (review.rate) AS DECIMAL (12, 1)) AS rating, venue.location, IF(favourite.is_favorite = 0, 'false', 'true') AS is_favorite, IF(events.provider_id = 0, 'false', 'true') AS is_editors_choice, events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details, GROUP_CONCAT(DISTINCT CONCAT_WS('#', event_date_time.id, event_date_time.date, event_date_time.time)) AS date_time SELECT (SELECT COUNT(booking.id) FROM booking WHERE booking.event_id=events.event_id) AS
attendees, events.event_id, event_gallery.media_url,event_category.cat_id,
CAST(AVG (review.rate) AS DECIMAL (12, 1)) AS rating,
venue.location, IF(favourite.is_favorite = 0, 'false', 'true') AS is_favorite,
IF(events.provider_id = 0, 'false', 'true') AS is_editors_choice,
events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,
GROUP_CONCAT(DISTINCT CONCAT_WS('#', event_date_time.id, event_date_time.date,
event_date_time.time)) AS date_time
FROM favourite FROM favourite
INNER JOIN events ON events.event_id=favourite.event_id INNER JOIN events ON events.event_id=favourite.event_id
INNER JOIN venue ON venue.id=events.venue_id INNER JOIN venue ON venue.id=events.venue_id
...@@ -1152,47 +1178,48 @@ class Webservice_model extends CI_Model { ...@@ -1152,47 +1178,48 @@ class Webservice_model extends CI_Model {
if(!empty($dates = explode(',',$rs->date_time))){ if(!empty($dates = explode(',',$rs->date_time))){
$checkTime = 0; $checkTime = 0;
foreach ($dates as $date) { foreach ($dates as $date) {
if(empty($date)){ if(empty($date)){ unset($result[$key]); continue; }
unset($result[$key]);
continue;
}
$dArr = explode('#', $date); $dArr = explode('#', $date);
if($dArr[1] == date("Y-m-d") && if($dArr[1] == date("Y-m-d") &&
$dArr[1].' '.$dArr[2] < date("Y-m-d H:i", strtotime('+15 minutes'))){ $dArr[1].' '.$dArr[2] < date("Y-m-d H:i", strtotime('+15 minutes'))){
$checkTime += 1; $checkTime += 1;
} }
} }
if($checkTime == count($dates)){ if($checkTime == count($dates)){ unset($result[$key]); }
unset($result[$key]); } else { unset($result[$key]); }
}
} else {
unset($result[$key]);
}
} }
if(($count = count($result)) > 0){ if(($count = count($result)) > 0){
$response = array(); $response = array();
foreach ($result as $rs) { foreach ($result as $rs) {
if($rs->layout!=''){
if($rs->custom_seat_layout!=''){ $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($rs->layout != ''){
if($rs->custom_seat_layout != ''){
$pricelist = json_decode($rs->custom_seat_layout, TRUE); $pricelist = json_decode($rs->custom_seat_layout, TRUE);
$price = min(array_column($pricelist, 'price')); $price = min(array_column($pricelist, 'price')) * $rate;
} else { } else {
$pricelist = json_decode($rs->layout_details, TRUE); $pricelist = json_decode($rs->layout_details, TRUE);
$price = min(array_column($pricelist, 'price')); $price = min(array_column($pricelist, 'price')) * $rate;
} }
} else { } else {
$pricelist = json_decode($rs->seat_pricing, TRUE); $pricelist = json_decode($rs->seat_pricing, TRUE);
$price = $pricelist['price']; $price = $pricelist['price'] * $rate;
} }
$lang = $this->getCountryData($user_id); $lang = $this->getCountryData($user_id);
$resData = array( $resData = array(
'event_id'=>$rs->event_id, 'event_id'=>$rs->event_id,
'image'=>$rs->media_url, 'image'=>$rs->media_url,
'attendees'=>$rs->attendees, 'attendees'=>$rs->attendees,
'category'=>$rs->category, 'category'=>$transData['category'],
'name'=>$rs->event_name, 'name'=>$transData['event'],
'rating'=>$rs->rating, 'rating'=>$rs->rating,
'location'=>$rs->location,
'rate'=>$price, 'rate'=>$price,
'location'=>$rs->location, 'location'=>$rs->location,
'is_favorite'=>$rs->is_favorite === 'true'? true: false, 'is_favorite'=>$rs->is_favorite === 'true'? true: false,
...@@ -1411,44 +1438,31 @@ class Webservice_model extends CI_Model { ...@@ -1411,44 +1438,31 @@ 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) {
$lang = $this->db->select('language')->where('customer_id', $user_id)->get('customer')->row(); $countryData = $this->getCountryData($user_id);
if($lang->language == 'ar') { $lang = $countryData['language_code'];
$loc_field = 'locality.locality_ar AS city_name';
$cat_field = 'event_category.category_ar AS category'; $sql = "SELECT LOC.id AS city_id,TLOC.locality_name AS city_name
$cat_field .= ',event_category.category_image_ar AS category_image'; FROM locality AS LOC
$dateArray = [["date_id"=>'كل الأيام',"date"=>"1"],["date_id"=>'اليوم',"date"=>"2"],["date_id"=>'غدا',"date"=>"3"],["date_id"=>'هذا الاسبوع',"date"=>"4"],["date_id"=>'عطلة نهاية الاسبوع',"date"=>"5"],["date_id"=>'في وقت لاحق',"date"=>"6"]]; INNER JOIN customer AS CUST ON (CUST.city=LOC.region_id)
} else { INNER JOIN translator_locality AS TLOC ON (TLOC.locality_id=LOC.id)
$loc_field = 'locality.locality_en AS city_name'; WHERE CUST.customer_id='$user_id' AND LOC.status='1' AND TLOC.language_code='$lang'
$cat_field = 'event_category.category_en AS category'; GROUP BY LOC.id";
$cat_field .= ',event_category.category_image AS category_image';
$dateArray = [["date_id"=>"All Days","date"=>"1"],["date_id"=>"Today","date"=>"2"],["date_id"=>"Tomorrow","date"=>"3"],["date_id"=>"This week","date"=>"4"],["date_id"=>"Weekend","date"=>"5"],["date_id"=>"Later","date"=>"6"]];
}
$sql = "SELECT locality.id AS city_id, $loc_field FROM locality
INNER JOIN customer ON customer.city=locality.region_id
WHERE customer.customer_id='$user_id' AND locality.status='1'";
$locality = $this->db->query($sql)->result(); $locality = $this->db->query($sql)->result();
$category = $this->db->query("SELECT cat_id AS category_id, $cat_field
FROM event_category $sql = "SELECT ECAT.cat_id AS category_id,TCAT.category_name AS category,
WHERE status = 1 TCAT.category_image AS category_image
ORDER BY event_category.priority")->result(); FROM event_category AS ECAT
if(!EMPTY($locality)) { INNER JOIN translator_category AS TCAT ON (TCAT.category_id=ECAT.cat_id)
$locality = $locality; WHERE ECAT.status = 1
}else{ GROUP BY ECAT.cat_id
$locality = array(); ORDER BY ECAT.priority";
} $category = $this->db->query($sql)->result();
if(!EMPTY($category)) {
$category = $category; $locality = (!empty($locality))?$locality:array();
}else{ $category = (!empty($category))?$category:array();
$category = array();
} if(!empty($locality) && !empty($category)){
if(isset($dateArray)){ $res = array('status'=>1,'data'=>array('cities'=>$locality,'categories'=>$category));
$resultData = array();
$resData = array(
'cities'=>$locality,
'categories'=>$category,
'dates'=>$dateArray
);
$res = array('status'=>1,'data'=>$resData);
} else { } else {
$res = array('status'=>0,'message'=>'No records found','code'=>'ER13'); $res = array('status'=>0,'message'=>'No records found','code'=>'ER13');
} }
...@@ -1510,20 +1524,26 @@ class Webservice_model extends CI_Model { ...@@ -1510,20 +1524,26 @@ class Webservice_model extends CI_Model {
if($user_id > 0) { if($user_id > 0) {
$per_page = 10; $per_page = 10;
$str = urldecode(strtolower($data['query'])); $str = urldecode(strtolower($data['query']));
$countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code'];
$this->db->query("SET SESSION group_concat_max_len = 20000"); $this->db->query("SET SESSION group_concat_max_len = 20000");
$sql = "SELECT GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time)) $sql = "SELECT GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time))
AS date_time AS date_time
FROM events AS EVT FROM events AS EVT
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id) 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 event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
INNER JOIN event_gallery AS IMG ON LEFT JOIN event_gallery AS IMG ON (IMG.event_id=EVT.event_id AND
(IMG.event_id=EVT.event_id AND IMG.media_type=0) IMG.media_type=0 AND IMG.status='1' )
WHERE (EVT.event_name LIKE '%$str%' OR WHERE EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND
EVT.event_name_ar LIKE '%$str%') AND VEN.status='1' AND EDATE.status='1' AND
EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND EVT.event_id IN (SELECT event_id FROM translator_event
VEN.status='1' AND IMG.status='1' AND EDATE.status='1' WHERE event_name LIKE '%$str%' OR
GROUP BY EVT.event_id"; event_description LIKE '%$str%'
GROUP BY EVT.event_id)";
$resCount = $this->db->query($sql)->result(); $resCount = $this->db->query($sql)->result();
if(empty($resCount)){ if(empty($resCount)){
return array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta)); return array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));
} }
...@@ -1554,27 +1574,28 @@ class Webservice_model extends CI_Model { ...@@ -1554,27 +1574,28 @@ class Webservice_model extends CI_Model {
$meta = array('total_pages'=>ceil($count/$per_page),'total'=>$count, $meta = array('total_pages'=>ceil($count/$per_page),'total'=>$count,
'current_page'=>$page,'per_page'=>$per_page); 'current_page'=>$page,'per_page'=>$per_page);
if($count > 0 && $count > $page_limit) { if($count > 0 && $count > $page_limit) {
$lang = $this->getCountryData($user_id);
if($lang == 'en') $event_name = 'events.event_name AS event_name';
else $event_name = 'events.event_name_ar AS event_name';
$limit = $page_limit.','.$per_page; $limit = $page_limit.','.$per_page;
$this->db->query("SET SESSION group_concat_max_len = 20000"); $this->db->query("SET SESSION group_concat_max_len = 20000");
$sql = "SELECT EVT.event_id,EVT.event_name,VEN.location, $sql = "SELECT EVT.event_id,VEN.location,IMG.media_url AS event_image,
IMG.media_url AS event_image,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time)) GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time))
AS date_time AS date_time,TEVT.event_name
FROM events AS EVT FROM events AS EVT
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id) 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 event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
INNER JOIN event_gallery AS IMG ON INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
(IMG.event_id=EVT.event_id AND IMG.media_type=0) LEFT JOIN event_gallery AS IMG ON (IMG.event_id=EVT.event_id AND
WHERE (EVT.event_name LIKE '%$str%' OR IMG.media_type=0 AND IMG.status='1')
EVT.event_name_ar LIKE '%$str%') AND WHERE EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND
EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND VEN.status='1' AND EDATE.status='1' AND
VEN.status='1' AND IMG.status='1' AND EDATE.status='1' EVT.event_id IN (SELECT event_id FROM translator_event
WHERE (event_name LIKE '%$str%' OR
event_description LIKE '%$str%')
GROUP BY event_id)
GROUP BY EVT.event_id GROUP BY EVT.event_id
ORDER BY EVT.event_id DESC ORDER BY EVT.event_id DESC
LIMIT $limit"; LIMIT $limit";
$result = $this->db->query($sql)->result(); $result = $this->db->query($sql)->result();
foreach ($result AS $key => $rs) { foreach ($result AS $key => $rs) {
if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){ if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
......
application/views/Country/countryAddForm.php
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<img id="country_flag" src="<?= (isset($countryData->country_flag))?base_url($countryData->country_flag):'' ?>" onerror="this.src='<?=base_url("assets/images/flag_default.png")?>';" height="50" width="65" /> <img id="country_flag" src="<?= (isset($countryData->country_flag))?base_url($countryData->country_flag):'' ?>" onerror="this.src='<?=base_url("assets/images/flag_default.png")?>';" height="50" width="65" />
</div> </div>
<div class="col-md-9" style="padding-top: 13px;"> <div class="col-md-9" style="padding-top: 13px;">
<input class="required" name="country_flag" type="file" accept="image/*" onchange="setImg(this,'country_flag');" /> <input class="<?= !empty($country_id)?'':'required' ?>" name="country_flag" type="file" accept="image/*" onchange="setImg(this,'country_flag');" />
</div> </div>
</div> </div>
</div> </div>
......
application/views/Event/eventEditForm.php
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
<div class="form-group"> <div class="form-group">
<label>Price</label> <label>Price</label>
<input type="text" class="form-control required" placeholder="Price" <input type="text" class="form-control required" placeholder="Price"
data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" name="price"> data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" name="price" value="<?= isset($seat_pricing['price'])?$seat_pricing['price']:'' ?>">
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<label>Capacity</label> <label>Capacity</label>
<input type="text" class="form-control required" placeholder="Provide Capacity" <input type="text" class="form-control required" placeholder="Provide Capacity"
data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-trigger="change" data-parsley-minlength="1"
name="capacity" data-parsley-pattern="^[0-9\ . \/]+$"> name="capacity" data-parsley-pattern="^[0-9\ . \/]+$" value="<?= isset($seat_pricing['capacity'])?$seat_pricing['capacity']:'' ?>">
</div> </div>
</div> </div>
</div> </div>
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
<div class="form-group"> <div class="form-group">
<label>About Price Division (EN)</label> <label>About Price Division (EN)</label>
<textarea type="text" name="price_details_EN" required data-parsley-trigger="change" <textarea type="text" name="price_details_EN" required data-parsley-trigger="change"
class="ip_reg_form_input form-control reset-form-custom required custom_price" placeholder="Price Division (EN)" data-parsley-minlength="2"></textarea> class="ip_reg_form_input form-control reset-form-custom required custom_price" placeholder="Price Division (EN)" data-parsley-minlength="2"><?= isset($seat_pricing['price_details_EN'])?$seat_pricing['price_details_EN']:'' ?></textarea>
</div> </div>
</div> </div>
<div class="col-sm-6" style="padding-top: 41px;padding-bottom: 18px;"> <div class="col-sm-6" style="padding-top: 41px;padding-bottom: 18px;">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<label>About Price Division (<?= $lang ?>)</label> <label>About Price Division (<?= $lang ?>)</label>
<textarea type="text" name="price_details_<?= $lang ?>" data-parsley-minlength="2" <textarea type="text" name="price_details_<?= $lang ?>" data-parsley-minlength="2"
class="ip_reg_form_input form-control reset-form-custom custom_price" class="ip_reg_form_input form-control reset-form-custom custom_price"
placeholder="Price Division (<?= $lang ?>)" data-parsley-trigger="change"></textarea> placeholder="Price Division (<?= $lang ?>)" data-parsley-trigger="change"><?= isset($seat_pricing['price_details_'.$lang])?$seat_pricing['price_details_'.$lang]:'' ?></textarea>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
......
application/views/Notification/pushNotification.php
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<option selected disabled>Choose an Event</option> <option selected disabled>Choose an Event</option>
<?php <?php
foreach ($event_data as $event) { foreach ($event_data as $event) {
echo '<option value="'.$event->event_id.'">'.$event->event_name_en.'</option>'; echo '<option value="'.$event->event_id.'">'.$event->event_name_EN.'</option>';
} }
?> ?>
</select> </select>
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
<label>Tags</label> <label>Tags</label>
<div type="parent" class="header-tag-box marginTop10" style="height:82px;"> <div type="parent" class="header-tag-box marginTop10" style="height:82px;">
<?php foreach($regionData AS $region){ ?> <?php foreach($regionData AS $region){ ?>
<div id="tag_<?= $region->id ?>" class="header-tag cpoint" <div id="tag_<?= $region->id ?>" class="header-tag cpoint" select="0"
tag_id="<?= $region->name_en ?>" select="0" onclick="manageTags(jQuery(this))"> tag_id="<?= $region->id ?>" onclick="manageTags(jQuery(this))">
<?= $region->name_en ?> <?= $region->region_name_EN ?>
</div> </div>
<?php } ?> <?php } ?>
</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