Skip to content

T
TimeOutAdmin
Commit 4f2472d1 by Tobin
Options

Merge branch 'jansa' into 'master'

Jansa See merge request !172
parents 81f8fd20 a0d26d80
Showing with 18 additions and 15 deletions
application/controllers/OrganizerServices.php
......@@ -90,7 +90,7 @@ class OrganizerServices extends CI_Controller {
}
public function editOrganizerEventDetails(){
$data = (array) json_decode(file_get_contents('php://input'));
$data =(array)json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->editOrganizerEventDetails($data);
if($res['status'] != 0){
$this->successResponse($res);
......
application/controllers/Webservice.php
......@@ -636,5 +636,9 @@ class Webservice extends CI_Controller {
$this->errorResponse($res['code'],$res['message']);
}
}
public function cancel_booking(){
$data = (array)json_decode(file_get_contents('php://input'));
}
}
?>
application/models/Organizer_model.php
......@@ -70,13 +70,13 @@ class Organizer_model extends CI_Model {
$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'));
$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'));
$pricelist = json_decode($result->layout_details, TRUE);
$price = min(array_column($pricelist, 'price'));
$event_layout = $result->layout_details;
$faretype = 1;
}
......@@ -153,25 +153,24 @@ class Organizer_model extends CI_Model {
'provider_id'=>(!empty($postData['organiser_id']))?$postData['organiser_id']:'',
'max_booking'=>(!empty($postData['maximum_seat_booking']))?$postData['maximum_seat_booking']:'',
'has_payment'=>(!empty($postData['payment_mode']))?$postData['payment_mode']:'',
'seat_pricing'=>(!empty($postData['seat_pricing']))?$postData['seat_pricing']:'',
'custom_seat_layout'=>(!empty($postData['custom_seat_layout']))?$postData['custom_seat_layout']:'',
'seat_pricing'=>(!empty($postData['seat_pricing']))?json_encode($postData['seat_pricing']):'',
'custom_seat_layout'=>(!empty($postData['custom_seat_layout']))?json_encode($postData['custom_seat_layout']):'',
'status'=>3);
$evtName = (!empty($postData['event_name']))?json_decode($postData['event_name'],true):'';
$evtDesc = (!empty($postData['event_desc']))?json_decode($postData['event_desc'],true):'';
$evtName = (!empty($postData['event_name']))?$postData['event_name']:'';
$evtDesc = (!empty($postData['event_desc']))?$postData['event_desc']:'';
$status = $this->db->update('events',$eventData,array('event_id'=>$postData['event_id']));
if($status && ($evtName != '' && $evtDesc != '')){
if(!empty($languages)){
$insertArr = $languageArr = array();
foreach ($languages AS $lang) {
foreach ($evtName as $evkey => $evvalue) {
if($lang == $evvalue['lang']){
$languageArr[$lang]['event_name'] = $evvalue['event_name'];
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'];
if($lang == $descvalue->lang){
$languageArr[$lang]['event_desc'] = $descvalue->event_desc;
}
}
}
......@@ -215,7 +214,7 @@ class Organizer_model extends CI_Model {
$insertTag = array();
if(isset($postData['tag']) && !empty($postData['tag'])){
foreach (json_decode($postData['tag']) AS $tag) {
foreach ($postData['tag'] AS $tag) {
$insertTag[] = array('event_id'=>$event_id,'tag_id'=>$tag);
}
$this->db->delete('event_tags',array('event_id'=>$postData['event_id']));
......
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