Skip to content

T
TimeOutAdmin
Commit 21cf3c53 by Jansa Jose
Options

changes in bookedlist api

parent 632dd931
Showing with 119 additions and 6 deletions
application/models/Validation_organizer_model.php
...@@ -427,6 +427,116 @@ class Validation_organizer_model extends CI_Model { ...@@ -427,6 +427,116 @@ class Validation_organizer_model extends CI_Model {
) )
), ),
), ),
'getOrganizerTagDetails'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'tag_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Id is null or empty'
)
),
),
'addTag'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'tag_name' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Name is null or empty'
)
),
),
'editOrganizerTagDetails'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'tag_name' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Name is null or empty'
)
),
'tag_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Id is null or empty'
)
),
),
'deleteOrganizerTag'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'tag_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Id is null or empty'
)
),
),
'deActivateOrganizerTag'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'tag_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Tag Id is null or empty'
)
),
),
'getOrganizerHostCategoryList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'page' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Page is null or empty'
)
),
),
'addHostCategory'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'host_category' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Host category is null or empty'
)
),
'show_layout' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Show Layout is null or empty'
)
),
),
); );
public function _consruct(){ public function _consruct(){
......
application/models/Webservice_model.php
...@@ -1492,7 +1492,7 @@ class Webservice_model extends CI_Model { ...@@ -1492,7 +1492,7 @@ class Webservice_model extends CI_Model {
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$sql = "SELECT booking.bookId AS booking_id,event_date_time.date, $sql = "SELECT booking.bookId AS booking_id,event_date_time.date,
translator_event.event_name,booking.qrcode AS event_image, TRS_EVT.event_name,booking.qrcode AS event_image,
venue.location,event_date_time.time,booking.event_id, venue.location,event_date_time.time,booking.event_id,
booking.no_of_ticket AS ticket_count,events.has_payment, booking.no_of_ticket AS ticket_count,events.has_payment,
booking.status AS booking_status,transaction.status AS transaction_status booking.status AS booking_status,transaction.status AS transaction_status
...@@ -1500,13 +1500,16 @@ class Webservice_model extends CI_Model { ...@@ -1500,13 +1500,16 @@ class Webservice_model extends CI_Model {
INNER JOIN events ON booking.event_id = events.event_id INNER JOIN events ON booking.event_id = events.event_id
INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id
INNER JOIN venue ON venue.id = events.venue_id INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN translator_event ON translator_event.event_id=events.event_id INNER JOIN translator_event AS TRS_EVT ON TRS_EVT.event_id=events.event_id
LEFT JOIN transaction ON transaction.booking_id=booking.bookId LEFT JOIN transaction ON transaction.booking_id=booking.bookId
WHERE (translator_event.language_code='$lang' OR translator_event.language_code='EN') WHERE (TRS_EVT.language_code='$lang' OR TRS_EVT.language_code='EN') AND
AND booking.bookId='$booking_id' AND events.has_payment != '1' booking.bookId='$booking_id'";
AND transaction.status = '1'";
return $this->db->query($sql)->row_array(); if(empty($evtData = $this->db->query($sql)->row_array()) ||
($evtData['has_payment'] == '1' && $evtData['transaction_status'] != '1')){
return;
}
return $evtData;
} }
function getHotelData($booking_id='',$user_id=''){ function getHotelData($booking_id='',$user_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