Skip to content

J
joyride phase2
Commit 8055a1fb by Jansa Jose
Options

admin panel and webservice change

parent 78546579
Showing with 27 additions and 13 deletions
application/controllers/Login.php
......@@ -40,7 +40,8 @@ class Login extends CI_Controller {
);
$resulttitles = $this->Settings_model->settings_viewing();
$sessing_arrays = array(
'title' => $resulttitles->title
'title' => $resulttitles->title,
'title_short'=>$resulttitles->title_short
);
$this->session->set_userdata('title', $sessing_arrays);
$this->session->set_userdata('logged_in',$sess_array);
......
application/controllers/Settings_ctrl.php
......@@ -153,7 +153,8 @@ class Settings_ctrl extends CI_Controller {
$sessing_arrays = array(
'title' => $resulttitles->title
'title' => $resulttitles->title,
'title_short'=>$resulttitles->title_short
);
......
application/helpers/general_helper.php
......@@ -324,6 +324,12 @@ function get_bookdate($id){
}
function settings(){
$CI = & get_instance();
$rs = $CI->db->get('settings')->row();
return $rs;
}
......
application/models/Booking_model.php
......@@ -19,7 +19,7 @@ class Booking_model extends CI_Model {
function view_popup_all($id){
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as user_name,booking.*");
$this->db->join('ride','ride.id = booking.ride_id');
$this->db->join('users','users.id = ride.users_id');
$this->db->join('users','users.id = ride.users_id','left');
$query = $this->db->where('booking.id', $id);
//$query = $this->db->where('status',0);
$query = $this->db->get('booking');
......
application/models/Webservice_model.php
......@@ -866,7 +866,7 @@ function get_cars_details(){
/////////////////////////offerride/////////////////////////////////////
function car_offer_select($request){
$this->db->where('user_id',$request);
$this->db->select('car_details.car_type,car_details.id,car_make.car_type as car_name');
$this->db->select('car_details.car_type,car_details.no_of_seats,car_details.id,car_make.car_type as car_name');
$this->db->from('car_details');
$this->db->join('car_make','car_details.car_make=car_make.id','left');
$query= $this->db->get();
......
application/views/Settings/add-settings.php
......@@ -37,7 +37,7 @@
<!-- general form elements -->
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Add Settings</h3>
<h3 class="box-title">Web Settings</h3>
</div><!-- /.box-header -->
<!-- form start -->
<form role="form" action="" method="post" data-parsley-validate="" class="validate" enctype="multipart/form-data">
......@@ -76,6 +76,13 @@
<input class="form-control regcom required" type="text" name="admin_email" data-parsley-trigger="keyup" required="" id="admin_email" value="<?php echo $result->admin_email; ?>" >
</div>
<div class="form-group">
<label class="intrate">Kilometre Charge</label>
<input class="form-control regcom required" type="text" name="kmcharge" data-parsley-trigger="keyup" required="" id="kmcharge" value="<?php echo $result->kmcharge; ?>" >
</div>
......@@ -83,6 +90,11 @@
<div class="col-md-6">
<div class="form-group">
<label class="intrate">Title Short</label>
<input class="form-control required regcom" type="text" name="title_short" data-parsley-maxlength="5" data-parsley-trigger="keyup" required="" id="smtp_username" value="<?php echo $result->title_short; ?>">
</div>
<div class="form-group">
<label class="intrate">Sender Id</label>
......@@ -120,12 +132,6 @@
<label class="intrate">Admin Charge</label>
<input class="form-control regcom required" type="text" name="admin_charge" data-parsley-trigger="keyup" required="" id="admin_charge" value="<?php echo $result->admin_charge; ?>" >
</div>
<div class="form-group">
<label class="intrate">Kilometre Charge</label>
<input class="form-control regcom required" type="text" name="kmcharge" data-parsley-trigger="keyup" required="" id="kmcharge" value="<?php echo $result->kmcharge; ?>" >
</div>
</div>
......
application/views/Templates/header-menu.php
......@@ -8,13 +8,13 @@ $admin_detail = pull_admin();
<a href="<?php echo base_url(); ?>" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels -->
<!-- <span class="logo-mini"><b>G</b>L</span> -->
<span class="logo-mini"><b>G</b>L</span>
<span class="logo-mini"><b><?php echo $this->session->userdata('title')['title_short']; ?></b></span>
<!-- logo for regular state and mobile devices -->
<!-- <span class="hidden-xs"><?php //echo $settings->title; ?> -->
<!-- <span class="hidden-xs">Get A Lift
</span> -->
<span class="hidden-xs">JoyRide
<span class="hidden-xs"><?php echo $this->session->userdata('title')['title']; ?>
</span>
</a>
......
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