Skip to content

T
TimeOutAdmin
Commit bf93a835 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !137
parents 3852e0aa afd14530
Showing with 61 additions and 35 deletions
application/controllers/OrganizerServices.php
......@@ -39,8 +39,7 @@ class OrganizerServices extends CI_Controller {
if($res['state'] == 1) {
$this->errorResponse($res['response']['code'], $res['response']['message']);
die;
}
}
}
public function response($data) {
......@@ -68,7 +67,6 @@ class OrganizerServices extends CI_Controller {
print json_encode($result);
}
public function getOrganizerEventList(){
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->getOrganizerEventList($data);
......
application/models/Organizer_model.php
......@@ -42,13 +42,13 @@ class Organizer_model extends CI_Model {
return $res;
}
function event($data) {
public function event($data) {
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,host_categories.show_layout,venue.id AS venue_id,
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
......@@ -58,20 +58,25 @@ class Organizer_model extends CI_Model {
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
INNER JOIN host_categories ON venue.host_cat_id=host_categories.host_cat_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'];
$result = $this->db->query($sql)->row();
if(empty($result->event_id)){
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
return $res;
}
$resultData = array();
$event_layout = '';
$event_layout = $faretype ='';
if($result->layout!=''){
if($result->custom_seat_layout!=''){
$pricelist = json_decode($result->custom_seat_layout, TRUE);
$price = min(array_column($pricelist, 'price'));
$event_layout = $result->custom_seat_layout;
$faretype = 2;
} else {
$pricelist = json_decode($result->layout_details, TRUE);
$price = min(array_column($pricelist, 'price'));
$event_layout = $result->layout_details;
$faretype = 1;
}
} else {
$pricelist = json_decode($result->seat_pricing, TRUE);
......@@ -103,10 +108,11 @@ class Organizer_model extends CI_Model {
$resData['venue_name'] =$result->venue_name;
$resData['location'] =$result->location;
$resData['booking_limit'] = $result->max_booking;
$resData['layout_type'] = (!empty($result->seat_pricing))?'2':'1';
if($resData['layout_type'] == '2'){
$resData['layout_type'] = (!empty($result->layout))?'1':'2';
if($resData['layout_type'] == '1'){
$resData['layout_pricing'] = $event_layout;
$resData['layout_image'] = $result->layout;
$resData['fare_type'] = $faretype;
}
if(!empty($result->tag_ids) && !empty($tag_ids = explode(',',$result->tag_ids))){
foreach ($tag_ids AS $key => $id) {
......@@ -131,7 +137,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function editOrganizerEventDetails($data){
public function editOrganizerEventDetails($data){
try{
ini_set("memory_limit","-1");
set_time_limit(0);
......@@ -144,7 +150,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function changeOrganizerEventStatus($data,$status=''){
public function changeOrganizerEventStatus($data,$status=''){
try{
$count = $this->db->get_where('events',array('event_id'=>$data['event_id']))->num_rows();
if($count < 1){
......@@ -160,7 +166,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function getVenueList($data){
public function getVenueList($data){
try{
$count = $this->db->query("SELECT * FROM venue AS VNE WHERE VNE.status != '2' AND VNE.provider_id =".$data['organiser_id'])->num_rows();
if($count > 0) {
......@@ -395,7 +401,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function getTagList($data) {
public function getTagList($data) {
try {
$organizer_id = $data['organiser_id'];
......@@ -444,13 +450,26 @@ class Organizer_model extends CI_Model {
if($status){
$event_id = $this->db->insert_id();
if(!empty($languages)){
$insertArr = array();
$insertArr = $languageArr = array();
foreach ($languages AS $lang) {
foreach ($evtName as $evkey => $evvalue) {
if($lang == $evvalue['lang']){
$languageArr[$lang]['event_name'] = $evvalue['event_name'];
}
}
foreach ($evtDesc as $desckey => $descvalue) {
if($lang == $descvalue['lang']){
$languageArr[$lang]['event_desc'] = $descvalue['event_desc'];
}
}
}
foreach ($languages AS $lang) {
if(!isset($evtName[$lang]) || !isset($evtDesc[$lang])){
if(!isset($languageArr[$lang]) || (empty($languageArr[$lang]['event_name']) &&
empty($languageArr[$lang]['event_desc']))){
continue;
}
$eName = !empty($evtName[$lang])?$evtName[$lang]:'';
$eDesc = !empty($evtDesc[$lang])?$evtDesc[$lang]:'';
$eName = (isset($languageArr[$lang]['event_name']) && !empty($languageArr[$lang]['event_name']))?$languageArr[$lang]['event_name']:'';
$eDesc = (isset($languageArr[$lang]['event_desc']) && !empty($languageArr[$lang]['event_desc']))?$languageArr[$lang]['event_desc']:'';
$insertArr[] = array('event_id'=>$event_id,'event_name'=>$eName,
'event_description'=>$eDesc,'language_code'=>$lang);
}
......@@ -497,7 +516,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function eventImageUpload($eId = '', $files = array(), $mTyp='0'){
public function eventImageUpload($eId = '', $files = array(), $mTyp='0'){
if(empty($eId) || empty($files)){
return false;
}
......@@ -548,8 +567,7 @@ class Organizer_model extends CI_Model {
return array('evtMediaData'=>$evtMediaData,'errorMediaFiles'=>$errorMediaFiles);
}
function imageResize($newImage,$size,$path){
public function imageResize($newImage,$size,$path){
$this->load->library('image_lib');
$config['width'] = $size['width'];
$config['height'] = $size['height'];
......@@ -570,7 +588,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function googleVisionApi($img='', $typ='SAFE_SEARCH_DETECTION'){
public function googleVisionApi($img='', $typ='SAFE_SEARCH_DETECTION'){
if(empty($img)){
return 0;
}
......@@ -612,7 +630,7 @@ class Organizer_model extends CI_Model {
return $safe;
}
function getLanguages(){
public function getLanguages(){
try{
$sql = "SELECT country_id AS lang_id,language_code AS lang,language FROM country WHERE status='1' ORDER BY language_code ASC";
$lang = $this->db->query($sql);
......@@ -627,7 +645,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function getCategories(){
public function getCategories(){
try{
$sql = "SELECT category_id AS cat_id,category_name AS cat_name FROM translator_category WHERE language_code='EN'";
$category = $this->db->query($sql);
......@@ -642,7 +660,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function searchEvent($data){
public function searchEvent($data){
try{
$sql = "SELECT TESVT.event_id,TSEVT.event_name,EVT.venue_id,EVT.category_id,EVT.status,VNE.region_id
FROM events AS EVT
......@@ -670,7 +688,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function searchCustomer($data){
public function searchCustomer($data){
try{
$sql = "SELECT CUST.customer_id,CUST.name AS customer_name,CUST.email,CUST.phone,CUST.gender,CUST.city,CUST.profile_image AS image
FROM events AS EVT
......@@ -689,7 +707,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function searchBooking($data){
public function searchBooking($data){
try{
$sql = "SELECT TSEVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name AS category,BUK.status,BUK.amount,CUST.name AS customer_name,EVDT.date AS scheduled_date, EVDT.time AS scheduled_time
FROM booking AS BUK
......@@ -711,7 +729,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function searchChecker($data){
public function searchChecker($data){
try{
$sql = "SELECT CHKR.username AS checker_name,CHKR.id AS checker_id,CHKR.status,PDR.name AS provider FROM checker AS CHKR INNER JOIN provider AS PDR ON (PDR.provider_id = CHKR.provider_id) WHERE CHKR.username LIKE '%".$data['keyword']."%' AND CHKR.provider_id='".$data['organiser_id']."'";
$chkrData = $this->db->query($sql);
......@@ -726,7 +744,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function getCountryCode(){
public function getCountryCode(){
try{
$sql = "SELECT country_id,country_name,country_code FROM country WHERE status='1'";
$ctryData = $this->db->query($sql);
......@@ -741,7 +759,7 @@ class Organizer_model extends CI_Model {
return $res;
}
function getCheckerList($data){
public function getCheckerList($data){
try{
$count = $this->db->query("SELECT id FROM checker AS CHKR WHERE CHKR.status=1 AND CHKR.provider_id = '".$data['organiser_id']."'")->num_rows();
if($count > 0) {
......@@ -766,7 +784,7 @@ class Organizer_model extends CI_Model {
public function getEvent($data){
try{
$sql = "SELECT EVT.venue_id,EVT.category_id,EVT.max_booking AS max_seat_booking,EVT.has_payment AS payment_mode,GROUP_CONCAT(DISTINCT EVTG.tag_id) AS tags,GROUP_CONCAT(DISTINCT CONCAT_WS('#',EVDT.id,EVDT.date,EVDT.time)) AS date_time,EVT.custom_seat_layout,EVT.seat_pricing,VNE.layout FROM events AS EVT
$sql = "SELECT EVT.venue_id,EVT.category_id,EVT.max_booking AS max_seat_booking,EVT.has_payment AS payment_mode,GROUP_CONCAT(DISTINCT EVTG.tag_id) AS tags,GROUP_CONCAT(DISTINCT CONCAT_WS('#',EVDT.id,EVDT.date,EVDT.time)) AS date_time,EVT.custom_seat_layout,EVT.seat_pricing,VNE.layout,VNE.layout_details AS layoutDetails FROM events AS EVT
INNER JOIN event_date_time AS EVDT ON EVT.event_id = EVDT.event_id
INNER JOIN venue AS VNE ON EVT.venue_id = VNE.id
LEFT JOIN event_tags AS EVTG ON EVT.event_id=EVTG.event_id WHERE EVT.event_id='".$data['event_id']."' AND EVT.provider_id='".$data['organiser_id']."'";
......@@ -804,9 +822,15 @@ class Organizer_model extends CI_Model {
$tag = explode(',',$evData['tags']);
$evData['tags'] = $tag;
$language = getLanguages();
$evData['layout_type'] = (!empty($evData['seat_pricing']))?'2':'1';
$evData['layout_type'] = (!empty($evData['layout']))?'1':'2';
if($evData['layout_type'] == '1'){
$evData['layout_details']['layout_pricing'] = $evData['custom_seat_layout'];
if($evData['custom_seat_layout'] != ''){
$evData['fare_type'] = '2';
$evData['layout_details']['layout_pricing'] = $evData['custom_seat_layout'];
}else{
$evData['fare_type'] = '1';
$evData['layout_details']['layout_pricing'] = $evData['layoutDetails'];
}
$evData['layout_details']['layout_image'] = $evData['layout'];
}else{
$seatlyt = json_decode($evData['seat_pricing']);
......@@ -822,13 +846,17 @@ class Organizer_model extends CI_Model {
$seatlyt->about_price_division = $priceArr;
$evData['layout_details'] = json_encode($seatlyt);
}
unset($evData['layout'],$evData['date_time'],$evData['custom_seat_layout'],$evData['seat_pricing']);
unset($evData['layout'],$evData['date_time'],$evData['custom_seat_layout'],$evData['seat_pricing'],$evData['layoutDetails']);
$evntDes = $this->db->get_where('translator_event',array('event_id'=>$data['event_id']))->result_array();
if(!empty($evntDes)){
foreach ($evntDes as $key => $value) {
$evtName[] = array('lang'=>$value['language_code'],'name'=>$value['event_name']);
$evtDesc[] = array('lang'=>$value['language_code'],'desc'=>$value['event_description']);
if(!empty($value['event_name'])){
$evtName[] = array('lang'=>$value['language_code'],'name'=>$value['event_name']);
}
if(!empty($value['event_description'])){
$evtDesc[] = array('lang'=>$value['language_code'],'desc'=>$value['event_description']);
}
}
$evData['event_name'] = $evtName;
$evData['event_desc'] = $evtDesc;
......
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