fixed issues so that other order pages are functional

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -262,7 +262,6 @@ begin
         orderID := orderInfo;
         mode := modeParam;
         notification := info;
-
         InitializeForm;
       end;
     end
@@ -431,7 +430,6 @@ begin
   if mode = 'EDIT' then
     orderJSON.AddPair('ORDER_ID', orderID);
 
-  console.log(orderJSON);
   AddCorrugatedOrder(orderJSON);
 end;
 
@@ -841,7 +839,7 @@ var
   orderList : TJSObject;
   i: integer;
   data: TJSArray;
-  order: TJSObject;
+  order, customer, items: TJSObject;
   callListLength: integer;
   tempString, strColorList: string;
   colorObject: TJSObject;
@@ -850,7 +848,6 @@ var
   color: TJSObject;
   colorJSON: TJSONObject;
   colorListJSON: TJSONArray;
-  items: TJSObject;
 begin
   try
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrder', [Order_ID]));
@@ -974,14 +971,16 @@ begin
     else
       cbStripMount.Checked := false;
 
-    if mode = 'EDIT' then
-    begin
-      CustomerID := XDataWebDataSet1COMPANY_ID.AsString;
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [XDataWebDataSet1.FieldByName('COMPANY_ID').AsString]));
+    customer :=  TJSObject(xdcResponse.Result);
+
     xdwdsShipTo.Close;
-      xdwdsShipTo.SetJSONData(order['ADDRESS_LIST']);
+    xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
     xdwdsShipTo.Open;
-    end;
 
+
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems', []));
+    items := TJSObject(xdcResponse.Result);
     xdwdsQBItem.Close;
     items := TJSObject(order['ITEMS']);
     xdwdsQBItem.SetJsonData(items['data']);
@@ -1010,11 +1009,13 @@ begin
     XDataWebDataSet1.Edit;
 
     xdwdsShipTo.Close;
-    xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
+    xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
     xdwdsShipTo.Open;
 
+
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems', []));
+    items :=  TJSObject(xdcResponse.Result);
     xdwdsQBItem.Close;
-    items := TJSObject(customer['ITEMS']);
     xdwdsQBItem.SetJsonData(items['data']);
     xdwdsQBITEM.Open;
 

kgOrdersClient/View.OrderEntryWeb.dfm

@@ -1413,7 +1413,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
   end
   object XDataWebDataSet1: TXDataWebDataSet
     Connection = DMConnection.ApiConnection
-    Left = 408
+    Left = 434
     Top = 4
     object XDataWebDataSet1ORDER_ID: TIntegerField
       FieldName = 'ORDER_ID'

kgOrdersClient/View.OrderEntryWeb.pas

@@ -777,7 +777,7 @@ var
   orderList : TJSObject;
   i: integer;
   data: TJSArray;
-  order: TJSObject;
+  order, customer: TJSObject;
   callListLength: integer;
   tempString, strColorList: string;
   colorObject: TJSObject;
@@ -870,16 +870,19 @@ begin
     else
       dtpDigitalColorDate.Date := 0;
 
-    if mode = 'EDIT' then
-    begin
-      CustomerID := XDataWebDataSet1COMPANY_ID.AsString;
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer',
+        [XDataWebDataSet1.FieldByName('COMPANY_ID').AsString]));
+    customer :=  TJSObject(xdcResponse.Result);
+
     xdwdsShipTo.Close;
-      xdwdsShipTo.SetJSONData(order['ADDRESS_LIST']);
+    xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
     xdwdsShipTo.Open;
-    end;
 
+
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems',
+        []));
+    items :=  TJSObject(xdcResponse.Result);
     xdwdsQBItem.Close;
-    items := TJSObject(order['ITEMS']);
     xdwdsQBItem.SetJsonData(items['data']);
     xdwdsQBITEM.Open;
   except
@@ -909,11 +912,13 @@ begin
 
 
   xdwdsShipTo.Close;
-  xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
+  xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
   xdwdsShipTo.Open;
 
+   xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems',
+        []));
+  items :=  TJSObject(xdcResponse.Result);
   xdwdsQBItem.Close;
-  items := TJSObject(customer['ITEMS']);
   xdwdsQBItem.SetJsonData(items['data']);
   xdwdsQBITEM.Open;
 

kgOrdersClient/View.Orders.pas

@@ -519,7 +519,7 @@ procedure TFViewOrders.wdbtcOrdersClickCell(Sender: TObject; ACol,
   ARow: Integer);
 begin
   statusOrderID := wdbtcOrders.Cells[0, ARow];
-  statusOrderType := wdbtcOrders.Cells[4, ARow];
+  statusOrderType := wdbtcOrders.Cells[5, ARow];
   row := ARow;
 end;
 
@@ -527,7 +527,7 @@ procedure TFViewOrders.wdbtcOrdersDblClickCell(Sender: TObject; ACol,
   ARow: Integer);
 begin
   OrderID := wdbtcOrders.Cells[0, ARow];
-  orderType :=  wdbtcOrders.Cells[4, ARow].Split([' '])[0];
+  orderType :=  wdbtcOrders.Cells[5, ARow].Split([' '])[0];
 
 
   // Parameter 1: OrderID: The ID of the order, used when editting an existing order.

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.7
-LogFileNum=926
+LogFileNum=927
 
 [Database]
 Server=192.168.159.155