Commit 85dd8131 by Tobin

dc

parent 6b1d8573
...@@ -13,6 +13,14 @@ class Booking extends CI_Controller { ...@@ -13,6 +13,14 @@ class Booking extends CI_Controller {
} }
} }
public function encode($val = ''){
echo encode_param($val);
}
public function decode($val = ''){
echo decode_param($val);
}
public function viewBookings(){ public function viewBookings(){
$template['page'] = 'Booking/viewBooking'; $template['page'] = 'Booking/viewBooking';
$template['menu'] = 'Booking Management'; $template['menu'] = 'Booking Management';
......
...@@ -311,7 +311,6 @@ class Event extends CI_Controller { ...@@ -311,7 +311,6 @@ class Event extends CI_Controller {
$eventData = array('venue_id'=>$_POST['venue_id'], $eventData = array('venue_id'=>$_POST['venue_id'],
'category_id'=>$_POST['category_id'], 'category_id'=>$_POST['category_id'],
'provider_id'=>$provider,
'max_booking'=>$_POST['max_booking'], 'max_booking'=>$_POST['max_booking'],
'has_payment'=>$_POST['has_payment'], 'has_payment'=>$_POST['has_payment'],
'seat_pricing'=>$_POST['seat_pricing'], 'seat_pricing'=>$_POST['seat_pricing'],
......
...@@ -626,7 +626,6 @@ class Api_model extends CI_Model { ...@@ -626,7 +626,6 @@ class Api_model extends CI_Model {
'redeem_amount'=>$post_data['redeem_amount'], 'redeem_amount'=>$post_data['redeem_amount'],
'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus); 'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
} }
$card_data = $post_data['cardData'];
$auth_token = $post_data['auth_token']; $auth_token = $post_data['auth_token'];
unset($post_data['auth_token'],$post_data['has_payment'],$post_data['cardData'], unset($post_data['auth_token'],$post_data['has_payment'],$post_data['cardData'],
$post_data['promocode_id'],$post_data['redeem_amount']); $post_data['promocode_id'],$post_data['redeem_amount']);
...@@ -637,7 +636,7 @@ class Api_model extends CI_Model { ...@@ -637,7 +636,7 @@ class Api_model extends CI_Model {
$this->db->insert('promocode_used',$promocodeData); $this->db->insert('promocode_used',$promocodeData);
} }
$cardDetails = array(); $cardDetails = array();
if(!empty($card_data)){ if(isset($post_data['cardData']) && !empty($card_data = $post_data['cardData'])){
// (CC)-Credit ,(DC)-Debit ,(DD)-Direct Debit,(PAYPAL)-PayPal,(NB)-Net Banking // (CC)-Credit ,(DC)-Debit ,(DD)-Direct Debit,(PAYPAL)-PayPal,(NB)-Net Banking
switch($card_data->card_type) { switch($card_data->card_type) {
case '1': $cardDetails['cardMode'] = 'CC'; break; case '1': $cardDetails['cardMode'] = 'CC'; break;
......
...@@ -787,7 +787,7 @@ class Webservice_model extends CI_Model { ...@@ -787,7 +787,7 @@ class Webservice_model extends CI_Model {
FROM region AS REG FROM region AS REG
INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id)
WHERE REG.status=1 AND (TREG.language_code='$lang' OR TREG.language_code='EN') WHERE REG.status=1 AND (TREG.language_code='$lang' OR TREG.language_code='EN')
GROUP BY city_name"; GROUP BY city_id ORDER BY city_name";
$result = $this->db->query($sql)->result(); $result = $this->db->query($sql)->result();
if(count($result)>0){ if(count($result)>0){
$res = array('status'=>1,'data'=>array('cities'=>$result)); $res = array('status'=>1,'data'=>array('cities'=>$result));
......
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