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

application/models/Api_model.php

@@ -626,6 +626,7 @@ class Api_model extends CI_Model {
 										   'redeem_amount'=>$post_data['redeem_amount'],
 										   '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'],
  					  $post_data['promocode_id'],$post_data['redeem_amount']);
 
@@ -634,8 +635,13 @@ class Api_model extends CI_Model {
 					if(!empty($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,
-		 						 'bookingCode'=>$post_data['bookId']));
+		 						 'bookingCode'=>$post_data['bookId'],'reqData'=>$reqData));
+
 
 		 			if($status == 1){
 		 				$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
@@ -932,8 +938,7 @@ class Api_model extends CI_Model {
 		 	} 	
 		 	
  			if(!empty($user_id)) {
- 				$sql = "SELECT SUM(no_of_ticket) AS bookCount
-						FROM booking AS BOK
+ 				$sql = "SELECT SUM(no_of_ticket) AS bookCount FROM booking AS BOK
 						WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)";
 				$result = $this->db->query($sql)->row_array();
 				if(!empty($result)){

application/models/Validation_app_model.php

@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model {
 					'code' => 'ER02',
 					'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(
@@ -1172,6 +1163,15 @@ class Validation_app_model extends CI_Model {
 		'flight_ticket_order'=>array(),
 		'flight_trip_details'=>array(),
 		'cancel_flights'=>array(),
+		'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) {

application/models/Validation_model.php

@@ -428,4 +428,4 @@ class Validation_model extends CI_Model {
  	} 	
 }
 
-?>
+?>
\ No newline at end of file

application/views/Booking/viewBooking.php

@@ -78,7 +78,9 @@
                           <i class="fa fa-fw fa-eye"></i>View
                         </a> <br>
                         <?php 
-                          if($this->session->userdata('user_type')==2 && $booking->book_status == '6'){
+                          if(($this->session->userdata('user_type')==1 && $booking->provider_id==1 && 
+                              $booking->book_status=='6') || 
+                             ($this->session->userdata('user_type')==2 && $booking->book_status=='6')){
                             $msg = "Are you sure to Aprove this booking ?";
                             $bookId = encode_param($booking->booking_id);
                             $param = "{'booking_id':'$bookId','alertMsg':'$msg'}"; ?>

application/views/Staff/staffForm.php

@@ -59,12 +59,12 @@
                       <div class="col-md-3">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="4" name="user_type" checked>
-                        <label class="padLeft10">Staff User</label>
+                        <label class="padLeft10">Staff</label>
                       </div>
                       <div class="col-md-5">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="5" name="user_type">
-                        <label class="padLeft10">Customer User</label>
+                        <label class="padLeft10">Customer</label>
                       </div>
                     </div> 
                   </div>