Skip to content

T
TimeOutAdmin
Commit c5455fd6 by Tobin
Options

t : payment with add card

parent 7646b619
Showing with 157 additions and 92 deletions
application/models/Api_model.php
...@@ -626,6 +626,7 @@ class Api_model extends CI_Model { ...@@ -626,6 +626,7 @@ 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);
} }
$auth_token = $post_data['auth_token'];
unset($post_data['auth_token'],$post_data['has_payment'], unset($post_data['auth_token'],$post_data['has_payment'],
$post_data['promocode_id'],$post_data['redeem_amount']); $post_data['promocode_id'],$post_data['redeem_amount']);
...@@ -634,8 +635,13 @@ class Api_model extends CI_Model { ...@@ -634,8 +635,13 @@ class Api_model extends CI_Model {
if(!empty($promocodeData)){ if(!empty($promocodeData)){
$this->db->insert('promocode_used',$promocodeData); $this->db->insert('promocode_used',$promocodeData);
} }
$reqData = array('amount'=>$post_data['amount'],'event_id'=>$post_data['event_id'],
'cardData'=>array('1'),'auth_token'=>$auth_token,
'booking_id'=>$post_data['bookId']);
$res = array('status'=>1,'data'=>array('user_id'=>$user_id, $res = array('status'=>1,'data'=>array('user_id'=>$user_id,
'bookingCode'=>$post_data['bookId'])); 'bookingCode'=>$post_data['bookId'],'reqData'=>$reqData));
if($status == 1){ if($status == 1){
$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone, $sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
...@@ -932,8 +938,7 @@ class Api_model extends CI_Model { ...@@ -932,8 +938,7 @@ class Api_model extends CI_Model {
} }
if(!empty($user_id)) { if(!empty($user_id)) {
$sql = "SELECT SUM(no_of_ticket) AS bookCount $sql = "SELECT SUM(no_of_ticket) AS bookCount FROM booking AS BOK
FROM booking AS BOK
WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)"; WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)";
$result = $this->db->query($sql)->row_array(); $result = $this->db->query($sql)->row_array();
if(!empty($result)){ if(!empty($result)){
......
application/models/Validation_app_model.php
...@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model { ...@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model {
'code' => 'ER02', 'code' => 'ER02',
'message' => 'User id is null or empty' 'message' => 'User id is null or empty'
) )
),
'create_guest_user' => array(),
'update_user_visibility' => array(
'visible' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Required field is null or empty'
)
)
) )
), ),
'upload_audio_message' => array( 'upload_audio_message' => array(
...@@ -895,6 +886,15 @@ class Validation_app_model extends CI_Model { ...@@ -895,6 +886,15 @@ class Validation_app_model extends CI_Model {
), ),
), ),
'create_guest_user' => array(),
'update_user_visibility' => array(
'visible' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Required field is null or empty'
)
)
)
); );
public function validation_check($method_name, $parms) { public function validation_check($method_name, $parms) {
......
application/models/Validation_model.php
...@@ -428,4 +428,4 @@ class Validation_model extends CI_Model { ...@@ -428,4 +428,4 @@ class Validation_model extends CI_Model {
} }
} }
?> ?>
\ No newline at end of file
application/models/Webservice_model.php
...@@ -224,7 +224,8 @@ class Webservice_model extends CI_Model { ...@@ -224,7 +224,8 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$settings = getSettings(); $settings = getSettings();
$sql = "SELECT faq FROM translator_policies WHERE language_code='$lang'"; $sql = "SELECT faq FROM translator_policies
WHERE language_code='$lang' OR language_code='EN'";
$settingsDetails = $this->db->query($sql)->row_array(); $settingsDetails = $this->db->query($sql)->row_array();
$settingsDetails['contact_number'] = $settings['contact_number']; $settingsDetails['contact_number'] = $settings['contact_number'];
...@@ -719,7 +720,8 @@ class Webservice_model extends CI_Model { ...@@ -719,7 +720,8 @@ class Webservice_model extends CI_Model {
$sql = "SELECT TC.category_id,TC.category_name,TC.category_image $sql = "SELECT TC.category_id,TC.category_name,TC.category_image
FROM translator_category AS TC FROM translator_category AS TC
INNER JOIN event_category AS ECAT ON (ECAT.cat_id=TC.category_id) INNER JOIN event_category AS ECAT ON (ECAT.cat_id=TC.category_id)
WHERE ECAT.status = 1 AND (TC.language_code='$lang' OR TC.language_code='EN') $where WHERE ECAT.status = 1 AND (TC.language_code='$lang' OR TC.language_code='EN')
$where
GROUP BY ECAT.cat_id ORDER BY ECAT.priority"; GROUP BY ECAT.cat_id ORDER BY ECAT.priority";
$result = $this->db->query($sql)->result(); $result = $this->db->query($sql)->result();
if(count($result) > 0){ if(count($result) > 0){
...@@ -771,7 +773,13 @@ class Webservice_model extends CI_Model { ...@@ -771,7 +773,13 @@ class Webservice_model extends CI_Model {
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$result = $this->db->query("SELECT REG.id AS city_id, REG.region_icon AS city_image,TREG.region_name AS city_name FROM region AS REG INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) WHERE REG.status = 1 AND TREG.language_code='$lang' GROUP BY city_name")->result(); $sql = "SELECT REG.id AS city_id, REG.region_icon AS city_image,
TREG.region_name AS city_name
FROM region AS REG
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')
GROUP BY city_name";
$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));
} else { } else {
...@@ -793,11 +801,13 @@ class Webservice_model extends CI_Model { ...@@ -793,11 +801,13 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
if($user_id > 0) { if($user_id > 0) {
if(isset($data['city_id']) && !empty($data['city_id'])){ if(isset($data['city_id']) && !empty($data['city_id'])){
$re = $this->db->query("SELECT TREG.region_name FROM region AS REG $city_id = $data['city_id'];
INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) $sql = "SELECT TREG.region_name FROM region AS REG
WHERE REG.status='1' AND TREG.language_code='$lang' AND INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id)
REG.id='".$data['city_id']."' WHERE REG.status='1' AND REG.id='$city_id' AND
GROUP BY REG.id")->row(); (TREG.language_code='$lang' OR TREG.language_code='EN')
GROUP BY REG.id";
$re = $this->db->query($sql)->row();
$cityName = $re->region_name; $cityName = $re->region_name;
$cityId = $data['city_id']; $cityId = $data['city_id'];
}else{ }else{
...@@ -806,7 +816,8 @@ class Webservice_model extends CI_Model { ...@@ -806,7 +816,8 @@ class Webservice_model extends CI_Model {
SELECT REG.id,TREG.region_name,REG.status, (((acos(sin((".$data['latitude']."*pi()/180)) * sin((region_lat*pi()/180)) + cos((".$data['latitude']."*pi()/180)) * cos((region_lat*pi()/180)) * cos(((".$data['longitude']." - region_lng)*pi()/180))))*180/pi())*60*1.1515) as distance SELECT REG.id,TREG.region_name,REG.status, (((acos(sin((".$data['latitude']."*pi()/180)) * sin((region_lat*pi()/180)) + cos((".$data['latitude']."*pi()/180)) * cos((region_lat*pi()/180)) * cos(((".$data['longitude']." - region_lng)*pi()/180))))*180/pi())*60*1.1515) as distance
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' WHERE REG.status = '1' AND
(TREG.language_code='$lang' OR TREG.language_code='EN')
HAVING distance < ".$radius." HAVING distance < ".$radius."
ORDER BY distance ASC LIMIT 1")->row_array(); ORDER BY distance ASC LIMIT 1")->row_array();
if(!empty($data)){ if(!empty($data)){
...@@ -848,7 +859,8 @@ class Webservice_model extends CI_Model { ...@@ -848,7 +859,8 @@ class Webservice_model extends CI_Model {
} }
$settings = getSettings(); $settings = getSettings();
$sql = "SELECT instruction FROM translator_policies WHERE language_code='$lang'"; $sql = "SELECT instruction FROM translator_policies
WHERE language_code='$lang' OR language_code='EN'";
$settingsDetails = $this->db->query($sql)->row_array(); $settingsDetails = $this->db->query($sql)->row_array();
$settingsDetails['contact_number'] = $settings['contact_number']; $settingsDetails['contact_number'] = $settings['contact_number'];
...@@ -1138,18 +1150,21 @@ class Webservice_model extends CI_Model { ...@@ -1138,18 +1150,21 @@ class Webservice_model extends CI_Model {
if($status == 1){ if($status == 1){
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code'];
$bkData = $this->db->query(" $bookId = $post_data['bookId'];
SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone, $lang = $countryData['language_code'];
CONCAT(EDATE.date,' ',EDATE.time) AS show_time $sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
FROM booking AS BK CONCAT(EDATE.date,' ',EDATE.time) AS show_time
INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id) FROM booking AS BK
INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id) INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id) INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
WHERE BK.bookId='".$post_data['bookId']."' AND EVT.status='1' AND INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
BK.status='1' AND EDATE.status='1' AND TEVT.language_code='$lang'")->row_array(); WHERE BK.bookId='$bookId' AND EVT.status='1' AND
BK.status='1' AND EDATE.status='1' AND
(TEVT.language_code='$lang' OR TEVT.language_code='EN')";
$bkData = $this->db->query($sql)->row_array();
$subject = "Your Tickets - TimeOut"; $subject = "Your Tickets - TimeOut";
$showTime = date("d'S F Y - h:i, (l)",strtotime($bkData['show_time'])); $showTime = date("d'S F Y - h:i, (l)",strtotime($bkData['show_time']));
$msgContent = "Hi, Your booking is confirmed for the event '". $msgContent = "Hi, Your booking is confirmed for the event '".
...@@ -1396,15 +1411,15 @@ class Webservice_model extends CI_Model { ...@@ -1396,15 +1411,15 @@ class Webservice_model extends CI_Model {
translator_event.event_name,booking.qrcode AS event_image, translator_event.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,
(CASE booking.status WHEN 1 THEN 0 WHEN 2 THEN 1 WHEN 0 THEN 2 booking.status AS booking_status
ELSE 2 END) AS booking_status
FROM booking FROM booking
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 ON translator_event.event_id=events.event_id
WHERE booking.customer_id = '$user_id' AND booking.status IN(0,1,2,6) AND WHERE booking.customer_id = '$user_id' AND booking.status IN(0,1,2,6)
(translator_event.language_code='$lang' OR translator_event.language_code='EN') AND (translator_event.language_code='$lang' OR
translator_event.language_code='EN')
GROUP BY booking.id GROUP BY booking.id
ORDER BY booking.id DESC ORDER BY booking.id DESC
LIMIT $page_limit, $per_page"; LIMIT $page_limit, $per_page";
...@@ -1440,7 +1455,7 @@ class Webservice_model extends CI_Model { ...@@ -1440,7 +1455,7 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$sql = "SELECT privacy_policy,terms_and_conditions $sql = "SELECT privacy_policy,terms_and_conditions
FROM translator_policies WHERE language_code='$lang'"; FROM translator_policies WHERE (language_code='$lang' OR language_code='EN')";
$setDetails = $this->db->query($sql)->row_array(); $setDetails = $this->db->query($sql)->row_array();
$setDetails['contact_number'] = $settings['contact_number']; $setDetails['contact_number'] = $settings['contact_number'];
...@@ -1553,7 +1568,8 @@ class Webservice_model extends CI_Model { ...@@ -1553,7 +1568,8 @@ class Webservice_model extends CI_Model {
FROM locality AS LOC FROM locality AS LOC
INNER JOIN customer AS CUST ON (CUST.city=LOC.region_id) INNER JOIN customer AS CUST ON (CUST.city=LOC.region_id)
INNER JOIN translator_locality AS TLOC ON (TLOC.locality_id=LOC.id) INNER JOIN translator_locality AS TLOC ON (TLOC.locality_id=LOC.id)
WHERE CUST.customer_id='$user_id' AND LOC.status='1' AND TLOC.language_code='$lang' WHERE CUST.customer_id='$user_id' AND LOC.status='1' AND
(TLOC.language_code='$lang' OR TLOC.language_code='EN')
GROUP BY LOC.id"; GROUP BY LOC.id";
$locality = $this->db->query($sql)->result(); $locality = $this->db->query($sql)->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