Skip to content

Commit

Permalink
[+] Добавлена проверка, зарегистрирован ли чек на сервере
Browse files Browse the repository at this point in the history
    Это нужно в тех случаях, когда сервер возвращает ошибку,
    но на самом деле чек зарегистрирован
  • Loading branch information
VitalyKravtsov2016 committed Sep 25, 2024
1 parent 45446cd commit 1279e8a
Show file tree
Hide file tree
Showing 23 changed files with 364 additions and 117 deletions.
9 changes: 9 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

Проект : WebPrinter OPOS драйвер

*******************************************************************

OposShtrih_1.13.56.exe
25 сентября 2024 18:40

[+] Добавлена проверка, зарегистрирован ли чек на сервере
Это нужно в тех случаях, когда сервер возвращает ошибку,
но на самом деле чек зарегистрирован

*******************************************************************

OposShtrih_1.13.55.exe
Expand Down
2 changes: 1 addition & 1 deletion release.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[releases]
current=1.13.0.055
current=1.13.0.056
last_date=2024-09-09
2 changes: 1 addition & 1 deletion source/Shared/PrinterParameters.pas
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ procedure TPrinterParameters.WriteLogParameters;
// VatRates
for i := 0 to VatRates.Count-1 do
begin
VatRate := VatRates[i];
VatRate := VatRates[i];
Logger.Debug(Format('VAT: code=%d, rate=%.2f, name="%s"', [
VatRate.Code, VatRate.Rate, VatRate.Name]));
end;
Expand Down
2 changes: 1 addition & 1 deletion source/Shared/ServiceVersion.pas
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface
DeviceService;

const
GenericServiceVersion = deviceVersion113 + 55;
GenericServiceVersion = deviceVersion113 + 56;

implementation

Expand Down
202 changes: 157 additions & 45 deletions source/WebFptr.dsk
Original file line number Diff line number Diff line change
@@ -1,52 +1,132 @@
[Closed Files]
File_0=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duWebPrinterImpl.pas',0,1,531,54,542,0,0
File_1=SourceModule,'D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas',0,1,2553,60,2569,0,0
File_2=SourceModule,'D:\Projects\WebPrinter\source\WebFptrSo\Units\WebPrinter.pas',0,1,2356,47,2356,0,0
File_3=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duWebPrinter.pas',0,1,139,67,154,0,0
File_4=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duOleDriver.pas',0,1,141,2,163,0,0
File_5=SourceModule,'D:\Projects\WebPrinter\source\Opos\OposServiceDevice19.pas',0,1,324,11,340,0,0
File_6=SourceModule,'C:\Program Files (x86)\Borland\Delphi7\Comp\Indy10\Lib\Protocols\IdHTTP.pas',0,1,757,87,787,0,0
File_7=SourceModule,'D:\Projects\WebPrinter\source\WebFptrSo\units\CustomReceipt.pas',0,1,1,1,1,0,0
File_8=SourceModule,'D:\Projects\WebPrinter\source\WebFptrSo\units\SalesReceipt.pas',0,1,1,1,1,0,0
File_9=SourceModule,'D:\Projects\WebPrinter\source\Shared\StringUtils.pas',0,1,348,18,354,0,0
File_0=SourceModule,'D:\Projects\WebPrinter\source\Opos\OposFptrUtils.pas',0,1,39,41,51,0,0
File_1=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duCalculator.pas',0,1,25,77,33,0,0
File_2=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duWebPrinter.pas',0,1,1,1,1,0,0
File_3=SourceModule,'D:\Projects\WebPrinter\test\AcceptanceTest\units\duLogParser.pas',0,1,159,56,186,0,0
File_4=SourceModule,'D:\Projects\WebPrinter\source\Shared\JsonUtils.pas',0,1,681,103,689,0,0
File_5=SourceModule,'D:\Projects\WebPrinter\source\Shared\PrinterParameters.pas',0,1,244,30,254,0,0
File_6=SourceModule,'D:\Projects\WebPrinter\source\Shared\StringUtils.pas',0,1,348,10,350,0,0
File_7=SourceModule,'D:\projects\WebPrinter\source\WebFptrSo\units\ReceiptItem.pas',0,1,362,26,369,0,0

