Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

application/controllers/Api.php

@@ -331,10 +331,10 @@ class Api extends CI_Controller {
     $res = $this->Api_model->payNow($payData);
 
     if($res['status']==1){
-       $this->paymentGateway($amount,$res['transaction_id'],$event_id,$booking_id,$res['custData'],$cardData);
+      $this->paymentGateway($amount,$res['transaction_id'],$event_id,$booking_id,$res['custData'],$cardData);
     }
     else{
-       redirect($redUrl.'failure?event_id='.$eventid);
+      redirect($redUrl.'failure?event_id='.$eventid);
     }
   }
 
@@ -355,15 +355,15 @@ class Api extends CI_Controller {
 
     $saveCard  = 1;
     $savedCard = 0;
-    $cvv = $tocken = $cardNo = $holder = $cardType = $expMonth = $expYear = '';
-    if(!empty($cardData)){
-      $cardData = $this->encrypt($cardData,$this->local_key,$this->local_iv);
-      if(empty($cardData)){
+    $cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = '';
+    if(!empty($cardData) && !empty($cardData = urldecode($cardData))){
+      $cardData = $this->decrypt($cardData,$this->local_key,$this->local_iv);
+      if(empty($cardData) || empty($cardData = json_decode($cardData,true))){
         redirect($redUrl.'failure');
       } else if (isset($cardData['cvv']) && !empty($cardData['cvv']) && 
-                 isset($cardData['tocken']) && !empty($cardData['tocken'])){
+                 isset($cardData['token']) && !empty($cardData['token'])){
         $cvv        = $cardData['cvv'];
-        $tocken     = $cardData['tocken'];
+        $token      = $cardData['token'];
         $savedCard  = 1;
       } else if(isset($cardData['cvv']) && !empty($cardData['cvv']) || 
                 isset($cardData['cardType']) && !empty($cardData['cardType']) || 
@@ -395,7 +395,7 @@ class Api extends CI_Controller {
     $pText .= '111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
               '|SA|'.$phone.'|34|344|34355344||';
     if($savedCard == 1){
-      $pText .= '00010000001|'.$cvv.'|'.$tocken.'||';
+      $pText .= '00010000001|'.$cvv.'|'.$token.'||';
     } else {
       $pText .='11111100000|'.$cardNo.'|'.$expMonth.'|'.$expYear.'|'.$cvv.'|'.$holder.'|'.$cardType.'||';
     }

application/models/Webservice_model.php

@@ -713,13 +713,13 @@ class Webservice_model extends CI_Model {
 				$where = '';
 				$countryData = $this->getCountryData($user_id);
 				$lang = $countryData['language_code'];
-				if(isset($data['query'])) {
+				if(isset($data['query']) && !empty($data['query'])) {
 					$where = ' AND TC.category_name LIKE '."'%".$data['query'].'%'."'";
 				}
 				$sql = "SELECT TC.category_id,TC.category_name,TC.category_image
 						FROM translator_category AS TC 
 						INNER JOIN event_category AS ECAT ON (ECAT.cat_id=TC.category_id)
-						WHERE ECAT.status = 1 AND TC.language_code='$lang' $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";
 				$result = $this->db->query($sql)->result();
 				if(count($result) > 0){
@@ -839,11 +839,12 @@ class Webservice_model extends CI_Model {
 				$countryData = $this->getCountryData($user_id);
 				$lang = $countryData['language_code'];
 
+				$kk = array();
 				$sql = "SELECT ticket_details FROM booking WHERE bookId='$bookId'";
 				$ticketDetails = $this->db->query($sql)->row();
-				$res = json_decode($ticketDetails->ticket_details);
-				if(!empty($res)){
-					$kk['ticket_rate'] = "$res->price";
+				if(!empty($ticketDetails)){
+					$res = json_decode($ticketDetails->ticket_details);
+					$kk['ticket_rate'] = (!empty($res))?"$res->price":'';
 				}
 
 				$settings = getSettings();
@@ -854,10 +855,12 @@ class Webservice_model extends CI_Model {
 				$sql = "SELECT booking.qrcode,events.event_id,events.venue_id,event_date_time.date,
 							   events.has_payment AS is_payment_required,booking.bookId AS ticket_id,
 							   event_gallery.media_url AS event_image,booking.amount AS total_rate,
-							   event_date_time.time,venue.location AS address,customer.name AS profile_name,
+							   event_date_time.time,venue.location AS address,
+							   customer.name AS profile_name,
 							   venue.location_lng AS longitude,venue.location_lat AS latitude,
-							   booking.no_of_ticket AS ticket_count,customer.profile_image AS profile_photo,
-							   customer.profile_image_qr
+							   booking.no_of_ticket AS ticket_count,
+							   customer.profile_image AS profile_photo,
+							   customer.profile_image_qr,booking.status
 						FROM events 
 						LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND 
 												   event_gallery.media_type=0 
@@ -879,6 +882,7 @@ class Webservice_model extends CI_Model {
 					$resultData = array();
 					$result['is_payment_required'] = ($result['is_payment_required'] == 1) ? true: false;
 					$resultData = array_merge($settingsDetails, $result,!empty($kk)?$kk:[]);
+					$resultData['currency_symbol'] = $countryData['currency_symbol'];
 					$res = array('status'=>1,'data'=>$resultData);
 				} else {
 					$res = array('status'=>0,'message'=>'No records found','code'=>'ER13');