[-] Fixed error with writing TLV when processTag1256 = false

shtrih-m · Aug 29, 2023 · c25648f · c25648f
1 parent 2cdac14
commit c25648f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/History.txt b/History.txt
@@ -5,6 +5,13 @@
   Company : SHTRIH-M www.shtrih-m.ru (495) 787-6090
   Url     : https://github.com/shtrih-m/javapos_shtrih
 
+********************************************************************************
+
+  29.08.2023
+  deviceServiceVersion = 1013701
+
+  [-] Fixed error with writing TLV when processTag1256 = false
+
 ********************************************************************************
 
   16.08.2023

diff --git a/Source/Core/src/com/shtrih/fiscalprinter/SMFiscalPrinterImpl.java b/Source/Core/src/com/shtrih/fiscalprinter/SMFiscalPrinterImpl.java
@@ -3610,6 +3610,8 @@ public void filterTLV(TLVItems src, TLVItems dst, int ffd) throws Exception {
         src.removeEmptySTLV();
         if (params.processTag1256) {
             TLVFilter.filter(src, dst, ffd);
+        } else{
+            dst.add(src);
         }
     }
 

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java
@@ -1363,7 +1363,8 @@ public void fsWriteTLV(byte[] data, boolean print) throws Exception {
     }
 
     public void fsWriteOperationTLV(byte[] data, boolean print) throws Exception {
-        FSTLVItem item = new FSTLVItem(data, getParams().getFont(), print);
+        FSTLVItem item = new FSTLVItem(
+                data, getParams().getFont(), print);
         if (getParams().tagsBeforeItem) {
             itemTags.add(item);
         } else {

diff --git a/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java b/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java
@@ -1,5 +1,5 @@
 package com.shtrih.util;
 
 public class ServiceVersion {
-    public static final String VERSION = "699-1-gdc1a9a7";
+    public static final String VERSION = "700";
 }
diff --git a/Source/FiscalPrinterTest/src/PrinterTest.java b/Source/FiscalPrinterTest/src/PrinterTest.java
@@ -3983,6 +3983,11 @@ public void printFiscalReceipt145_7()
             printer.beginFiscalReceipt(false);
             printer.fsWriteTag(1008, "foo@example.com");
 
+            TLVWriter tlvWriter = new TLVWriter();
+            tlvWriter.add(1227, "БЕТА ООО");
+            tlvWriter.add(1228, "9705069985");
+            printer.fsWriteTag(1256, tlvWriter.getBytes());
+
             printer.setItemCode(QRCodeData, true);
             printer.printRecItem("1. Item1", 124, 123000, 0, 124, "");
             printer.addItemCode(data, true);