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

application/config/database.php

@@ -76,9 +76,9 @@ $query_builder = TRUE;
 $db['default'] = array(
 	'dsn'	=> '',
 	'hostname' => 'localhost',
-	'username' => 'nuvento_timeout',
+	'username' => 'root',
     'password' => 'Golden_123',
-	'database' => 'nuvento_timeout',
+    'database' => 'timeout_uat',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,

application/controllers/Webservice.php

@@ -564,10 +564,9 @@ class Webservice extends CI_Controller {
     $data = (array) json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
     $res = $this->Webservice_model->validate_promo_code($data);
-    if($res['status']!=0){
+    if($res['status'] == 1 || $res['status'] == 5){
       $this->response($res['data']);
-    }
-    else{
+    }else{
       $this->errorResponse($res['code'],$res['message']);
     }
   }

application/models/Validation_app_model.php

@@ -49,9 +49,9 @@ class Validation_app_model extends CI_Model {
 			'no_of_ticket'=>array('required'=>array('code'=>'ER31', 'message'=>'Number of ticket is null or empty')),
 			'ticket_details'=>array('required'=>array('code'=>'ER32', 'message'=>'Ticket details is null or empty'))),
 			'cancel_booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
-			'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty')),),
+			'booking_id'=>array('required'=>array('code'=>'ER34', 'message'=>'Booking Id is null or empty'))),
 			'update_fcm_token'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
-			'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty')),),
+			'fcm_token'=>array('required'=>array('code'=>'ER16', 'message'=>'Fcm token is null or empty'))),
 			'get_favorites_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
 			'get_booking_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
 			'settings'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),

application/models/Webservice_model.php

@@ -1290,7 +1290,6 @@ class Webservice_model extends CI_Model {
 							$pricelist = json_decode($rs->seat_pricing, TRUE);
 							$price = $pricelist['price'] * $rate;
 						}
-						$lang = $this->getCountryData($user_id);
 						$resData = array(
 							'event_id'=>$rs->event_id,
 							'image'=>$rs->media_url,
@@ -1701,6 +1700,7 @@ class Webservice_model extends CI_Model {
 						  	ORDER BY EVT.event_id DESC
 						  	LIMIT $limit";
 
+				  	$resp = array();
 				  	$result = $this->db->query($sql)->result();
 				  	foreach ($result AS $key => $rs) {
 					  	if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
@@ -1714,13 +1714,16 @@ class Webservice_model extends CI_Model {
 							}
 							if($checkTime == count($dates)){
 								unset($result[$key]);
+								continue;
 							}
 						} else {
 							unset($result[$key]);
+							continue;
 						}
 						unset($result[$key]->date_time);
+						$resp[] = $result[$key];
 					}
-					$res = array('status'=>1,'data'=>array('events'=>$result,'meta'=>$meta));
+					$res = array('status'=>1,'data'=>array('events'=>$resp,'meta'=>$meta));
 			    } else {
 					$res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));
 		 		} 
@@ -1897,9 +1900,8 @@ class Webservice_model extends CI_Model {
 				 	continue;
 				}
 				$sql = "SELECT CUST.name,CUST.phone,CUST.profile_image,CUST.profile_image_qr,
-							   CUST.customer_id,CAUTH.auth_token AS fcm_token
+							   CUST.customer_id,CUST.fcm_token
 						FROM customer AS CUST
-						INNER JOIN customer_auth AS CAUTH ON (CAUTH.user_id=CUST.customer_id)
 						WHERE CUST.customer_id='$fromUsrId'";
 				$cust = $this->db->query($sql);
 				if(!empty($cust) && !empty($cust = $cust->row_array())){

sql/timeout_run_sql.sql

-INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
-INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
-INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
-INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');
-INSERT INTO `review` (`id`, `event_id`, `customer_id`, `rate`, `feedback`) VALUES (NULL, '89', '107', '2', 'dff');