t : flight booking changes : uat

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,7 +309,6 @@ 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,

application/controllers/OrganizerServices.php

@@ -352,6 +352,16 @@ class OrganizerServices extends CI_Controller {
     }
   }
 
+  public function acceptBooking(){
+    $data = (array) json_decode(file_get_contents('php://input'));
+    $res = $this->Organizer_model->acceptBooking($data);
+    if($res['status'] != 0){
+      $this->successResponse($res);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
   /*================ END : Organizer API ================*/
 }
 ?>

application/models/Validation_app_model.php

@@ -955,234 +955,310 @@ class Validation_app_model extends CI_Model {
 			'target' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Target Field is null or empty'
 				)
 			),
 			'session_id' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Session Id is null or empty'
 				)
 			),
 			'area_code' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Area Code is null or empty'
 				)
 			),
 			'country_code' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Country Code is null or empty'
 				)
 			),
 			'first_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'First Name is null or empty'
 				)
 			),
 			'last_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Last Name is null or empty'
 				)
 			),
 			'title' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Title Field is null or empty'
 				)
 			),
 			'email_id' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Email ID is null or empty'
 				)
 			),
 			'mobile_no' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Mobile Number is null or empty'
 				)
 			),
 			'dob' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'DOB is null or empty'
 				)
 			),
 			'gender' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Gender is null or empty'
 				)
 			),
 			'issue_country' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Issue Country is null or empty'
 				)
 			),
 			'passport_expiry' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Passport Expiry Field is null or empty'
 				)
 			),
 			'passport_no' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Passport Number is null or empty'
 				)
 			),
 			'type' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Type Field is null or empty'
 				)
 			),
 			'IsPassportMandatory' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Is Passport Mandatory Field is null or empty'
 				)
 			),
 			'adult_flight' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Adult flight is null or empty'
 				)
 			),
 			'child_flight' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Flight is null or empty'
 				)
 			),
 			'infant_flight' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Flight is null or empty'
 				)
 			),
 			'frequentFlyrNum' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Frequent Flyr Number Field is null or empty'
 				)
 			),
 			'adultmealplan' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Adult Meal Plan Field is null or empty'
 				)
 			),
 			'child_dob' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Dob is null or empty'
 				)
 			),
 			'child_gender' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Gender is null or empty'
 				)
 			),
 			'child_title' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Title is null or empty'
 				)
 			),
 			'child_first_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child First Name is null or empty'
 				)
 			),
 			'child_last_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Last Name is null or empty'
 				)
 			),
 			'child_passport_expiry_date' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Passport Expiry Date is null or empty'
 				)
 			),
 			'child_passport_no' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Passport Number is null or empty'
 				)
 			),
 			'child_frequentFlyrNum' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Frequent Flyr Number is null or empty'
 				)
 			),
 			'childMealplan' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Child Meal Plan is null or empty'
 				)
 			),
 			'infant_dob' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Dob is null or empty'
 				)
 			),
 			'infant_gender' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Gender is null or empty'
 				)
 			),
 			'infant_first_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant First Name is null or empty'
 				)
-			),'infant_last_name' => array(
+			),
+			'infant_last_name' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Last Name is null or empty'
 				)
 			),
 			'infant_title' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Title is null or empty'
 				)
 			),
 			'infantMealplan' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Infant Meal Plan is null or empty'
 				)
 			),
 			'FareSourceCode' => array(
 				'required' => array(
 					'code' => 'ER02',
-					'message' => 'User Id is null or empty'
+					'message' => 'Fare Source Code is null or empty'
 				)
 			),
 			'PostCode' => array(
 				'required' => array(
 					'code' => 'ER02',
+					'message' => 'PostCode is null or empty'
+				)
+			),
+		),
+		'flight_ticket_order'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'target' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Target Field is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
+			'UniqueID' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Unique Id is null or empty'
+				)
+			),
+		),
+		'flight_trip_details'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
 					'message' => 'User Id is null or empty'
 				)
 			),
+			'target' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Target Field is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
+			'UniqueID' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Unique Id is null or empty'
+				)
+			),
+		),
+		'cancel_flights'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'target' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Target Field is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Field is null or empty'
+				)
+			),
+			'UniqueID' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Unique ID is null or empty'
+				)
+			),
 		),
-		'flight_ticket_order'=>array(),
-		'flight_trip_details'=>array(),
-		'cancel_flights'=>array(),
 		'create_guest_user' => array(),
 		'update_user_visibility' => array(
 			'visible' => array(

application/models/Validation_organizer_model.php

@@ -152,6 +152,12 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'User Type is null or empty'
 				)
 			),
+			'fcm_token' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'FCM Token is null or empty'
+				)
+			),
 		),
 		'changePassword'=>array(
 			'new_password' => array(
@@ -389,9 +395,17 @@ class Validation_organizer_model extends CI_Model {
 			'checker_id' => array(
 				'required' => array(
 					'code' => 'ER04',
-					'message' => 'checker ID is null or empty'
+					'message' => 'Checker ID is null or empty'
 				)
 			)
+		),
+		'acceptBooking'=>array(
+			'booking_id' => array(
+				'required' => array(
+					'code' => 'ER04',
+					'message' => 'Booking Id is null or empty'
+				)
+			),
 		)
 	);