// Parameter 1: OrderID: The ID of the order, used when editting an existing order.
// Parameter 2: CustomerID: The ID of the customer, used when adding a new order. Blank when editting an existing order because the customer id is already attached to the order.
// Parameter 3: Mode: EDIT if editting an existing order, ADD if adding a new order.
// Parameter 4: orderType: Type of order so we go to the correct order entry page.
orderEntry(OrderID,'','EDIT',orderType);
orderEntry(OrderID,'','EDIT',orderType);
end;
end;
...
@@ -771,7 +779,7 @@ begin
...
@@ -771,7 +779,7 @@ begin
except
except
onE:EXDataClientRequestExceptiondo
onE:EXDataClientRequestExceptiondo
Utils.ShowErrorModal('Could not retrieve orders: '+E.ErrorResult.ErrorMessage);
SQL:='select * from '+table+' cpo join customers c on cpo.COMPANY_ID = c.CUSTOMER_ID join customers_ship cs on cpo.staff_fields_ship_to = cs.ship_block JOIN qb_items ON cpo.staff_fields_quickbooks_item = qb_items.qb_item_name where cpo.ORDER_ID = '+ORDER_ID;
raiseEXDataHttpException.Create(500,'Unable to retrieve order list: '+E.Message);
raiseEXDataHttpException.Create(500,'Unable to retrieve order list: A KG Orders database issue has occurred!');
end;
end;
end;
end;
end;
end;
...
@@ -1131,7 +1416,7 @@ begin
...
@@ -1131,7 +1416,7 @@ begin
onE:Exceptiondo
onE:Exceptiondo
begin
begin
Logger.Log(2,'Error in GetOrder: '+E.Message);
Logger.Log(2,'Error in GetOrder: '+E.Message);
raiseEXDataHttpException.Create(500,'Unable to retrieve order: '+E.Message);
raiseEXDataHttpException.Create(500,'Unable to retrieve corrugated order: A KG Orders database issue has occurred!');
end;
end;
end;
end;
end;
end;
...
@@ -1274,7 +1559,7 @@ begin
...
@@ -1274,7 +1559,7 @@ begin
onE:Exceptiondo
onE:Exceptiondo
begin
begin
Logger.Log(2,'Error in GetWebOrder: '+E.Message);
Logger.Log(2,'Error in GetWebOrder: '+E.Message);
raiseEXDataHttpException.Create(500,'Unable to retrieve web order: '+E.Message);
raiseEXDataHttpException.Create(500,'Unable to retrieve web order: A KG Orders database issue has occurred!');
end;
end;
end;
end;
end;
end;
...
@@ -1289,16 +1574,18 @@ var
...
@@ -1289,16 +1574,18 @@ var
begin
begin
try
try
orderID:=orderInfo;
orderID:=orderInfo;
SQL:='select * from cutting_die_orders o JOIN customers c ON c.CUSTOMER_ID = o.COMPANY_ID where ORDER_ID = '+quotedStr(orderID);
SQL:='select * from cutting_die_orders cdo JOIN customers c ON c.CUSTOMER_ID = cdo.COMPANY_ID join orders o on cdo.ORDER_ID = o.ORDER_ID where cdo.ORDER_ID = '+quotedStr(orderID);
