Skip to content

K
kgOrders
Commit 58bcb135 by Cam Hayes
Options

Fixed server issues and order list pdf not loading properly 

We had a lot of unneeded includes so I got rid of them. Also the PDF loading was different for exclusively order list and it wasn't working so I changed it back
parent 0b8f7836
Showing with 22 additions and 25 deletions
kgOrdersClient/View.OrderEntryCorrugated.dfm
...@@ -216,6 +216,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated ...@@ -216,6 +216,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
ElementPosition = epRelative ElementPosition = epRelative
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
HideSelection = False HideSelection = False
ReadOnly = True
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
DataField = 'staff_fields_invoice_to' DataField = 'staff_fields_invoice_to'
DataSource = wdsOrder DataSource = wdsOrder
......
kgOrdersClient/View.OrderEntryCuttingDie.dfm
...@@ -118,6 +118,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie ...@@ -118,6 +118,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtinvoiceto' ElementID = 'edtinvoiceto'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
ReadOnly = True
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
DataField = 'staff_fields_invoice_to' DataField = 'staff_fields_invoice_to'
DataSource = wdsOrder DataSource = wdsOrder
......
kgOrdersClient/View.OrderEntryWeb.dfm
...@@ -208,6 +208,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -208,6 +208,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtinvoiceto' ElementID = 'edtinvoiceto'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
ReadOnly = True
ShowFocus = False ShowFocus = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
DataField = 'staff_fields_invoice_to' DataField = 'staff_fields_invoice_to'
......
kgOrdersClient/View.Orders.pas
...@@ -189,7 +189,6 @@ begin ...@@ -189,7 +189,6 @@ begin
end end
else else
begin begin
if Assigned(FPendingPdfTab) then if Assigned(FPendingPdfTab) then
FPendingPdfTab.document.write( FPendingPdfTab.document.write(
'<!DOCTYPE html>' + '<!DOCTYPE html>' +
...@@ -254,6 +253,7 @@ begin ...@@ -254,6 +253,7 @@ begin
[searchOptions])); [searchOptions]));
jsObject := TJSObject(xdcResponse.Result); jsObject := TJSObject(xdcResponse.Result);
pdfURL := String(jsObject.Properties['value']); pdfURL := String(jsObject.Properties['value']);
window.open(pdfURL, '_blank');
if Assigned(APdfTab) then if Assigned(APdfTab) then
APdfTab.location.href := pdfURL; APdfTab.location.href := pdfURL;
except except
......
kgOrdersServer/Source/Lookup.ServiceImpl.pas
...@@ -9,7 +9,7 @@ interface ...@@ -9,7 +9,7 @@ interface
uses uses
XData.Server.Module, XData.Server.Module,
XData.Service.Common, XData.Service.Common,
Api.Database, Data.DB, frxClass, frxExportPDF, JS, Api.Database, Data.DB, frxClass, frxExportPDF,
Lookup.Service, System.Hash, System.JSON, Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Lookup.Service, System.Hash, System.JSON, Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, MemDS, DBAccess, Uni, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, MemDS, DBAccess, Uni,
hyiedefs, hyieutils, iexBitmaps, iesettings, iexLayers, iexRulers, hyiedefs, hyieutils, iexBitmaps, iesettings, iexLayers, iexRulers,
...@@ -17,7 +17,7 @@ uses ...@@ -17,7 +17,7 @@ uses
dbimageen, Vcl.ExtCtrls, ieview, imageenview, IdBaseComponent, IdComponent, dbimageen, Vcl.ExtCtrls, ieview, imageenview, IdBaseComponent, IdComponent,
IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, IdFTP,
iexProcEffects, frxDBSet, frxExportBaseDialog, frCoreClasses, rOrderList, rOrderCorrugated, Common.Logging, iexProcEffects, frxDBSet, frxExportBaseDialog, frCoreClasses, rOrderList, rOrderCorrugated, Common.Logging,
DateUtils, REST.Client, REST.Types, WEBLib.REST, WEBLib.WebTools,System.Net.HttpClient, DateUtils, REST.Client, REST.Types, System.Net.HttpClient,
System.Net.URLClient, System.Net.HttpClientComponent, System.netencoding, System.Net.URLClient, System.Net.HttpClientComponent, System.netencoding,
IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.IniFiles, System.Generics.Collections; IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.IniFiles, System.Generics.Collections;
......
kgOrdersServer/Source/qbAPI.dfm
...@@ -656,7 +656,7 @@ object fQB: TfQB ...@@ -656,7 +656,7 @@ object fQB: TfQB
Left = 1 Left = 1
Top = 26 Top = 26
Width = 980 Width = 980
Height = 171 Height = 170
Caption = 'Memo1' Caption = 'Memo1'
DoubleBuffered = False DoubleBuffered = False
PageAppearance.BorderColor = clNone PageAppearance.BorderColor = clNone
...@@ -721,13 +721,12 @@ object fQB: TfQB ...@@ -721,13 +721,12 @@ object fQB: TfQB
Left = 2 Left = 2
Top = 35 Top = 35
Width = 976 Width = 976
Height = 134 Height = 133
Align = alClient Align = alClient
Lines.Strings = ( Lines.Strings = (
'') '')
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 0 TabOrder = 0
ExplicitHeight = 133
end end
object Panel2: TPanel object Panel2: TPanel
Left = 2 Left = 2
...@@ -751,7 +750,7 @@ object fQB: TfQB ...@@ -751,7 +750,7 @@ object fQB: TfQB
Left = 1 Left = 1
Top = 26 Top = 26
Width = 980 Width = 980
Height = 171 Height = 170
Caption = 'QB API Memo' Caption = 'QB API Memo'
DoubleBuffered = False DoubleBuffered = False
PageAppearance.BorderColor = clNone PageAppearance.BorderColor = clNone
...@@ -816,14 +815,13 @@ object fQB: TfQB ...@@ -816,14 +815,13 @@ object fQB: TfQB
Left = 2 Left = 2
Top = 35 Top = 35
Width = 976 Width = 976
Height = 134 Height = 133
Align = alClient Align = alClient
Lines.Strings = ( Lines.Strings = (
'Memo2') 'Memo2')
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 0 TabOrder = 0
WordWrap = False WordWrap = False
ExplicitHeight = 133
end end
object Panel3: TPanel object Panel3: TPanel
Left = 2 Left = 2
...@@ -847,7 +845,7 @@ object fQB: TfQB ...@@ -847,7 +845,7 @@ object fQB: TfQB
Left = 1 Left = 1
Top = 26 Top = 26
Width = 980 Width = 980
Height = 171 Height = 170
Caption = 'AdvOfficePager13' Caption = 'AdvOfficePager13'
DoubleBuffered = False DoubleBuffered = False
PageAppearance.BorderColor = clNone PageAppearance.BorderColor = clNone
......
kgOrdersServer/Source/qbAPI.pas
...@@ -8,8 +8,8 @@ uses ...@@ -8,8 +8,8 @@ uses
BaseGrid, AdvGrid, DBAdvGrid, MemDS, DBAccess, Uni, Vcl.StdCtrls, Vcl.Mask, BaseGrid, AdvGrid, DBAdvGrid, MemDS, DBAccess, Uni, Vcl.StdCtrls, Vcl.Mask,
vcl.wwdbedit, vcl.wwdotdot, vcl.wwdbcomb, REST.Client, REST.Types, System.JSON, vcl.wwdbedit, vcl.wwdotdot, vcl.wwdbcomb, REST.Client, REST.Types, System.JSON,
System.Generics.Collections, AdvEdit, vcl.wwdblook, vcl.wwdbdatetimepicker, System.Generics.Collections, AdvEdit, vcl.wwdblook, vcl.wwdbdatetimepicker,
System.Hash, Api.Database, Vcl.ExtCtrls, WEBLib.Forms, WEBLib.Controls, WEBLib.StdCtrls, System.Hash, Api.Database, Vcl.ExtCtrls,
WEBLib.ExtCtrls, WEBLib.REST, WEBLib.WebTools,System.Net.HttpClient, System.Net.HttpClient,
System.Net.URLClient, System.Net.HttpClientComponent, System.netencoding, System.Net.URLClient, System.Net.HttpClientComponent, System.netencoding,
IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.DateUtils, System.IniFiles, IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.DateUtils, System.IniFiles,
AdvPanel, AdvOfficePager, System.UITypes; AdvPanel, AdvOfficePager, System.UITypes;
......
kgOrdersServer/Source/rOrderCorrugated.dfm
...@@ -19,13 +19,11 @@ object rptOrderCorrugated: TrptOrderCorrugated ...@@ -19,13 +19,11 @@ object rptOrderCorrugated: TrptOrderCorrugated
OverwritePrompt = False OverwritePrompt = False
CreationTime = 45701.493700081020000000 CreationTime = 45701.493700081020000000
DataOnly = False DataOnly = False
EmbedFontsIfProtected = False
InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 ' InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 '
OpenAfterExport = False OpenAfterExport = False
PrintOptimized = False PrintOptimized = False
Outline = False Outline = False
Background = False Background = False
HTMLTags = True
Quality = 95 Quality = 95
Author = 'FastReport' Author = 'FastReport'
Subject = 'FastReport PDF export' Subject = 'FastReport PDF export'
...@@ -54,7 +52,7 @@ object rptOrderCorrugated: TrptOrderCorrugated ...@@ -54,7 +52,7 @@ object rptOrderCorrugated: TrptOrderCorrugated
Top = 206 Top = 206
end end
object frxOrderCorrugated: TfrxReport object frxOrderCorrugated: TfrxReport
Version = '2025.2.4' Version = '2026.1.7'
DataSet = frxDBOrderCorrugated DataSet = frxDBOrderCorrugated
DataSetName = 'frxDBOrderCorrugated' DataSetName = 'frxDBOrderCorrugated'
DotMatrixReport = False DotMatrixReport = False
...@@ -4369,6 +4367,7 @@ object rptOrderCorrugated: TrptOrderCorrugated ...@@ -4369,6 +4367,7 @@ object rptOrderCorrugated: TrptOrderCorrugated
HightQuality = False HightQuality = False
Transparent = False Transparent = False
TransparentColor = clWhite TransparentColor = clWhite
Transparency = 0
end end
end end
end end
......
kgOrdersServer/Source/rOrderCorrugated.pas
...@@ -4,7 +4,7 @@ interface ...@@ -4,7 +4,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JSON,
frxTableObject, frxUtils, System.Generics.Collections; frxTableObject, frxUtils, System.Generics.Collections;
type type
......
kgOrdersServer/Source/rOrderCutting.dfm
...@@ -19,13 +19,11 @@ object rptOrderCutting: TrptOrderCutting ...@@ -19,13 +19,11 @@ object rptOrderCutting: TrptOrderCutting
OverwritePrompt = False OverwritePrompt = False
CreationTime = 45701.493700081020000000 CreationTime = 45701.493700081020000000
DataOnly = False DataOnly = False
EmbedFontsIfProtected = False
InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 ' InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 '
OpenAfterExport = False OpenAfterExport = False
PrintOptimized = False PrintOptimized = False
Outline = False Outline = False
Background = False Background = False
HTMLTags = True
Quality = 95 Quality = 95
Author = 'FastReport' Author = 'FastReport'
Subject = 'FastReport PDF export' Subject = 'FastReport PDF export'
...@@ -54,7 +52,7 @@ object rptOrderCutting: TrptOrderCutting ...@@ -54,7 +52,7 @@ object rptOrderCutting: TrptOrderCutting
Top = 206 Top = 206
end end
object frxOrderCutting: TfrxReport object frxOrderCutting: TfrxReport
Version = '2025.2.4' Version = '2026.1.7'
DataSet = frxDBOrderCutting DataSet = frxDBOrderCutting
DataSetName = 'frxDBOrderCutting' DataSetName = 'frxDBOrderCutting'
DotMatrixReport = False DotMatrixReport = False
...@@ -1644,6 +1642,7 @@ object rptOrderCutting: TrptOrderCutting ...@@ -1644,6 +1642,7 @@ object rptOrderCutting: TrptOrderCutting
HightQuality = False HightQuality = False
Transparent = False Transparent = False
TransparentColor = clWhite TransparentColor = clWhite
Transparency = 0
end end
end end
end end
......
kgOrdersServer/Source/rOrderCutting.pas
...@@ -4,7 +4,7 @@ interface ...@@ -4,7 +4,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JSON,
frxTableObject, frxUtils; frxTableObject, frxUtils;
......
kgOrdersServer/Source/rOrderList.dfm
...@@ -3,7 +3,7 @@ object rptOrderList: TrptOrderList ...@@ -3,7 +3,7 @@ object rptOrderList: TrptOrderList
Height = 480 Height = 480
Width = 640 Width = 640
object frxOrderList: TfrxReport object frxOrderList: TfrxReport
Version = '2025.2.4' Version = '2026.1.7'
DotMatrixReport = False DotMatrixReport = False
IniFile = '\Software\Fast Reports' IniFile = '\Software\Fast Reports'
PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection] PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
...@@ -1045,13 +1045,11 @@ object rptOrderList: TrptOrderList ...@@ -1045,13 +1045,11 @@ object rptOrderList: TrptOrderList
ShowProgress = True ShowProgress = True
OverwritePrompt = False OverwritePrompt = False
DataOnly = False DataOnly = False
EmbedFontsIfProtected = False
InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 ' InteractiveFormsFontSubset = 'A-Z,a-z,0-9,#43-#47 '
OpenAfterExport = False OpenAfterExport = False
PrintOptimized = False PrintOptimized = False
Outline = False Outline = False
Background = False Background = False
HTMLTags = True
Quality = 95 Quality = 95
Author = 'FastReport' Author = 'FastReport'
Subject = 'FastReport PDF export' Subject = 'FastReport PDF export'
......
kgOrdersServer/Source/rOrderList.pas
...@@ -4,7 +4,7 @@ interface ...@@ -4,7 +4,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JSON,
frxTableObject, frxUtils, DateUtils; frxTableObject, frxUtils, DateUtils;
type type
......
kgOrdersServer/Source/rOrderWeb.pas
...@@ -4,7 +4,7 @@ interface ...@@ -4,7 +4,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JSON,
frxTableObject, frxUtils, System.Generics.Collections; frxTableObject, frxUtils, System.Generics.Collections;
type type
......
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