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

application/controllers/Api.php

@@ -439,6 +439,8 @@ class Api extends CI_Controller {
     $pText .= '1110000|'.$last_id.'|'.$event_id.'|'.$booking_id.'||';
     if($saveCard == 1){
       $pText .= '1000000|'.$userId;
+    } else {
+      $pText .= '0000000';
     }
 
     $settings   = getSettings();
@@ -699,6 +701,9 @@ class Api extends CI_Controller {
   }
 
   public function addCard(){
+    $settings   = getSettings();
+    $redUrl     = $settings['web_base_url'];
+
     $data = (array) json_decode(file_get_contents('php://input'));
     $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
     if(empty($reqData) || empty($reqData = json_decode($reqData,true)) || 

application/controllers/Booking.php

@@ -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(){
 		$template['page'] = 'Booking/viewBooking';
         $template['menu'] = 'Booking Management';

application/controllers/Event.php

@@ -250,7 +250,7 @@ class Event extends CI_Controller {
             $err = 1;
             $errMsg = 'Provide Event Name (English)';
         } 
-        else if ($err == 0 && (!isset($_POST['event_description_EN']) || $_POST['event_description_EN']=='')){
+        else if ($err==0&&(!isset($_POST['event_description_EN'])||$_POST['event_description_EN']=='')){
             $err = 1;
             $errMsg = 'Provide Event Description (English)';
         }  
@@ -279,7 +279,7 @@ class Event extends CI_Controller {
         }
 
         $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment']==1)?'1':'0';
-        $_POST['approve_booking'] = (isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?'1':'0';
+        $_POST['approve_booking']=(isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?1:0;
 
         $_POST['seat_pricing'] = $_POST['custom_seat_layout'] = '';
         if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){
@@ -309,10 +309,8 @@ class Event extends CI_Controller {
         $_POST['max_booking'] = (isset($_POST['max_booking']) && !empty($_POST['max_booking']))?
                                     $_POST['max_booking']:'14';
 
-        $provider = ($this->session->userdata['user_type']==1)?'1':$this->session->userdata['id'];
         $eventData = array('venue_id'=>$_POST['venue_id'],
                            'category_id'=>$_POST['category_id'],
-                           'provider_id'=>$provider,
                            'max_booking'=>$_POST['max_booking'],
                            'has_payment'=>$_POST['has_payment'],
                            'seat_pricing'=>$_POST['seat_pricing'],

application/controllers/Webservice.php

@@ -615,6 +615,7 @@ class Webservice extends CI_Controller {
     }
   }
 
+  /*********************************** START Hotel API ****************************************/
   public function get_hotel_city_list(){
     $data = $_GET;
     $data['auth_token'] = $this->auth_token;
@@ -691,10 +692,10 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
+  /*********************************** END Hotel API ****************************************/
 
 
-  /*******************************Flight API******************************************/
-
+  /********************************** START Flight API ***************************************/
   public function flight_authenticate(){
     $data = (array)json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
@@ -782,9 +783,6 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
-
-
-
-
+  /******************************* END Flight API******************************************/
 }
 ?>

application/models/Api_model.php

@@ -626,7 +626,6 @@ class Api_model extends CI_Model {
 										   'redeem_amount'=>$post_data['redeem_amount'],
 										   'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
 				}
-				$card_data = $post_data['cardData'];
 				$auth_token = $post_data['auth_token'];
  				unset($post_data['auth_token'],$post_data['has_payment'],$post_data['cardData'],
  					  $post_data['promocode_id'],$post_data['redeem_amount']);
@@ -637,7 +636,7 @@ class Api_model extends CI_Model {
 						$this->db->insert('promocode_used',$promocodeData);
 					}
 					$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 
 						switch($card_data->card_type) {
 							case '1': $cardDetails['cardMode'] = 'CC'; break;

application/models/Organizer_model.php

@@ -1045,8 +1045,7 @@ class Organizer_model extends CI_Model {
  			$count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows();
 			if($count > 0){
  				$sql = "SELECT BOOK.bookId AS booking_id
-						FROM checker_bookings AS CBOOK
-						INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
+						FROM booking AS BOOK
 						INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
 						INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
 						WHERE CHK.id='$checker_id' AND BOOK.status='1'";
@@ -1060,8 +1059,7 @@ class Organizer_model extends CI_Model {
  					if($count > $limit) {
 						$sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
 									   EDATE.time,BOOK.amount,BOOK.bookId AS booking_id 
-							    FROM checker_bookings AS CBOOK
-							    INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
+							    FROM booking AS BOOK
 							    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
 				    			INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
 							    INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)

application/models/Webservice_model.php

@@ -229,7 +229,14 @@ class Webservice_model extends CI_Model {
 				$settingsDetails = $this->db->query($sql)->row_array();
 				$settingsDetails['contact_number'] = $settings['contact_number'];
 
-				$userDetails = $this->db->query("SELECT customer.name AS name, customer.profile_image AS profile_photo,customer.profile_image_qr,customer.gender AS gender, customer.email, customer.dob, customer.profile_city AS city_name, users.notification_status, users.email_status FROM customer INNER JOIN users ON users.id = customer.customer_id WHERE customer.customer_id = ".$user_id." AND users.status = 1 ")->row_array();
+				$sql = "SELECT customer.name AS name,customer.profile_image AS profile_photo,
+							   customer.profile_image_qr,customer.gender AS gender,customer.email,
+							   customer.dob,customer.profile_city AS city_name,users.email_status,
+							   users.notification_status,customer.enable_chat AS user_visible 
+					    FROM customer 
+					    INNER JOIN users ON users.id=customer.customer_id 
+					    WHERE customer.customer_id=$user_id AND users.status='1'";
+				$userDetails = $this->db->query($sql)->row_array();
 				if(count($settingsDetails)>0 && count($userDetails)){
 					$resultData = array();					
 					$resultData = array_merge($settingsDetails, $userDetails);
@@ -780,7 +787,7 @@ class Webservice_model extends CI_Model {
 					   	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";
+					   	GROUP BY city_id ORDER BY city_name";
 				$result = $this->db->query($sql)->result();
 				if(count($result)>0){
 					$res = array('status'=>1,'data'=>array('cities'=>$result));

application/views/Provider/viewProvider.php

@@ -41,7 +41,7 @@
                   <th class="hidden">ID</th>
                   <th width="80px;">Organizer</th>
                   <th width="80px;">User Name</th>
-                  <th width="100px;">Email_id</th>
+                  <th width="80px;">Email_id</th>
                   <th width="70px;">Phone</th>
                   <th width="60px;">Status</th>
                   <th width="600px;">Action</th>