Skip to content

T
TimeOutAdmin
Commit 4404870f by Jansa Jose
Options

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

parents 2b60ed7b 4a965bdf
Showing with 36 additions and 20 deletions
application/controllers/Venue.php
......@@ -118,12 +118,14 @@ class Venue extends CI_Controller {
$_POST['location_lat'] = $locData['lat'];
$_POST['location_lng'] = $locData['lng'];
$locality = '';
if(isset($_POST['locality']) && !empty($_POST['locality'])){
$locality = $_POST['locality'];
$locality = array();
if(isset($_POST['locality']) && !empty($_POST['locality']) &&
isset($_POST['locality_ar']) && !empty($_POST['locality_ar'])){
$locality['locality'] = $_POST['locality'];
$locality['locality_ar'] = $_POST['locality_ar'];
}
unset($_POST['locality'],$_POST['locality_type'],$_POST['has_layout'],$_POST['seat_color'],
$_POST['seat_price'],$_POST['seat_capacity']);
$_POST['seat_price'],$_POST['seat_capacity'],$_POST['locality_ar']);
$status = $this->Venue_model->createVenue($_POST,$locality);
if($status == 1){
......
application/models/Venue_model.php
......@@ -22,13 +22,15 @@ class Venue_model extends CI_Model {
return 0;
}
public function createVenue($venueData = array(),$locality = ''){
public function createVenue($venueData = array(),$locality = array()){
if(empty($venueData)){
return 0;
}
if(!empty($locality)){
$status = $this->db->insert('locality',
array('locality'=>$locality,'region_id'=>$venueData['region_id']));
array('locality'=>$locality['locality'],
'locality_ar'=>$locality['locality_ar'],
'region_id'=>$venueData['region_id']));
if($status){
$venueData['locality_id'] = $this->db->insert_id();
......
application/views/Venue/venueAddForm.php
......@@ -82,19 +82,6 @@
<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>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Venue Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required
name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>">
</div>
<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: 352px;"></div>
<?php if(!isset($venue_id) || empty($venue_id)){ ?>
<div class="form-group" style="padding-top: 5px;">
<label id="localityLabel">Venue Locality</label>
......@@ -109,7 +96,14 @@
</div>
</div>
<div id="addNew" class="form-group">
<input type="text" class="form-control required" data-parsley-trigger="change" name="locality" placeholder="Locality">
<div style="width:49%;display:inline-block;">
<input type="text" class="form-control required" data-parsley-trigger="change"
name="locality" placeholder="Locality (English)">
</div>
<div style="width:49%;display:inline-block;">
<input type="text" class="form-control required" data-parsley-trigger="change"
name="locality_ar" placeholder="Locality (Arabic)">
</div>
</div>
<div id="useExist" class="form-group hide">
<select name="locality_id" class="form-control" placeholder="Select Locality"></select>
......@@ -117,6 +111,16 @@
</div>
<?php } ?>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Venue Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>">
</div>
<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: 352px;"></div>
</div>
<input id="has_layout" type="hidden" name="has_layout" value='0'>
<div class="col-md-12" id="layoutCntr" class="hide">
<!-- Layout Container -->
......
assets/js/custom-script.js
......@@ -758,10 +758,14 @@ jQuery('[name="locality_type"]').on('click',function(event) {
jQuery('[id="addNew"]').addClass('hide');
jQuery('[name="locality"]').prop("disabled",true);
jQuery('[name="locality"]').removeClass("required");
jQuery('[name="locality_ar"]').prop("disabled",true);
jQuery('[name="locality_ar"]').removeClass("required");
} else {
jQuery('[id="addNew"]').removeClass('hide');
jQuery('[name="locality"]').prop("disabled",false);
jQuery('[name="locality"]').addClass("required");
jQuery('[name="locality_ar"]').prop("disabled",false);
jQuery('[name="locality_ar"]').addClass("required");
jQuery('[id="useExist"]').addClass('hide');
jQuery('[name="locality_id"]').prop("disabled",true);
......@@ -794,6 +798,8 @@ jQuery('[name="region_id"]').on('change',function(){
jQuery('[id="addNew"]').removeClass('hide');
jQuery('[name="locality"]').prop("disabled",false);
jQuery('[name="locality"]').addClass("required");
jQuery('[name="locality_ar"]').prop("disabled",false);
jQuery('[name="locality_ar"]').addClass("required");
jQuery('[id="useExist"]').addClass('hide');
jQuery('[name="locality_id"]').prop("disabled",true);
......@@ -804,6 +810,8 @@ jQuery('[name="region_id"]').on('change',function(){
jQuery('[id="addNew"]').addClass('hide');
jQuery('[name="locality"]').prop("disabled",true);
jQuery('[name="locality"]').removeClass("required");
jQuery('[name="locality_ar"]').prop("disabled",true);
jQuery('[name="locality_ar"]').removeClass("required");
jQuery('[id="useExist"]').removeClass('hide');
jQuery('[name="locality_id"]').prop("disabled",false);
......
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