Skip to content

T
TimeOutAdmin
Commit 473c3a72 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !14
parents fc912f1e 192f4333
Showing with 370 additions and 30 deletions
application/controllers/CMS.php
......@@ -33,7 +33,7 @@ class CMS extends CI_Controller {
}
public function changeCMSdata(){
$url = 'cms';
$url = 'CMS';
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST)){
$this->session->set_flashdata('message',$flashMsg);
......
application/controllers/Webservice.php
......@@ -24,6 +24,7 @@ class Webservice extends CI_Controller {
$this->load->model('Webservice_model');
$this->load->model('Validation_app_model');
$method = $this->router->fetch_method();
$data = (array) json_decode(file_get_contents('php://input'));
if($method == 'profile') {
$data = $_POST;
......@@ -73,8 +74,8 @@ class Webservice extends CI_Controller {
}
}
public function get_places_list($cat_id = null) {
$data['cat_id'] = $cat_id;
public function get_events_list() {
$data = $_GET;
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->discover($data);
if($res['status']!=0){
......@@ -85,13 +86,15 @@ class Webservice extends CI_Controller {
}
}
public function place_details($event_id = null) {
if($event_id == null) {
public function events_details($event_id = null) {
$data['event_id'] = $_GET['event_id'];
$data['auth_token'] = $this->auth_token;
if($data['event_id'] == null) {
$this->errorResponse("ER16","Event id is null or empty");
die;
}
$data['event_id'] = $event_id;
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->event($data);
if($res['status']!=0){
$this->response($res['data']);
......@@ -103,12 +106,29 @@ class Webservice extends CI_Controller {
public function response($data) {
$result = array(
'status' => 'Success',
'status' => 'success',
'data' =>$data
);
print json_encode($result);
}
public function favResponse($data) {
$result = array(
'status' => 'success',
'data' => array(
'favorite_events' =>$data)
);
print json_encode($result);
}
public function successResponse($data) {
$result = array(
'status' => 'success',
);
print json_encode($result);
}
public function errorResponse($errorCode, $errorDesc) {
$result = array(
'status' => 'error',
......@@ -117,4 +137,237 @@ class Webservice extends CI_Controller {
);
print json_encode($result);
}
public function get_category_list($query = null) {
$data['query'] = $_GET['query'];
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_category_list($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function add_favorites(){
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->add_favorites($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_cities_list() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_cities_list($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function update_city(){
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->update_city($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function booking_summary($booking_id = null) {
$data['booking_id'] = $_GET['booking_id'];
if($data['booking_id'] == null) {
$this->errorResponse("ER34","Booking id is null or empty");
die;
}
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->booking_summary($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function payment(){
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->payment($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function event_rating(){
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->event_rating($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function update_notification_email_status(){
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->update_notification_email_status($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function profile_details() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->profile_details($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function profile_edit() {
$data = $_POST;
if(isset($_FILES['profile_photo'])) {
$data['file'] = $_FILES['profile_photo'];
}
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->update_profile($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function booking() {
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->booking($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function cancel_booking() {
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->cancel($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_favorites_list() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->favouritelist($data);
if($res['status']!=0){
$this->favResponse($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_booking_list() {
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->bookedlist($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function settings() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_settings($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function forgot_password() {
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Webservice_model->forgot_password($data);
if($res['status']!=0){
$this->successResponse($res);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_last_booking() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_last_booking($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function filters() {
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->filters($data);
if($res['status']!=0){
$this->response($res['data']);
}
else{
$this->errorResponse($res['code'],$res['message']);
}
}
}
?>
\ No newline at end of file
application/models/Validation_app_model.php
......@@ -3,11 +3,8 @@
class Validation_app_model extends CI_Model {
public $validation_array = array(
'login'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')
),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),
)
),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')),
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),)),
'check_email_availability'=> array('email'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')
),
......@@ -24,12 +21,91 @@ class Validation_app_model extends CI_Model {
'password'=>array('required'=>array('code'=>'ER04', 'message'=>'Password is null or empty'),
)
),
'get_places_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
'get_events_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'filters'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'events_details'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'get_category_list'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'get_last_booking'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'place_details'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
'add_favorites'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER16', 'message'=>'Event id is null or empty')),
'is_favorite'=>array('required'=>array('code'=>'ER21', 'message'=>'Is favorate is null or empty')),),
'get_cities_list'=>array('auth_token'=>array('required'=>array('code'=>'ER19', 'message'=>'User Id is null or empty'),
)
),
'update_city'=>array('auth_token'=>array('required'=>array('code'=>'ER19', 'message'=>'User Id is null or empty'),
)
),
'booking_summary'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),
)
),
'payment'=> 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'))),
'event_rating'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'rating'=>array('required'=>array('code'=>'ER26', 'message'=>'Rating is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER27', 'message'=>'Event id is null or empty')),
'description'=>array('required'=>array('code'=>'ER28', 'message'=>'description id is null or empty')),),
'update_notification_email_status'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'notification_status'=>array('required'=>array('code'=>'ER24', 'message'=>'Notification Status is null or empty')),
'email_status'=>array('required'=>array('code'=>'ER25', 'message'=>'Email status id is null or empty')),),
'profile_details'=>array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty'),)),
'profile_edit'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),),
'booking'=> array('auth_token'=>array('required'=>array('code'=>'ER17', 'message'=>'User Id is null or empty')),
'event_id'=>array('required'=>array('code'=>'ER20', 'message'=>'Event id is null or empty')),
'customer_id'=>array('required'=>array('code'=>'ER29', 'message'=>'Customer id is null or empty')),
'event_date_id'=>array('required'=>array('code'=>'ER30', 'message'=>'Event date id is null or empty')),
'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')),
'amount'=>array('required'=>array('code'=>'ER33', 'message'=>'Amount 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')),),
'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'),
)
),
'forgot_password'=> array('new_password'=>array('required'=>array('code'=>'ER35', 'message'=>'New password is null or empty')),
'phone'=>array('required'=>array('code'=>'ER07', 'message'=>'Phone is null or empty')),),
);
public function validation_check($method_name, $parms) {
......@@ -54,10 +130,10 @@ class Validation_app_model extends CI_Model {
case 'phone':
if(isset($parms[$key])){
$phone = preg_replace('/[^0-9]/', '', $parms[$key]);
if (strlen($phone) !== 10) {
/*if (strlen($phone) !== 10) {
$state = 1;
$error_key = $values;
}
} */
}
break;
......@@ -78,3 +154,4 @@ class Validation_app_model extends CI_Model {
return array('state'=>$state,'response'=>$error_key);
}
}
?>
\ No newline at end of file
application/views/CMS/cms_management.php
......@@ -29,42 +29,42 @@
<div class="col-sm-6">
<div class="form-group">
<label>FAQ English</label>
<label>FAQ (English)</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="FAQ English" name="faq_en" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->faq_en ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>FAQ Arabic</label>
<label>FAQ (Arabic)</label>
<textarea id="rich_editor_3" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="FAQ Arabic" name="faq_ar" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->faq_ar ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Privacy Policy English</label>
<label>Privacy Policy (English)</label>
<textarea id="rich_editor_1" type="text" placeholder="Privacy Policy English" class="ip_reg_form_input form-control reset-form-custom" name="privacy_policy_en" style="height:108px;" data-parsley-minlength="2" data-parsley-trigger="change"><?= $cmsData->privacy_policy_en ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Privacy Policy Arabic</label>
<label>Privacy Policy (Arabic)</label>
<textarea id="rich_editor_4" type="text" placeholder="Privacy Policy Arabic" class="ip_reg_form_input form-control reset-form-custom" name="privacy_policy_ar" style="height:108px;" data-parsley-minlength="2" data-parsley-trigger="change"><?= $cmsData->privacy_policy_ar ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Terms and Condition English</label>
<label>Terms and Condition (English)</label>
<textarea id="rich_editor_2" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Terms and Condition English" name="terms_and_conditions_en" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->terms_and_conditions_en ?></textarea>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Terms and Condition Arabic</label>
<label>Terms and Condition (Arabic)</label>
<textarea id="rich_editor_5" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Terms and Condition Arabic" name="terms_and_conditions_ar" style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $cmsData->terms_and_conditions_ar ?></textarea>
</div>
</div>
......
application/views/Templates/footer-script.php
......@@ -25,12 +25,20 @@
<script>
jQuery('.clockpicker').clockpicker();
jQuery( document ).ready(function() {
if(jQuery('#rich_editor').length == 1) { CKEDITOR.replace('rich_editor'); }
if(jQuery('#rich_editor_1').length == 1) { CKEDITOR.replace('rich_editor_1'); }
if(jQuery('#rich_editor_2').length == 1) { CKEDITOR.replace('rich_editor_2'); }
if(jQuery('#rich_editor_3').length == 1) { CKEDITOR.replace('rich_editor_3'); }
if(jQuery('#rich_editor_4').length == 1) { CKEDITOR.replace('rich_editor_4'); }
if(jQuery('#rich_editor_5').length == 1) { CKEDITOR.replace('rich_editor_5'); }
if(jQuery('#rich_editor').length==1){ CKEDITOR.replace('rich_editor'); }
if(jQuery('#rich_editor_1').length==1){CKEDITOR.replace('rich_editor_1'); }
if(jQuery('#rich_editor_2').length==1){CKEDITOR.replace('rich_editor_2'); }
if(jQuery('#rich_editor_3').length==1){CKEDITOR.replace('rich_editor_3',{language:'ar'});}
if(jQuery('#rich_editor_4').length==1){CKEDITOR.replace('rich_editor_4',{language:'ar'});}
if(jQuery('#rich_editor_5').length==1){CKEDITOR.replace('rich_editor_5',{language:'ar'});}
});
CKEDITOR.replace('editor2', {
extraPlugins: 'language',
// Customizing list of languages available in the Language drop-down.
language_list: ['ar:Arabic:rtl', 'fr:French', 'he:Hebrew:rtl', 'es:Spanish'],
height: 270
});
function doconfirm(){
......
application/views/Venue/venueAddForm.php
......@@ -38,7 +38,7 @@
<option selected disabled>Choose a Region</option>
<?php
foreach ($regionData as $region) {
$select = (isset($venue_data->region_id) && $region->region_id == $region->region_id)?'selected':'';
$select = (isset($venue_data->region_id) && $venue_data->region_id == $region->id)?'selected':'';
echo '<option '.$select.' value="'.$region->id.'">'.
$region->name.
'</option>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment