Skip to content

T
TimeOutAdmin
Commit 7300c4ce by Tobin
Options

dc

parent d9291510
Showing with 7 additions and 7 deletions
application/models/Api_model.php
...@@ -400,8 +400,8 @@ class Api_model extends CI_Model { ...@@ -400,8 +400,8 @@ class Api_model extends CI_Model {
foreach (($bookedData = $bookedData->result_array()) as $key => $value) { foreach (($bookedData = $bookedData->result_array()) as $key => $value) {
switch($value['order_type']){ switch($value['order_type']){
case 1 : $resp = $this->getEventData($value['booking_id'],$user_id);break; case 1 : $resp = $this->getEventData($value['booking_id'],$user_id);break;
case 2 : $resp = $this->getHotelData($value['booking_id'],$user_id);break; // case 2 : $resp = $this->getHotelData($value['booking_id'],$user_id);break;
case 3 : $resp = $this->getFlightData($value['booking_id'],$user_id);break; // case 3 : $resp = $this->getFlightData($value['booking_id'],$user_id);break;
} }
if(!empty($resp)){ if(!empty($resp)){
$bookData[] = $resp; $bookData[] = $resp;
...@@ -449,10 +449,10 @@ class Api_model extends CI_Model { ...@@ -449,10 +449,10 @@ class Api_model extends CI_Model {
$eventData['order_type'] = 1; $eventData['order_type'] = 1;
$evtLang = langTranslator($eventData['event_id'],'EVT'); $evtLang = langTranslator($eventData['event_id'],'EVT');
array_merge($eventData,$evtLang);
$vneLang = langTranslator($eventData['venue_id'],'VEN'); $vneLang = langTranslator($eventData['venue_id'],'VEN');
return array_merge($eventData,$vneLang); $eventData = array_merge($eventData,$evtLang);
$eventData = array_merge($eventData,$vneLang);
return $eventData;
} }
function getHotelData($booking_id='',$user_id=''){ function getHotelData($booking_id='',$user_id=''){
......
application/models/Webservice_model.php
...@@ -1464,8 +1464,8 @@ class Webservice_model extends CI_Model { ...@@ -1464,8 +1464,8 @@ class Webservice_model extends CI_Model {
foreach (($bookedData = $bookedData->result_array()) as $key => $value) { foreach (($bookedData = $bookedData->result_array()) as $key => $value) {
switch($value['order_type']){ switch($value['order_type']){
case 1 : $resp = $this->getEventData($value['booking_id'],$user_id);break; case 1 : $resp = $this->getEventData($value['booking_id'],$user_id);break;
case 2 : $resp = $this->getHotelData($value['booking_id'],$user_id);break; // case 2 : $resp = $this->getHotelData($value['booking_id'],$user_id);break;
case 3 : $resp = $this->getFlightData($value['booking_id'],$user_id);break; // case 3 : $resp = $this->getFlightData($value['booking_id'],$user_id);break;
} }
if(!empty($resp)){ if(!empty($resp)){
$bookData[] = $resp; $bookData[] = $resp;
......
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