fixes #208

icklesteve · Jul 30, 2016 · b9932e3 · b9932e3
1 parent b413eaf
commit b9932e3
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/files/cojm/live/ajaxchangejob.php b/files/cojm/live/ajaxchangejob.php
@@ -2296,7 +2296,9 @@
 SELECT 
 status,
 targetcollectiondate,
-duedate
+collectionworkingwindow,
+duedate,
+deliveryworkingwindow
 FROM Orders 
 INNER JOIN Services, Clients
 WHERE `Orders`.`id` = :getid LIMIT 0,1";
@@ -2308,6 +2310,8 @@
 $status=$cp->status;
 $targetcollectiondate=$cp->targetcollectiondate;
 $duedate=$cp->duedate;
+$collectionworkingwindow=$cp->collectionworkingwindow;
+$deliveryworkingwindow=$cp->deliveryworkingwindow;
 
 
 
@@ -2317,9 +2321,22 @@
 
 
 
+if ($status<49){
 
+if ($collectionworkingwindow<>'0000-00-00 00:00:00')  { $nextactiondate=$collectionworkingwindow; } else {
+$nextactiondate = $targetcollectiondate; 
+}
+
+
+
+} else { 
 
-if ($status<49){ $nextactiondate = $targetcollectiondate; } else { $nextactiondate = $duedate; }
+if ($deliveryworkingwindow<>'0000-00-00 00:00:00')  { $nextactiondate=$deliveryworkingwindow; } else {
+$nextactiondate = $duedate; 
+}
+
+
+}
 $sql = "UPDATE Orders SET nextactiondate='$nextactiondate' WHERE ID='$id' LIMIT 1";
 $result = mysql_query($sql, $conn_id); 
 if ($result){