Skip to content

N
nemt_backend
Commit 3d5497f5 by Tobin
Options

dc

parent f79787d9
Showing with 2 additions and 2 deletions
application/controllers/Ride.php
......@@ -1057,7 +1057,7 @@ class Ride extends CI_Controller {
if((empty($ride->trip_status) || $ride->trip_status == $ride->accept_trip_status) &&
!empty($ride->appointment_time) && $this->session->userdata['user_type']!=1 &&
!empty($ride->appointment_time) && $ride->is_scheduled != 3 &&
$ride->appointment_time > strtotime(date('Y-m-d G:i'))){
$ride->appointment_time >= strtotime(date('Y-m-d 00:00'))){
$style = 'style="color:red;";';
$ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0;
if($ride->is_scheduled == 1){
......
application/models/Ride_model.php
......@@ -117,7 +117,7 @@ class Ride_model extends CI_Model {
$field = 'count(TD.transport_id) AS count';
if($scheduleCnt == 1){
$field = " TD.transport_id ";
$cond .= " AND TD.appointment_time>".strtotime(date('Y-m-d G:i'));
$cond .= " AND TD.appointment_time>=".strtotime(date('Y-m-d 00:00'));
$cond .= " AND TD.is_scheduled='0' AND (TD.trip_status=BK.accept_trip_status OR TD.broker_id=0)";
}
$sql = "SELECT $field FROM transport_details TD
......
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