Skip to content

J
joyride phase2
Commit 78546579 by Jansa Jose
Options

changes in admin panel

parent 56aea612
Showing with 441 additions and 15 deletions
application/controllers/Booking.php
...@@ -35,6 +35,25 @@ class Booking extends CI_Controller { ...@@ -35,6 +35,25 @@ class Booking extends CI_Controller {
$this->load->view('Booking/allbooking-view-popup',$template); $this->load->view('Booking/allbooking-view-popup',$template);
} }
public function print_invoices(){
$id=$_POST['bookingdetailsval'];
$template['data'] = $this->Booking_model->view_popup_all($id);
$this->load->view('Booking/allbooking-view-popup-print',$template);
}
public function print_invoices_cancelled(){
$id=$_POST['bookingdetailsval'];
$template['data'] = $this->Booking_model->view_popup_cancelled($id);
$this->load->view('Booking/allbooking-view-popupcancelled-print',$template);
}
public function print_invoices_completed(){
$id=$_POST['bookingdetailsval'];
$template['data'] = $this->Booking_model->view_popup_completed($id);
$this->load->view('Booking/allbooking-view-popupcompleted-print',$template);
}
......
application/helpers/general_helper.php
...@@ -62,7 +62,7 @@ function get_total_drivers($id){ ...@@ -62,7 +62,7 @@ function get_total_drivers($id){
function get_customername($id){ function get_customername($id){
$CI = & get_instance(); $CI = & get_instance();
$rs = $CI->db->select('first_name')->where('id',$id)->get('users')->row(); $rs = $CI->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as first_name")->where('id',$id)->get('users')->row();
return $rs->first_name; return $rs->first_name;
} }
......
application/models/Booking_model.php
...@@ -17,8 +17,10 @@ class Booking_model extends CI_Model { ...@@ -17,8 +17,10 @@ class Booking_model extends CI_Model {
function view_popup_all($id){ function view_popup_all($id){
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as user_name,booking.*");
$query = $this->db->where('id', $id); $this->db->join('ride','ride.id = booking.ride_id');
$this->db->join('users','users.id = ride.users_id');
$query = $this->db->where('booking.id', $id);
//$query = $this->db->where('status',0); //$query = $this->db->where('status',0);
$query = $this->db->get('booking'); $query = $this->db->get('booking');
...@@ -63,13 +65,27 @@ function get_completedbooking(){ ...@@ -63,13 +65,27 @@ function get_completedbooking(){
function view_popup_completed($id){ function view_popup_completed($id){
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as user_name,booking_approve.*");
$this->db->join('users','users.id = booking_approve.driver_id');
$this->db->where('booking_approve.id', $id);
//$query = $this->db->where('status',0);
$this->db->where('status',2);
$query = $this->db->get('booking_approve');
$result = $query->row();
return $result;
/*
$query = $this->db->where('id', $id); $query = $this->db->where('id', $id);
$query = $this->db->where('status',2); $query = $this->db->where('status',2);
$query = $this->db->get('booking_approve'); $query = $this->db->get('booking_approve');
$result = $query->row(); $result = $query->row();
return $result; return $result; */
} }
...@@ -86,13 +102,30 @@ function get_completedbooking(){ ...@@ -86,13 +102,30 @@ function get_completedbooking(){
function view_popup_cancelled($id){ function view_popup_cancelled($id){
$query = $this->db->where('id', $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');
$query = $this->db->where('booking.id', $id);
$query = $this->db->where('status',2); $query = $this->db->where('status',2);
//$query = $this->db->where('status',0);
$query = $this->db->get('booking'); $query = $this->db->get('booking');
$result = $query->row(); $result = $query->row();
return $result; return $result;
/*
$query = $this->db->where('id', $id);
$query = $this->db->where('status',2);
$query = $this->db->get('booking');
$result = $query->row();
return $result; */
} }
......
application/models/Webservice_model.php
...@@ -946,6 +946,9 @@ function get_cars_details(){ ...@@ -946,6 +946,9 @@ function get_cars_details(){
'comments'=>isset($request['comments'])?$request['comments']:'', 'comments'=>isset($request['comments'])?$request['comments']:'',
'max_luggage'=>$request['max_luggage'], 'max_luggage'=>$request['max_luggage'],
'users_id'=>$request['users_id'], 'users_id'=>$request['users_id'],
'stopover_lng'=>$request['stopover_lng'],
'stopover'=>$request['stopover'],
'stopover_lat'=>$request['stopover_lat'],
'car_id'=>$request['car_id'] 'car_id'=>$request['car_id']
); );
/*if($request['check']=="round"){ /*if($request['check']=="round"){
......
application/views/Booking/allbooking-view-popup-print.php 0 → 100644
<div class="row" >
<div class="col-md-6">
<div id="content">
<div class="box-header">
<h3 class="box-title"><b>Booking Details</b></h3>
<!-- <div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div> -->
</div>
<div class="box-body">
<dl>
<dt style="padding-top: 15px">
Name : <span style="font-weight: normal !important"><?php echo get_customername($data->user_id);?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Driver Name : <span style="font-weight: normal !important"><?php echo $data->user_name;?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking ID : <span style="font-weight: normal !important"><?php echo $data->booking_id; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking Date : <span style="font-weight: normal !important"><?php echo $data->booking_date; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Departure Point : <span style="font-weight: normal !important"><?php echo $data->departure_point; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Drop Point : <span style="font-weight: normal !important"><?php echo $data->drop_point; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Amount : <span style="font-weight: normal !important"><?php echo $data->amount; ?></span>
</dt>
<br/>
</dl>
</div><!-- /.box-body -->
</div><!-- /.box -->
<div id="editor"></div>
<!-- <div class="form-group">
<input type="button" class="btn btn-primary" value="Print" id="getPrint">
</div> -->
</div><!-- ./col -->
<!-- <div class="col-md-6">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">View All Bookings</h3>
<div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div>
</div>
</div>
</div> -->
</div>
\ No newline at end of file
application/views/Booking/allbooking-view-popupcancelled-print.php 0 → 100644
<div class="row" >
<div class="col-md-6">
<div id="content">
<div class="box-header">
<h3 class="box-title"><b>Cancelled Booking Details</b></h3>
<!-- <div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div> -->
</div>
<div class="box-body">
<dl>
<dt style="padding-top: 15px">
Name : <span style="font-weight: normal !important"><?php echo get_customername($data->user_id);?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Driver Name : <span style="font-weight: normal !important"><?php echo $data->user_name;?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking ID : <span style="font-weight: normal !important"><?php echo $data->booking_id; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking Date : <span style="font-weight: normal !important"><?php echo $data->booking_date; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Departure Point : <span style="font-weight: normal !important"><?php echo $data->departure_point; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Drop Point : <span style="font-weight: normal !important"><?php echo $data->drop_point; ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Amount : <span style="font-weight: normal !important"><?php echo $data->amount; ?></span>
</dt>
<br/>
</dl>
</div><!-- /.box-body -->
</div><!-- /.box -->
<div id="editor"></div>
<!-- <div class="form-group">
<input type="button" class="btn btn-primary" value="Print" id="getPrint">
</div> -->
</div><!-- ./col -->
<!-- <div class="col-md-6">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">View All Bookings</h3>
<div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div>
</div>
</div>
</div> -->
</div>
\ No newline at end of file
application/views/Booking/allbooking-view-popupcompleted-print.php 0 → 100644
<div class="row" >
<div class="col-md-6">
<div id="content">
<div class="box-header">
<h3 class="box-title"><b>Completed Booking Details</b></h3>
<!-- <div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div> -->
</div>
<div class="box-body">
<dl>
<dt style="padding-top: 15px">
Name : <span style="font-weight: normal !important"><?php echo get_custname($data->ride_id);;?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Driver Name : <span style="font-weight: normal !important"><?php echo $data->user_name;?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking ID : <span style="font-weight: normal !important"><?php echo get_bookid($data->ride_id); ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Booking Date : <span style="font-weight: normal !important"><?php echo get_bookdate($data->ride_id); ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Departure Point : <span style="font-weight: normal !important"><?php echo get_deppoint($data->ride_id); ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Drop Point : <span style="font-weight: normal !important"><?php echo get_droppoint($data->ride_id); ?></span>
</dt>
<br/>
<dt style="padding-top: 15px">
Amount : <span style="font-weight: normal !important"><?php echo $data->amount; ?></span>
</dt>
<br/>
</dl>
</div><!-- /.box-body -->
</div><!-- /.box -->
<div id="editor"></div>
<!-- <div class="form-group">
<input type="button" class="btn btn-primary" value="Print" id="getPrint">
</div> -->
</div><!-- ./col -->
<!-- <div class="col-md-6">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">View All Bookings</h3>
<div class="box-tools pull-right">
<button class="btn btn-info btn-sm" title="" data-toggle="tooltip" data-widget="collapse" data-original-title="Collapse">
<i class="fa fa-minus"></i>
</button>
</div>
</div>
</div>
</div> -->
</div>
\ No newline at end of file
application/views/Booking/view-allbooking.php
...@@ -71,7 +71,10 @@ ...@@ -71,7 +71,10 @@
<a class="btn btn-sm bg-olive show-allbookingdetails" href="javascript:void(0);" data-id="<?php echo $all->id; ?>"> <a class="btn btn-sm bg-olive show-allbookingdetails" href="javascript:void(0);" data-id="<?php echo $all->id; ?>">
<i class="fa fa-fw fa-eye"></i> View </a> <i class="fa fa-fw fa-eye"></i> View </a><br><br>
<a class="btn btn-sm btn-primary print_invoices" href="javascript:void(0);" data-id="<?php echo $all->id; ?>" >
<i class="fa fa-fw fa-edit"></i>Print Invoices</a>
</td> </td>
</tr> </tr>
...@@ -122,3 +125,23 @@ ...@@ -122,3 +125,23 @@
</div> </div>
<!-- /.modal-dialog --> <!-- /.modal-dialog -->
</div> </div>
<div class="modal fade" id="popup-patientModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">View Booking Details</h4>
</div>
<div class="modal-patientbody1">
</div>
<div class="business_info">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="getPrint">Print</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
\ No newline at end of file
application/views/Booking/view-cancelledbooking.php
...@@ -65,7 +65,10 @@ ...@@ -65,7 +65,10 @@
<a class="btn btn-sm bg-olive show-cancelledbookingdetails" href="javascript:void(0);" data-id="<?php echo $all->id; ?>"> <a class="btn btn-sm bg-olive show-cancelledbookingdetails" href="javascript:void(0);" data-id="<?php echo $all->id; ?>">
<i class="fa fa-fw fa-eye"></i> View </a> <i class="fa fa-fw fa-eye"></i> View </a> <br><br>
<a class="btn btn-sm btn-primary print_invoices_cancelled" href="javascript:void(0);" data-id="<?php echo $all->id; ?>" >
<i class="fa fa-fw fa-edit"></i>Print Invoices</a>
</td> </td>
</tr> </tr>
...@@ -116,3 +119,23 @@ ...@@ -116,3 +119,23 @@
</div> </div>
<!-- /.modal-dialog --> <!-- /.modal-dialog -->
</div> </div>
<div class="modal fade" id="popup-patientModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">View Cancelled Booking Details</h4>
</div>
<div class="modal-patientbody1">
</div>
<div class="business_info">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="getPrint">Print</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
\ No newline at end of file
application/views/Booking/view-completedbooking.php
...@@ -73,6 +73,9 @@ ...@@ -73,6 +73,9 @@
<i class="fa fa-fw fa-eye"></i> View </a> <i class="fa fa-fw fa-eye"></i> View </a>
<a class="btn btn-sm btn-primary print_invoices_completed" href="javascript:void(0);" data-id="<?php echo $all->id; ?>" >
<i class="fa fa-fw fa-edit"></i>Print Invoices</a>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -122,3 +125,23 @@ ...@@ -122,3 +125,23 @@
</div> </div>
<!-- /.modal-dialog --> <!-- /.modal-dialog -->
</div> </div>
<div class="modal fade" id="popup-patientModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">View Completed Booking Details</h4>
</div>
<div class="modal-patientbody1">
</div>
<div class="business_info">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="getPrint">Print</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
\ No newline at end of file
application/views/Templates/footer-script.php
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script> <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/pace.js"></script> <script src="<?php echo base_url(); ?>assets/js/pace.js"></script>
<script src="<?php echo base_url(); ?>assets/js/bootstrap-datepicker.js"></script> <script src="<?php echo base_url(); ?>assets/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/0.9.0rc1/jspdf.min.js"></script>
<!-- DataTables --> <!-- DataTables -->
<script src="<?php echo base_url(); ?>assets/js/jquery.dataTables.min.js"></script> <script src="<?php echo base_url(); ?>assets/js/jquery.dataTables.min.js"></script>
......
application/views/Templates/header-menu.php
...@@ -10,7 +10,7 @@ $admin_detail = pull_admin(); ...@@ -10,7 +10,7 @@ $admin_detail = pull_admin();
<!-- <span class="logo-mini"><b>G</b>L</span> --> <!-- <span class="logo-mini"><b>G</b>L</span> -->
<span class="logo-mini"><b>G</b>L</span> <span class="logo-mini"><b>G</b>L</span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<!-- <span class="hidden-xs"><?php echo $settings->title; ?> --> <!-- <span class="hidden-xs"><?php //echo $settings->title; ?> -->
<!-- <span class="hidden-xs">Get A Lift <!-- <span class="hidden-xs">Get A Lift
</span> --> </span> -->
......
assets/js/backend-script.js
...@@ -77,7 +77,7 @@ $('.show-driverdetails').on("click", function(){ ...@@ -77,7 +77,7 @@ $('.show-driverdetails').on("click", function(){
$(function(){ $(function(){
$('.show-allbookingdetails').on("click", function(){ $('.show-allbookingdetails').on("click", function(){
var patientdetailsval = $(this).attr("data-id"); var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>'; var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal .modal-patientbody').html(loader); $('#popup-patientModal .modal-patientbody').html(loader);
...@@ -95,15 +95,49 @@ $('.show-allbookingdetails').on("click", function(){ ...@@ -95,15 +95,49 @@ $('.show-allbookingdetails').on("click", function(){
} }
}); });
}) })
$('.print_invoices').on("click",function(){
var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal1 .modal-patientbody1').html(loader);
$('#popup-patientModal1').modal({show:true});
$.ajax({
type: "POST",
url: base_url+'Booking/print_invoices',
data: {'bookingdetailsval':patientdetailsval},
cache: false,
success: function(result)
{
$('#popup-patientModal1 .modal-patientbody1').html(result);
}
});
});
}); });
var doc = new jsPDF();
var specialElementHandlers = {
'#editor': function (element, renderer) {
return true;
}
};
$('#getPrint').on("click",function(){
doc.fromHTML($('#content').html(), 15, 15, {
'width': 170,
'elementHandlers': specialElementHandlers
});
doc.save('Booking_Details.pdf');
});
$(function(){ $(function(){
$('.show-completedbookingdetails').on("click", function(){ $('.show-completedbookingdetails').on("click", function(){
var patientdetailsval = $(this).attr("data-id"); var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>'; var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal .modal-patientbody').html(loader); $('#popup-patientModal .modal-patientbody').html(loader);
...@@ -122,7 +156,27 @@ $('.show-completedbookingdetails').on("click", function(){ ...@@ -122,7 +156,27 @@ $('.show-completedbookingdetails').on("click", function(){
} }
}); });
}) })
$('.print_invoices_completed').on("click",function(){
var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal1 .modal-patientbody1').html(loader);
$('#popup-patientModal1').modal({show:true});
$.ajax({
type: "POST",
url: base_url+'Booking/print_invoices_completed',
data: {'bookingdetailsval':patientdetailsval},
cache: false,
success: function(result)
{
$('#popup-patientModal1 .modal-patientbody1').html(result);
}
});
});
}); });
...@@ -130,7 +184,7 @@ $('.show-completedbookingdetails').on("click", function(){ ...@@ -130,7 +184,7 @@ $('.show-completedbookingdetails').on("click", function(){
$(function(){ $(function(){
$('.show-cancelledbookingdetails').on("click", function(){ $('.show-cancelledbookingdetails').on("click", function(){
var patientdetailsval = $(this).attr("data-id"); var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>'; var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal .modal-patientbody').html(loader); $('#popup-patientModal .modal-patientbody').html(loader);
...@@ -149,7 +203,27 @@ $('.show-cancelledbookingdetails').on("click", function(){ ...@@ -149,7 +203,27 @@ $('.show-cancelledbookingdetails').on("click", function(){
} }
}); });
}) })
$('.print_invoices_cancelled').on("click",function(){
var patientdetailsval = $(this).attr("data-id");
var loader = '<p class="text-center"><img src="'+base_url+'assets_admin/images/ajax-loader-4.gif" /></p>';
$('#popup-patientModal1 .modal-patientbody1').html(loader);
$('#popup-patientModal1').modal({show:true});
$.ajax({
type: "POST",
url: base_url+'Booking/print_invoices_cancelled',
data: {'bookingdetailsval':patientdetailsval},
cache: false,
success: function(result)
{
$('#popup-patientModal1 .modal-patientbody1').html(result);
}
});
});
}); });
......
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