[Modules]
Count=0
EditWindowCount=0
Module0=D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinterImpl.pas
Module1=D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas
Module2=D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinter.pas
Module3=D:\Projects\WebPrinter\source\WebFptrSo\Units\WebPrinter.pas
Count=4
EditWindowCount=1
TypeLibWindowCount=1

[D:\projects\WebPrinter\source\WebFptr.bpg]
[D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinterImpl.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0

[D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\source\WebFptrSo\WebFptrSo.dpr]
[D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinter.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\source\WebFptrSo\WebFptrSo.tlb]
[D:\Projects\WebPrinter\source\WebFptrSo\Units\WebPrinter.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\source\WebFptrCfg\WebFptrCfg.dpr]
[D:\Projects\WebPrinter\source\WebFptr.bpg]
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\source\WebFptrTst\WebFptrTst.dpr]
[D:\Projects\WebPrinter\source\WebFptrSo\WebFptrSo.dpr]
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\test\WebFptrSoTest\WebFptrSoTest.dpr]
[D:\Projects\WebPrinter\source\WebFptrSo\WebFptrSo.tlb]
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\test\WebFptrSoTest\WebFptrSoTestLib.dpr]
[D:\Projects\WebPrinter\source\WebFptrCfg\WebFptrCfg.dpr]
FormState=0
FormOnTop=0

[D:\projects\WebPrinter\test\AcceptanceTest\AcceptanceTest.dpr]
[D:\Projects\WebPrinter\source\WebFptrTst\WebFptrTst.dpr]
FormState=0
FormOnTop=0

[D:\Projects\WebPrinter\test\WebFptrSoTest\WebFptrSoTest.dpr]
FormState=0
FormOnTop=0

[D:\Projects\WebPrinter\test\WebFptrSoTest\WebFptrSoTestLib.dpr]
FormState=0
FormOnTop=0

[D:\Projects\WebPrinter\test\AcceptanceTest\AcceptanceTest.dpr]
FormState=0
FormOnTop=0

[EditWindow0]
ViewCount=4
CurrentView=0
View0=0
View1=1
View2=2
View3=3
CodeExplorer=CodeExplorer@EditWindow0
MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=366
Top=140
Width=1302
Height=682
MaxLeft=-8
MaxTop=107
MaxWidth=1936
MaxHeight=941
ClientWidth=1920
ClientHeight=902
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
RightPanelSize=0
BottomPanelSize=292
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF

[View0]
Module=D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinterImpl.pas
CursorX=19
CursorY=1207
TopLine=1202
LeftCol=1

[View1]
Module=D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas
CursorX=101
CursorY=2658
TopLine=2643
LeftCol=1

[View2]
Module=D:\Projects\WebPrinter\test\WebFptrSoTest\units\duWebPrinter.pas
CursorX=1
CursorY=1
TopLine=1
LeftCol=1

[View3]
Module=D:\Projects\WebPrinter\source\WebFptrSo\Units\WebPrinter.pas
CursorX=20
CursorY=903
TopLine=884
LeftCol=1

[TypeLibEditWindow0]
Create=1
Visible=0
Expand All @@ -59,7 +139,7 @@ MaxLeft=-1
MaxTop=-1
ClientWidth=631
ClientHeight=419
Module=D:\projects\WebPrinter\source\WebFptrSo\WebFptrSo.tlb
Module=D:\Projects\WebPrinter\source\WebFptrSo\WebFptrSo.tlb

[Watches]
Count=0
Expand All @@ -70,8 +150,8 @@ WatchShowColumnHeaders=1
Create=1
Visible=0
State=0
Left=0
Top=960
Left=239
Top=694
Width=492
Height=142
MaxLeft=-1
Expand All @@ -83,24 +163,24 @@ LRDockWidth=320
Dockable=1

