Commit 3996bfbc by Cam Hayes

Auto stash before merge of "master" and "origin/master"

parent ade67a63
...@@ -652,6 +652,7 @@ var ...@@ -652,6 +652,7 @@ var
xdcResponse: TXDataClientResponse; xdcResponse: TXDataClientResponse;
customer : TJSObject; customer : TJSObject;
address: string; address: string;
items: TJSObject;
begin begin
xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer',
[customerID])); [customerID]));
...@@ -666,6 +667,11 @@ begin ...@@ -666,6 +667,11 @@ begin
xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']); xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
xdwdsShipTo.Open; xdwdsShipTo.Open;
xdwdsQBItem.Close;
items := TJSObject(customer['ITEMS']);
xdwdsQBItem.SetJsonData(items['data']);
xdwdsQBITEM.Open;
end; end;
procedure TFOrderEntryCorrugated.WebFormShow(Sender: TObject); procedure TFOrderEntryCorrugated.WebFormShow(Sender: TObject);
......
...@@ -277,6 +277,7 @@ var ...@@ -277,6 +277,7 @@ var
xdcResponse: TXDataClientResponse; xdcResponse: TXDataClientResponse;
customer : TJSObject; customer : TJSObject;
address: string; address: string;
items: TJSObject;
begin begin
xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer',
...@@ -292,6 +293,11 @@ begin ...@@ -292,6 +293,11 @@ begin
xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']); xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
xdwdsShipTo.Open; xdwdsShipTo.Open;
xdwdsQBItem.Close;
items := TJSObject(customer['ITEMS']);
xdwdsQBItem.SetJsonData(items['data']);
xdwdsQBITEM.Open;
end; end;
procedure TFOrderEntryCuttingDie.WebFormShow(Sender: TObject); procedure TFOrderEntryCuttingDie.WebFormShow(Sender: TObject);
......
...@@ -582,6 +582,7 @@ var ...@@ -582,6 +582,7 @@ var
xdcResponse: TXDataClientResponse; xdcResponse: TXDataClientResponse;
customer : TJSObject; customer : TJSObject;
address: string; address: string;
items: TJSObject;
begin begin
xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer',
[customerID])); [customerID]));
...@@ -596,6 +597,11 @@ begin ...@@ -596,6 +597,11 @@ begin
xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']); xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
xdwdsShipTo.Open; xdwdsShipTo.Open;
xdwdsQBItem.Close;
items := TJSObject(customer['ITEMS']);
xdwdsQBItem.SetJsonData(items['data']);
xdwdsQBITEM.Open;
end; end;
procedure TFOrderEntryWeb.WebFormShow(Sender: TObject); procedure TFOrderEntryWeb.WebFormShow(Sender: TObject);
......
...@@ -117,6 +117,7 @@ type ...@@ -117,6 +117,7 @@ type
SHORT_NAME: string; SHORT_NAME: string;
staff_fields_invoice_to: string; staff_fields_invoice_to: string;
ADDRESS_LIST: TList<TAddressItem>; ADDRESS_LIST: TList<TAddressItem>;
ITEMS: TItemList;
end; end;
TCustomerList = class TCustomerList = class
......
...@@ -145,6 +145,7 @@ begin ...@@ -145,6 +145,7 @@ begin
ordersDB.UniQuery1.Close; ordersDB.UniQuery1.Close;
result.ITEMS := GetItems('');
end; end;
function TLookupService.GenerateOrderListPDF(searchOptions: string): string; function TLookupService.GenerateOrderListPDF(searchOptions: string): string;
......
[Settings] [Settings]
MemoLogLevel=3 MemoLogLevel=3
FileLogLevel=5 FileLogLevel=5
LogFileNum=345
webClientVersion=0.9.2 webClientVersion=0.9.2
LogFileNum=345
[Database] [Database]
--Server=192.168.159.132 --Server=192.168.159.132
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment