Commit febef7df authored by kravtsov's avatar kravtsov

[-] Исправлена ошибка формирования чека на ШТРИХ-МОБАЙЛ-Ф

parent c54a5cf9
......@@ -4,6 +4,13 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_484.exe
30 марта 2018 16:20
[-] Исправлена ошибка формирования чека на ШТРИХ-МОБАЙЛ-Ф
*******************************************************************
OposShtrih_1.13_483.exe
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,483
PRODUCTVERSION 1,13,0,483
FILEVERSION 1,13,0,484
PRODUCTVERSION 1,13,0,484
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS setup utility\0"
VALUE "FileVersion", "1.13.0.483\0"
VALUE "FileVersion", "1.13.0.484\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
[Closed Files]
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4546,24,4554,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrReceiptTest.pas',0,1,1,31,9,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,2694,16,2727,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,924,54,934,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,300,33,309,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\oleFiscalPrinter.pas',0,1,101,91,114,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DriverError.pas',0,1,19,1,34,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\DriverTest.pas',0,1,145,19,152,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterProtocol1.pas',0,1,228,22,234,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\SerialPort.pas',0,1,382,114,412,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,8261,115,8271,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,317,94,330,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\OposConfig\Units\FiscalPrinterDevice.pas',0,1,1,1,1,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,644,15,658,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,2226,35,2230,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,32,23,46,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4546,24,4554,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrReceiptTest.pas',0,1,1,31,9,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\oleFiscalPrinter.pas',0,1,101,91,114,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DriverError.pas',0,1,19,1,34,0,0
[Modules]
Count=0
EditWindowCount=0
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\OposShtrih.bpg]
FormState=0
FormOnTop=0
......@@ -91,6 +87,10 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
[TypeLibEditWindow0]
Create=1
Visible=0
......
......@@ -107,6 +107,12 @@ object fmFptrDirectIO: TfmFptrDirectIO
BevelOuter = bvNone
BorderStyle = bsNone
Color = clBtnFace
Font.Charset = RUSSIAN_CHARSET
Font.Color = clWindowText
Font.Height = -12
Font.Name = 'Courier New'
Font.Style = []
ParentFont = False
TabOrder = 6
end
object cbCommand: TComboBox
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,483
PRODUCTVERSION 1,13,0,483
FILEVERSION 1,13,0,484
PRODUCTVERSION 1,13,0,484
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS test utility\0"
VALUE "FileVersion", "1.13.0.483\0"
VALUE "FileVersion", "1.13.0.484\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -20,7 +20,7 @@ const
CRLF = #13#10;
DIO_CUSTOM_COMMAND = $FFFF;
DIODescriptions: array[1..37] of TDirectIODescription = (
DIODescriptions: array[1..38] of TDirectIODescription = (
(Command: DIO_COMMAND_PRINTER_XML;
Description: 'XML command';
DescriptionEx: 'Data: Printer command code' + #13#10 +
......@@ -148,6 +148,22 @@ const
DescriptionEx: 'Data: tag number' + CRLF +
'[in] String: tag value';),
(Command: DIO_READ_FS_PARAMETER;
Description: 'Read fiscal storage parameter';
DescriptionEx: 'Data: parameter identifier;' + CRLF +
'DIO_FS_PARAMETER_SERIAL = 0' + CRLF +
'DIO_FS_PARAMETER_LAST_DOC_NUM = 1' + CRLF +
'DIO_FS_PARAMETER_LAST_DOC_MAC = 2' + CRLF +
'DIO_FS_PARAMETER_QUEUE_SIZE = 3' + CRLF +
'DIO_FS_PARAMETER_FIRST_DOC_NUM = 4' + CRLF +
'DIO_FS_PARAMETER_FIRST_DOC_DATE = 5' + CRLF +
'DIO_FS_PARAMETER_FISCAL_DATE = 6' + CRLF +
'DIO_FS_PARAMETER_EXPIRE_DATE = 7' + CRLF +
'DIO_FS_PARAMETER_OFD_ONLINE = 8' + CRLF +
'DIO_FS_PARAMETER_TICKET_HEX = 9' + CRLF +
'DIO_FS_PARAMETER_TICKET_STR = 10' + CRLF +
'String: returns parameter value';),
(Command: DIO_READ_FPTR_PARAMETER;
Description: 'Read fiscal printer parameter';
DescriptionEx: 'Data: parameter identifier;' + CRLF +
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 483;
GenericServiceVersion = deviceVersion113 + 484;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,483
PRODUCTVERSION 1,13,0,483
FILEVERSION 1,13,0,484
PRODUCTVERSION 1,13,0,484
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer service\0"
VALUE "FileVersion", "1.13.0.483\0"
VALUE "FileVersion", "1.13.0.484\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -1004,7 +1004,7 @@ begin
begin
if Device.CapFSCloseReceipt2 then
begin
FSSale2.RecType := FRecType;
FSSale2.RecType := FRecType + 1;
FSSale2.Quantity := Abs(FSRegistration.Quantity);
FSSale2.Price := Item.PriceWithDiscount;
FSSale2.Total := StrToInt64Def(FSRegistration.Parameter1, $FFFFFFFFFF);
......
......@@ -6541,12 +6541,7 @@ begin
end;
FCapEnablePrint := GetDeviceMetrics.Model <> 19;
FCapSubtotalRound := FCapFiscalStorage and ((GetDeviceMetrics.Model = 19) or (DiscountMode = 2));
FCapFSCloseReceipt2 := FCapFiscalStorage and (GetDeviceMetrics.Model <> 19);
if FCapFSCloseReceipt2 then
begin
FCapFSCloseReceipt2 := TestCommand($FF45);
end;
FCapFSCloseReceipt2 := FCapFiscalStorage and TestCommand($FF45);
FCapDiscount := FCapFiscalStorage and (FDiscountMode = 0) and (GetDeviceMetrics.Model <> 19);
FIsFiscalized := FCapFiscalStorage or (FLongStatus.RegistrationNumber <> 0);
end;
......@@ -7800,7 +7795,6 @@ begin
Check(FSReadTicket(Ticket));
Result := TicketToStr(Ticket);
end;
else
raise Exception.Create(MsgInvalidParameterValue);
end;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,483
PRODUCTVERSION 1,13,0,483
FILEVERSION 1,13,0,484
PRODUCTVERSION 1,13,0,484
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer print server\0"
VALUE "FileVersion", "1.13.0.483\0"
VALUE "FileVersion", "1.13.0.484\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFptrSrv.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,483
PRODUCTVERSION 1,13,0,483
FILEVERSION 1,13,0,484
PRODUCTVERSION 1,13,0,484
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Scale service\0"
VALUE "FileVersion", "1.13.0.483\0"
VALUE "FileVersion", "1.13.0.484\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
No preview for this file type
[releases]
current=1.13.0.483
current=1.13.0.484
last_date=2010-02-05
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