[Breakpoints]
Count=2
Breakpoint0='D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas',2625,'',0,1,'',1,0,0,'',1,'','',''
Breakpoint1='D:\Projects\WebPrinter\source\WebFptrSo\units\WebPrinterImpl.pas',2628,'',0,1,'',1,0,0,'',1,'','',''
Count=0

[AddressBreakpoints]
Count=0

[Main Window]
Create=1
Visible=1
State=0
Left=2
State=2
Left=0
Top=0
Width=1918
Width=1920
Height=123
MaxLeft=-1
MaxTop=-1
ClientWidth=1902
MaxWidth=1936
MaxHeight=123
ClientWidth=1920
ClientHeight=84

[ProjectManager]
Expand All @@ -109,12 +189,12 @@ Visible=1
State=0
Left=-4
Top=114
Width=590
Height=630
Width=509
Height=622
MaxLeft=-1
MaxTop=-1
ClientWidth=574
ClientHeight=591
ClientWidth=493
ClientHeight=583
TBDockHeight=681
LRDockWidth=445
Dockable=0
Expand Down Expand Up @@ -151,16 +231,16 @@ ClientHeight=60

[PropertyInspector]
Create=1
Visible=0
Visible=1
State=0
Left=-8
Top=113
Width=388
Height=908
Top=118
Width=364
Height=668
MaxLeft=-1
MaxTop=-1
ClientWidth=372
ClientHeight=869
ClientWidth=348
ClientHeight=629
TBDockHeight=681
LRDockWidth=291
Dockable=1
Expand Down Expand Up @@ -246,7 +326,7 @@ Dockable=1

[DebugLogView]
Create=1
Visible=0
Visible=1
State=0
Left=0
Top=1040
Expand Down Expand Up @@ -352,16 +432,48 @@ TBDockHeight=151
LRDockWidth=383
Dockable=1

[CodeExplorer@EditWindow0]
Create=1
Visible=0
State=0
Left=-170
Top=-9
Width=140
Height=305
MaxLeft=-1
MaxTop=-1
ClientWidth=140
ClientHeight=305
TBDockHeight=305
LRDockWidth=140
Dockable=1

[MessageView@EditWindow0]
Create=1
Visible=1
State=0
Left=12
Top=0
Width=1908
Height=292
MaxLeft=-1
MaxTop=-1
ClientWidth=1908
ClientHeight=292
TBDockHeight=292
LRDockWidth=443
Dockable=1

[DockHosts]
DockHostCount=1

[DockSite0]
DockSiteType=0
Create=1
Visible=0
Visible=1
State=0
Left=839
Top=202
Left=860
Top=192
Width=872
Height=728
MaxLeft=-1
Expand All @@ -375,5 +487,5 @@ DockClients=CallStackWindow
DockSiteData=0000040000000000B102000000000000015803000000000000010000000087000000000000000100000002B1020000000000000200000000580300000F00000043616C6C537461636B57696E646F770200000000F7010000000000000100000000080100000000000001000000008C010000000000000100000000100200000000000001000000009802000000000000FFFFFFFF

[ActiveProject]
ActiveProject=1
ActiveProject=4

13 changes: 6 additions & 7 deletions source/WebFptrCfg/WebFptrCfg.dof
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=52
Build=53
Debug=0
PreRelease=0
Special=0
Expand All @@ -126,9 +126,9 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=WebPrinter OPOS setup utility
FileVersion=1.13.0.52
InternalName=WebPrinter OPOS setup
LegalCopyright=SHTRIH-M © 2024
FileVersion=1.13.0.53
InternalName=WebPrinter OPOS setup
LegalCopyright=SHTRIH-M © 2024
LegalTrademarks=
OriginalFilename=WebFptrCfg.exe
ProductName=WebPrinter OPOS driver
Expand All @@ -148,6 +148,5 @@ Count=2
Item0=DCU
Item1=..\..\DCU
[HistoryLists\hlOutputDirectorry]
Count=2
Item0=..\Bin
Item1=Bin
Count=1
Item0=Bin
Loading

0 comments on commit 1279e8a

Please sign in to comment.