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

application/models/HotelServices_model.php

@@ -73,10 +73,10 @@ class HotelServices_model extends CI_Model {
 			if($user_id > 0) {
 	    		$trackingId = time().rand(100000,999999);
 	    		$settings = getSettings();
+				$countryData = $this->getCountryData($user_id);
 	    		if(!isset($data['nextToken']) && empty($data['nextToken'])){
 					$this->db->select('nationality');
 					$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
-					$countryData = $this->getCountryData($user_id);
 	    		}
 				$url = (isset($data['nextToken']) && !empty($data['nextToken']))?"https://trawex.biz/api/hotel_trawexv5/getMoreHotels?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&nextToken=".$data['nextToken']."&trackingId=".$data['trackingId']."":"https://trawex.biz/api/hotel_trawexv5/hotel_search";
 				if(!isset($data['nextToken']) && empty($data['nextToken'])){

application/models/Organizer_model.php

@@ -216,9 +216,9 @@ class Organizer_model extends CI_Model {
 	            if(isset($postData['show_type']) && !empty($postData['show_type'])){
 		            $this->db->update('event_date_time',array('status'=>'0'),
 							   array('status'=>'1','event_id'=>$postData['event_id']));
+		            $showTiming = is_array($postData['show_timing'])?$postData['show_timing']:json_decode($postData['show_timing']);
 	            	if($postData['show_type'] == 1){
 		                $date = $postData['start_date'];
-		                $showTiming = is_array($postData['show_timing'])?$postData['show_timing']:json_decode($postData['show_timing']);
 		                foreach ($showTiming AS $time) {
 		                    $insertEventDate[] = array('event_id'=>$postData['event_id'],'date'=>$date,'time'=>$time);
 		                }
@@ -226,7 +226,7 @@ class Organizer_model extends CI_Model {
 		                $cdate = strtotime($postData['start_date']);
 		                while ($cdate <= strtotime($postData['end_date'])) {
 		                    $cdate = date('Y-m-d',$cdate);
-		                    foreach (json_decode($postData['show_timing']) AS $time) {
+		                    foreach ($showTiming AS $time) {
 		                        $insertEventDate[] = array('event_id'=>$postData['event_id'],'date'=>$cdate,'time'=>$time);
 		                    }
 		                    $cdate = strtotime($cdate . ' +1 day');

application/models/Webservice_model.php

@@ -1110,7 +1110,7 @@ class Webservice_model extends CI_Model {
 					$status = $post_data['status'] = '1';
 				}
 
-				if(isset($post_data['wallet']) && $post_data['wallet'] == 1){
+				if(isset($post_data['isWallet']) && $post_data['isWallet'] == 1){
 					$amt = (isset($post_data['discounted_price']) && !empty($post_data['discounted_price']))?$post_data['discounted_price']:$post_data['amount'];
 					$sql = "SELECT balance_amount FROM wallet WHERE customer_id='$user_id'";
 					$wallet = $this->db->query($sql)->row_array();