Merge branch 'master' into 'production'

application/models/Ride_model.php

@@ -115,7 +115,7 @@ class Ride_model extends CI_Model {
 		$field = 'count(TD.transport_id) AS count';
 		if($scheduleCnt == 1){
 			$field = " TD.transport_id ";
-			$cond .= " AND TD.is_scheduled='0' ";
+			$cond .= " AND TD.is_scheduled='0' AND TD.trip_status='S1' ";
 		}
 		$sql = "SELECT $field FROM transport_details TD WHERE TD.status!='2' ".$cond;
 

assets/js/nemt_custom.js

@@ -346,9 +346,9 @@ function markAsScheduled(transport_id,is_scheduled,thisObj){
                 jQuery.each(resp['succArr'], function(index,value) {
                     if(ride_ids != undefined && ride_ids != 'undefined' && ride_ids != null && ride_ids != 'null' && ride_ids != ''){
                         if(is_scheduled == '1'){
-                            if(ride_ids.includes(value)) ride_ids.splice(ride_ids.indexOf(value),1);
+                            if(ride_ids.includes(value)){ ride_ids.splice(ride_ids.indexOf(value),1); }
                         } else {
-                            if(!ride_ids.includes(value)) ride_ids.push(value);
+                            if(!ride_ids.includes(value)){ ride_ids.push(value); }
                         }
                     }
                     if(thisObj != ''){