Commit ad0a97c3 by Tobin

dc

parent 4f9a1319
......@@ -65,23 +65,37 @@ class Event extends CI_Controller {
$errMsg = '';
if($err == 0 && (!isset($_POST['event_name']) || empty($_POST['event_name']))){
$err = 1;
$errMsg = 'Provide Event Name';
} else if ($err == 0 && (!isset($_POST['event_discription']) || $_POST['event_discription']=='')){
$errMsg = 'Provide Event Name (English)';
}
else if($err == 0 && (!isset($_POST['event_name_ar']) || empty($_POST['event_name_ar']))){
$err = 1;
$errMsg = 'Provide Event Name (Arabic)';
}
else if ($err == 0 && (!isset($_POST['event_discription']) || $_POST['event_discription']=='')){
$err = 1;
$errMsg = 'Provide Event Description (English)';
}
else if ($err==0&&(!isset($_POST['event_discription_ar'])||$_POST['event_discription_ar']=='')){
$err = 1;
$errMsg = 'Provide Event Discription';
} else if ($err == 0 && (!isset($_POST['event_start_date']) || $_POST['event_start_date'] == '')){
$errMsg = 'Provide Event Description (Arabic)';
}
else if ($err == 0 && (!isset($_POST['event_start_date']) || $_POST['event_start_date'] == '')){
$err = 1;
$errMsg = 'Provide Event Start Date';
} else if ($err == 0 && (!isset($_POST['event_time']) || count($_POST['event_time']) <= 0)){
}
else if ($err == 0 && (!isset($_POST['event_time']) || count($_POST['event_time']) <= 0)){
$err = 1;
$errMsg = 'Provide Event Timing';
} else if ($err == 0 && (!isset($_POST['category_id']) || $_POST['category_id'] == '')){
}
else if ($err == 0 && (!isset($_POST['category_id']) || $_POST['category_id'] == '')){
$err = 1;
$errMsg = 'Provide Event Category';
} else if ($err == 0 && (!isset($_POST['tags']) || count($_POST['tags']) <= 0)){
}
else if ($err == 0 && (!isset($_POST['tags']) || count($_POST['tags']) <= 0)){
$err = 1;
$errMsg = 'Provide Proper Event Details';
} else if ($err == 0 && isset($_POST['fare_type']) && $_POST['fare_type'] == 1 &&
}
else if ($err == 0 && isset($_POST['fare_type']) && $_POST['fare_type'] == 1 &&
!isset($_POST['seat_color']) || empty($_POST['seat_color']) ||
!isset($_POST['seat_price']) || empty($_POST['seat_price']) ||
count($_POST['seat_price']) != count($_POST['seat_color'])){
......@@ -118,12 +132,14 @@ class Event extends CI_Controller {
$provider = ($this->session->userdata['user_type']==1)?'1':$this->session->userdata['id'];
$eventData = array('venue_id'=>$_POST['venue_id'],
'event_name'=>$_POST['event_name'],
'event_name_ar'=>$_POST['event_name_ar'],
'category_id'=>$_POST['category_id'],
'provider_id'=>$provider,
'max_booking'=>$_POST['max_booking'],
'has_payment'=>$_POST['has_payment'],
'seat_pricing'=>$_POST['seat_pricing'],
'event_discription'=>$_POST['event_discription'],
'event_discription_ar'=>$_POST['event_discription_ar'],
'custom_seat_layout'=>$_POST['custom_seat_layout']);
$event_id = $this->Event_model->createEvent($eventData);
......@@ -244,23 +260,37 @@ class Event extends CI_Controller {
$errMsg = '';
if($err == 0 && (!isset($_POST['event_name']) || empty($_POST['event_name']))){
$err = 1;
$errMsg = 'Provide Event Name';
} else if ($err == 0 && (!isset($_POST['event_discription']) || $_POST['event_discription']=='')){
$errMsg = 'Provide Event Name (English)';
}
else if($err == 0 && (!isset($_POST['event_name_ar']) || empty($_POST['event_name_ar']))){
$err = 1;
$errMsg = 'Provide Event Name (Arabic)';
}
else if ($err == 0 && (!isset($_POST['event_discription']) || $_POST['event_discription']=='')){
$err = 1;
$errMsg = 'Provide Event Discription (English)';
}
else if ($err==0&&(!isset($_POST['event_discription_ar'])||$_POST['event_discription_ar']=='')){
$err = 1;
$errMsg = 'Provide Event Discription';
} else if ($err == 0 && (!isset($_POST['event_start_date']) || $_POST['event_start_date'] == '')){
$errMsg = 'Provide Event Description (Arabic)';
}
else if ($err == 0 && (!isset($_POST['event_start_date']) || $_POST['event_start_date'] == '')){
$err = 1;
$errMsg = 'Provide Event Start Date';
} else if ($err == 0 && (!isset($_POST['event_time']) || count($_POST['event_time']) <= 0)){
}
else if ($err == 0 && (!isset($_POST['event_time']) || count($_POST['event_time']) <= 0)){
$err = 1;
$errMsg = 'Provide Event Timing';
} else if ($err == 0 && (!isset($_POST['category_id']) || $_POST['category_id'] == '')){
}
else if ($err == 0 && (!isset($_POST['category_id']) || $_POST['category_id'] == '')){
$err = 1;
$errMsg = 'Provide Event Category';
} else if ($err == 0 && (!isset($_POST['tags']) || count($_POST['tags']) <= 0)){
}
else if ($err == 0 && (!isset($_POST['tags']) || count($_POST['tags']) <= 0)){
$err = 1;
$errMsg = 'Provide Proper Event Details';
} else if ($err == 0 && isset($_POST['fare_type']) && $_POST['fare_type'] == 1 &&
}
else if ($err == 0 && isset($_POST['fare_type']) && $_POST['fare_type'] == 1 &&
!isset($_POST['seat_color']) || empty($_POST['seat_color']) ||
!isset($_POST['seat_price']) || empty($_POST['seat_price']) ||
count($_POST['seat_price']) != count($_POST['seat_color'])){
......@@ -297,12 +327,14 @@ class Event extends CI_Controller {
$provider = ($this->session->userdata['user_type']==1)?'1':$this->session->userdata['id'];
$eventData = array('venue_id'=>$_POST['venue_id'],
'event_name'=>$_POST['event_name'],
'event_name_ar'=>$_POST['event_name_ar'],
'category_id'=>$_POST['category_id'],
'provider_id'=>$provider,
'max_booking'=>$_POST['max_booking'],
'has_payment'=>$_POST['has_payment'],
'seat_pricing'=>$_POST['seat_pricing'],
'event_discription'=>$_POST['event_discription'],
'event_discription_ar'=>$_POST['event_discription_ar'],
'custom_seat_layout'=>$_POST['custom_seat_layout']);
$status = $this->Event_model->updateEvent($event_id, $eventData);
......
......@@ -47,7 +47,10 @@ class Tag extends CI_Controller {
$errMsg = '';
if($err == 0 && (!isset($_POST['tag_name']) || empty($_POST['tag_name']))){
$err = 1;
$errMsg = 'Provide a Tag Name';
$errMsg = 'Provide a Tag (English)';
} else if($err == 0 && (!isset($_POST['tag_name_ar']) || empty($_POST['tag_name_ar']))){
$err = 1;
$errMsg = 'Provide a Tag (Arabic)';
}
$status = $this->Tag_model->createTag($_POST);
......@@ -92,7 +95,10 @@ class Tag extends CI_Controller {
$errMsg = '';
if($err == 0 && (!isset($_POST['tag_name']) || empty($_POST['tag_name']))){
$err = 1;
$errMsg = 'Provide a Tag Name';
$errMsg = 'Provide a Tag (English)';
} else if($err == 0 && (!isset($_POST['tag_name_ar']) || empty($_POST['tag_name_ar']))){
$err = 1;
$errMsg = 'Provide a Tag (Arabic)';
}
$status = $this->Tag_model->updateTags(decode_param($tag_id),$_POST);
......
......@@ -56,7 +56,10 @@ class Venue extends CI_Controller {
$errMsg = 'Select a region';
} else if ($err == 0 && (!isset($_POST['venue_name']) || $_POST['venue_name'] == '' )){
$err = 1;
$errMsg = 'Provide a Venue Name';
$errMsg = 'Provide a Venue Name (English)';
} else if ($err == 0 && (!isset($_POST['venue_name_ar']) || $_POST['venue_name_ar'] == '' )){
$err = 1;
$errMsg = 'Provide a Venue Name (Arabic)';
} else if ($err == 0 && (!isset($_POST['location']) || $_POST['location'] == '' )){
$err = 1;
$errMsg = 'Provide a Location';
......@@ -172,7 +175,10 @@ class Venue extends CI_Controller {
$errMsg = 'Select a region';
} else if ($err == 0 && (!isset($_POST['venue_name']) || $_POST['venue_name'] == '' )){
$err = 1;
$errMsg = 'Provide a Venue Name';
$errMsg = 'Provide a Venue Name (English)';
} else if ($err == 0 && (!isset($_POST['venue_name_ar']) || $_POST['venue_name_ar'] == '' )){
$err = 1;
$errMsg = 'Provide a Venue Name (Arabic)';
} else if ($err == 0 && (!isset($_POST['location']) || $_POST['location'] == '' )){
$err = 1;
$errMsg = 'Provide a Location';
......
......@@ -29,7 +29,7 @@ $result = mysqli_query($conn, $sql);
if(mysqli_num_rows($result) > 0) {
while($row = mysqli_fetch_assoc($result)) {
$data = "{ \"notification\": { \"title\": \"".$row['event_name']."\", \"text\": \"Booking Remainder\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"booking_id\" : \"".$row['bookId']."\", \"trip_status\" : 0}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$row['fcm_token']."\"}";
$data = "{ \"notification\": { \"title\": \"".$row['event_name']."\", \"text\": \"Booking Reminder\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"booking_id\" : \"".$row['bookId']."\", \"trip_status\" : 0}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$row['fcm_token']."\"}";
$ch = curl_init("https://fcm.googleapis.com/fcm/send");
$header = array('Content-Type: application/json', 'Authorization: key='.$key);
......
......@@ -39,11 +39,11 @@
<thead>
<tr>
<th class="hidden">ID</th>
<th width="130px;">Customer Name</th>
<th width="130px;">Email</th>
<th width="80px;">Phone</th>
<th width="150px;">City</th>
<th width="50px;">Status</th>
<th width="100px;">Customer Name</th>
<th width="110px;">Email</th>
<th width="70px;">Phone</th>
<th width="100px;">City</th>
<th width="40px;">Status</th>
<th width="350px;">Action</th>
</tr>
</thead>
......
......@@ -190,12 +190,18 @@
<div class="box-body">
<div class="col-sm-12">
<div class="col-sm-6">
<div class="col-sm-4">
<div class="form-group">
<label>Event Name</label>
<label>Event Name (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="event_name" required=""
placeholder="Enter Venue Title">
placeholder="Enter Event Name (English)">
</div>
<div class="form-group">
<label>Event Name (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="event_name_ar" required=""
placeholder="Enter Event Name (Arabic)">
</div>
<?php if(!empty($category_data)){ ?>
......@@ -225,15 +231,6 @@
<input type="checkbox" name="has_payment" value="1" checked>
<p style="display:-webkit-inline-box;padding-left: 15px;">Enable Payment</p>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label>Event Description</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Venue Description" name="event_discription"
style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label>Event Images</label>
<div id="multipleImageInputCntr">
......@@ -246,6 +243,18 @@
</div>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label>Event Description (English)</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" name="event_discription" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label>Event Description (Arabic)</label>
<textarea id="rich_editor_3" type="text" class="ip_reg_form_input form-control reset-form-custom" name="event_discription_ar" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div>
</div>
</div>
</div>
......
......@@ -183,12 +183,16 @@
<div class="box-body">
<div class="col-sm-12">
<div class="col-sm-6">
<div class="col-sm-4">
<div class="form-group">
<label>Event Name (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="event_name" required placeholder="Enter Event Name (English)" value="<?= $event_data->event_name ?>">
</div>
<div class="form-group">
<label>Event Name</label>
<label>Event Name (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="event_name" required=""
placeholder="Enter Venue Title" value="<?= $event_data->event_name ?>">
data-parsley-minlength="2" name="event_name_ar" required placeholder="Enter Event Name (Arabic)" value="<?= $event_data->event_name_ar ?>">
</div>
<?php if(!empty($category_data)){ ?>
......@@ -220,11 +224,16 @@
<p style="display:-webkit-inline-box;padding-left:15px;">Enable Payment</p>
</div>
</div>
<div class="col-sm-6">
<div class="col-sm-4">
<div class="form-group">
<label>Event Description (English)</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" name="event_discription" data-parsley-trigger="change" data-parsley-minlength="2"><?= $event_data->event_discription ?></textarea>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label>Event Description</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Venue Description" name="event_discription"
style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $event_data->event_discription ?></textarea>
<label>Event Description (Arabic)</label>
<textarea id="rich_editor_3" type="text" class="ip_reg_form_input form-control reset-form-custom" name="event_discription_ar" data-parsley-trigger="change" data-parsley-minlength="2"><?= $event_data->event_discription_ar ?></textarea>
</div>
</div>
<div class="col-md-12">
......
......@@ -29,15 +29,24 @@
<div class="box-body">
<form role="form" action="<?= base_url($url) ?>" method="post"
class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-6">
<div class="col-md-4">
<div class="form-group">
<label>Tag Title</label>
<label>Tag (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="tag_name" required=""
placeholder="Enter Tag Title" value="<?= (isset($tag_data->tag_name))?$tag_data->tag_name:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label>Tag (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="tag_name_ar" required=""
placeholder="Enter Tag Title" value="<?= (isset($tag_data->tag_name_ar))?$tag_data->tag_name_ar:'' ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-12 padTop10">
<div class="box-footer textCenterAlign">
<button type="submit" class="btn btn-primary">Submit</button>
......
......@@ -39,7 +39,8 @@
<thead>
<tr>
<th class="hidden">ID</th>
<th width="500px;">Tag Name</th>
<th width="150px;">Tag (English)</th>
<th width="150px;">Tag (Arabic)</th>
<th width="100px;">Status</th>
<th width="200px;">Action</th>
</tr>
......@@ -51,6 +52,7 @@
<tr>
<th class="hidden"><?= $tag->tag_id ?></th>
<th class="center"><?= $tag->tag_name ?></th>
<th class="center"><?= $tag->tag_name_ar ?></th>
<th class="center" id="statusFlag_<?= $tag->tag_id ?>">
<?= ($tag->status == 1)?'Active':'De-activate' ?>
</th>
......
......@@ -49,7 +49,7 @@
<?php }
if(!empty($host_data)){ ?>
<div class="form-group">
<label>Venue</label>
<label>Venue Type</label>
<select name="host_cat_id" class="form-control required"
placeholder="Select Venue" required onchange="setLayout();">
<option selected disabled>Choose a Venue</option>
......@@ -66,12 +66,18 @@
</div>
<?php } ?>
<div class="form-group">
<label>Venue Title</label>
<label>Venue Name (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" name="venue_name" required="" placeholder="Enter Venue Title"
data-parsley-minlength="1" name="venue_name" required="" placeholder="Enter Venue Name (English)"
value="<?= (isset($venue_data->venue_name))?$venue_data->venue_name:'' ?>">
</div>
<div class="form-group">
<label>Venue Name (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" name="venue_name_ar" required="" placeholder="Enter Name (Arabic)"
value="<?= (isset($venue_data->venue_name_ar))?$venue_data->venue_name_ar:'' ?>">
</div>
<div class="form-group">
<label>Venue Details</label>
<textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Venue Details" name="venue_details" data-parsley-trigger="change" data-parsley-minlength="1" required="" style="height:106px;"><?= (isset($venue_data->venue_details))?$venue_data->venue_details:'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
......@@ -87,7 +93,7 @@
<input type="hidden" id="gooLocLat" value="<?= (isset($venue_data->location_lat) && !empty($venue_data->location_lat))?$venue_data->location_lat:'' ?>" />
<input type="hidden" id="gooLocLng" value="<?= (isset($venue_data->location_lng) && !empty($venue_data->location_lng))?$venue_data->location_lng:'' ?>" />
<input type="hidden" id="gooLocZoom" value="<?= (isset($venue_data->location))?15:0 ?>"/>
<div id="locPointerMap" style="height: 213px;"></div>
<div id="locPointerMap" style="height: 352px;"></div>
<?php if(!isset($venue_id) || empty($venue_id)){ ?>
<div class="form-group" style="padding-top: 5px;">
......
......@@ -325,6 +325,30 @@
padding-top:12px !important;
}
.marginTop37 {
margin-top: 37px !important;
}
.padTop30{
padding-top: 30px;
}
.marginTop10 {
margin-top: 10px !important;
}
.padLeft10 {
padding-left:10px !important;
}
.padLeft40 {
padding-left: 40px !important;
}
.padLeft15 {
padding-left:15px !important;
}
/* .padBottom10 {
padding-bottom:10px !important;
}
......@@ -365,22 +389,10 @@
padding-top:20px !important;
}
.padTop30{
padding-top: 30px;
}
.padTop300{
padding-top: 300px;
}
.marginTop10 {
margin-top: 10px !important;
}
.marginTop37 {
margin-top: 37px !important;
}
.padRight-5p {
padding-right:5% !important;
}
......@@ -397,14 +409,6 @@
padding-right:20px !important;
}
.padLeft10 {
padding-left:10px !important;
}
.padLeft15 {
padding-left:15px !important;
}
.padLeft20 {
padding-left:20px !important;
}
......@@ -413,10 +417,6 @@
padding-left: 30px !important;
}
.padLeft40 {
padding-left: 40px !important;
}
.padLeft50 {
padding-left: 50px !important;
}
......
......@@ -163,7 +163,7 @@ jQuery('[id="viewVenueDetails"]').on('click',function() {
'<div class="row"> '+
'<div class="col-md-6" style="text-align:center;"> '+
'<img id="driverLicenceImg" src="'+base_url+venue_data['layout']+'"'+
'style="margin-top:10px;width:auto;max-width:200px;height:200px;" />'+
'style="margin-top:10px;width:auto;max-width:190px;height:auto;" />'+
'</div>';
jQuery.each(jQuery.parseJSON(venue_data['layout_details']), function (indexLayout, layoutValue) {
......
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