X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=haxe%2FItemScheduler.hx;h=fb2cd4746a38d0a36a87f5010630288bf56f2019;hb=ee3469d3ffd74d2a6be87d3dd0a9541a14bcdfde;hp=274f562b256a1999e3a04296c2a6d3686f73473c;hpb=80853806ddb041e43f69f98464ce40f45ebfd491;p=order_line_extra.git

diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx
index 274f562..fb2cd47 100644
--- a/haxe/ItemScheduler.hx
+++ b/haxe/ItemScheduler.hx
@@ -134,7 +134,9 @@ class ItemScheduler {
 			}
 			left -= quantity;
 
-			formatOrder(order, left, location.delivery);
+			var now = Date.now();
+			//formatOrder(order, left, location.delivery); // now.getTime() > location.delivery ? now : location.delivery);
+			formatOrder(order, left, now.getTime() > location.delivery.getTime() ? now : location.delivery);
 
 		}
 		// display the left locations
@@ -186,14 +188,24 @@ class ItemScheduler {
 
 		/* The order can also be late if we need
 		 * to wait for a delivery to get it
+		 * or early if the item is on hold.
 		 */
 		var required_by : Date = FA.sql2date(order.required_date);
-		if(required_by == null) required_by = FA.sql2date(order.delivery_date);
-		if(required_by.getTime() < date.getTime()) {
+		if(required_by == null) required_by = FA.sql2date(order.expiry_date);
+		if(required_by != null && required_by.getTime() < date.getTime()) {
 			classes.push('late');
 		}
 		else {
-			classes.push('on_time');
+			var hold_until : Date = FA.sql2date(order.hold_until_date);
+			php.Lib.print(hold_until);
+			php.Lib.print(date);
+			if(hold_until == null) hold_until = FA.sql2date(order.delivery_date);
+			if(hold_until.getTime() > date.getTime()) {
+				classes.push('early');
+			}
+			else {
+				classes.push('on_time');
+			}
 		}
 		var cells : Array <Dynamic> = [
 			order.order_id
@@ -202,7 +214,7 @@ class ItemScheduler {
 			,before
 			,left
 			,order.from_stk_loc
-			,order.delivery_date
+			,order.hold_until_date
 			,order.required_date 
 			,order.comment
 			];