Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
KGOrders
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cam Hayes
KGOrders
Commits
3996bfbc
Commit
3996bfbc
authored
6 days ago
by
Cam Hayes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Auto stash before merge of "master" and "origin/master"
parent
ade67a63
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
1 deletions
+21
-1
View.OrderEntryCorrugated.dfm
kgOrdersClient/View.OrderEntryCorrugated.dfm
+0
-0
View.OrderEntryCorrugated.pas
kgOrdersClient/View.OrderEntryCorrugated.pas
+6
-0
View.OrderEntryCuttingDie.pas
kgOrdersClient/View.OrderEntryCuttingDie.pas
+6
-0
View.OrderEntryWeb.pas
kgOrdersClient/View.OrderEntryWeb.pas
+6
-0
Lookup.Service.pas
kgOrdersServer/Source/Lookup.Service.pas
+1
-0
Lookup.ServiceImpl.pas
kgOrdersServer/Source/Lookup.ServiceImpl.pas
+1
-0
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+1
-1
No files found.
kgOrdersClient/View.OrderEntryCorrugated.dfm
View file @
3996bfbc
This diff is collapsed.
Click to expand it.
kgOrdersClient/View.OrderEntryCorrugated.pas
View file @
3996bfbc
...
...
@@ -652,6 +652,7 @@ var
xdcResponse
:
TXDataClientResponse
;
customer
:
TJSObject
;
address
:
string
;
items
:
TJSObject
;
begin
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.GetCustomer'
,
[
customerID
]));
...
...
@@ -666,6 +667,11 @@ begin
xdwdsShipTo
.
SetJSONData
(
customer
[
'ADDRESS_LIST'
]);
xdwdsShipTo
.
Open
;
xdwdsQBItem
.
Close
;
items
:=
TJSObject
(
customer
[
'ITEMS'
]);
xdwdsQBItem
.
SetJsonData
(
items
[
'data'
]);
xdwdsQBITEM
.
Open
;
end
;
procedure
TFOrderEntryCorrugated
.
WebFormShow
(
Sender
:
TObject
);
...
...
This diff is collapsed.
Click to expand it.
kgOrdersClient/View.OrderEntryCuttingDie.pas
View file @
3996bfbc
...
...
@@ -277,6 +277,7 @@ var
xdcResponse
:
TXDataClientResponse
;
customer
:
TJSObject
;
address
:
string
;
items
:
TJSObject
;
begin
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.GetCustomer'
,
...
...
@@ -292,6 +293,11 @@ begin
xdwdsShipTo
.
SetJSONData
(
customer
[
'ADDRESS_LIST'
]);
xdwdsShipTo
.
Open
;
xdwdsQBItem
.
Close
;
items
:=
TJSObject
(
customer
[
'ITEMS'
]);
xdwdsQBItem
.
SetJsonData
(
items
[
'data'
]);
xdwdsQBITEM
.
Open
;
end
;
procedure
TFOrderEntryCuttingDie
.
WebFormShow
(
Sender
:
TObject
);
...
...
This diff is collapsed.
Click to expand it.
kgOrdersClient/View.OrderEntryWeb.pas
View file @
3996bfbc
...
...
@@ -582,6 +582,7 @@ var
xdcResponse
:
TXDataClientResponse
;
customer
:
TJSObject
;
address
:
string
;
items
:
TJSObject
;
begin
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.GetCustomer'
,
[
customerID
]));
...
...
@@ -596,6 +597,11 @@ begin
xdwdsShipTo
.
SetJSONData
(
customer
[
'ADDRESS_LIST'
]);
xdwdsShipTo
.
Open
;
xdwdsQBItem
.
Close
;
items
:=
TJSObject
(
customer
[
'ITEMS'
]);
xdwdsQBItem
.
SetJsonData
(
items
[
'data'
]);
xdwdsQBITEM
.
Open
;
end
;
procedure
TFOrderEntryWeb
.
WebFormShow
(
Sender
:
TObject
);
...
...
This diff is collapsed.
Click to expand it.
kgOrdersServer/Source/Lookup.Service.pas
View file @
3996bfbc
...
...
@@ -117,6 +117,7 @@ type
SHORT_NAME
:
string
;
staff_fields_invoice_to
:
string
;
ADDRESS_LIST
:
TList
<
TAddressItem
>;
ITEMS
:
TItemList
;
end
;
TCustomerList
=
class
...
...
This diff is collapsed.
Click to expand it.
kgOrdersServer/Source/Lookup.ServiceImpl.pas
View file @
3996bfbc
...
...
@@ -145,6 +145,7 @@ begin
ordersDB
.
UniQuery1
.
Close
;
result
.
ITEMS
:=
GetItems
(
''
);
end
;
function
TLookupService
.
GenerateOrderListPDF
(
searchOptions
:
string
):
string
;
...
...
This diff is collapsed.
Click to expand it.
kgOrdersServer/kgOrdersServer.ini
View file @
3996bfbc
[Settings]
MemoLogLevel
=
3
FileLogLevel
=
5
LogFileNum
=
345
webClientVersion
=
0.9.2
LogFileNum
=
345
[Database]
--Server
=
192.168.159.132
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment