[-] Minor changes

shtrih-m · Nov 28, 2023 · 552eb5e · 552eb5e
1 parent 8c32f1c
commit 552eb5e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 71 deletions.
diff --git a/Source/Core/src/com/shtrih/fiscalprinter/command/TextReportStorage.java b/Source/Core/src/com/shtrih/fiscalprinter/command/TextReportStorage.java
@@ -107,7 +107,7 @@ private int findNextDocument(List<String> lines, int index) {
     }
 
     private boolean isDocumentHeader(String line) {
-        return line.contains(TextDocumentFilter.SINN);
+        return line.contains(TextDocumentFilter.SINN) && line.contains("№");
     }
 
     private List<String> copyLines(List<String> lines, int index1, int index2) {

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 = "704-1-g76ae479d";
+    public static final String VERSION = "704-4-g8c32f1c0";
 }
diff --git a/Source/FiscalPrinterService/test/com/shtrih/jpos/fiscalprinter/TextReportStorageTests.java b/Source/FiscalPrinterService/test/com/shtrih/jpos/fiscalprinter/TextReportStorageTests.java
@@ -15,7 +15,7 @@
 /**
  * @author P.Zhirkov
  */
-@Ignore
+
 public class TextReportStorageTests {
 
     private File file;
@@ -24,7 +24,6 @@ public class TextReportStorageTests {
     @Before
     public void context() throws IOException {
         file = File.createTempFile("TextReportStorageTests", ".txt");
-
         storage = new TextReportStorage(file.getAbsolutePath());
     }
 
@@ -238,6 +237,7 @@ public void should_search_first_and_single_z_report() throws Exception {
         assertEqual(expectedReport, storage.searchZReport(1));
     }
 
+    @Ignore
     @Test
     public void should_search_z_report_in_the_middle() throws Exception {
         writeFile("ККТ 1358                  ИНН 770123456789 №0237\n" +
@@ -338,6 +338,7 @@ public void should_search_z_report_in_the_middle() throws Exception {
         assertEqual(expectedReport, storage.searchZReport(19));
     }
 
+    @Ignore
     @Test
     public void should_search_z_report_in_the_middle_when_previous_report_has_different_number_then_minus_one() throws Exception {
         writeFile("ККТ 1358                  ИНН 770123456789 №0237\n" +
@@ -434,10 +435,12 @@ public void should_search_z_report_in_the_middle_when_previous_report_has_differ
                 "НЕОБНУЛ.СУММА ПОКУПОК НА НАЧ.СМЕНЫ          0.00\n" +
                 "ЧЕКОВ ПРОДАЖ                                0000\n" +
                 "0000                                        0.00\n";
-
-        assertEqual(expectedReport, storage.searchZReport(19));
+        List<String> report = storage.searchZReport(19);
+        assertEqual(expectedReport, report);
     }
 
+
+    @Ignore
     @Test
     public void should_search_z_report_in_the_middle_with_no_documents() throws Exception {
         writeFile("ККТ 1358                  ИНН 770123456789 №0237\n" +
@@ -1051,7 +1054,7 @@ public void should_return_null_when_current_report_was_not_found() throws Except
     }
 
     private void writeFile(String text) throws IOException {
-        OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("utf-8"));
+        OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file));
 
         try {
             writer.write(text);

diff --git a/Source/FiscalPrinterTest/Res/PPPConfig.json b/Source/FiscalPrinterTest/Res/PPPConfig.json
diff --git a/Source/FiscalPrinterTest/Res/jpos.xml b/Source/FiscalPrinterTest/Res/jpos.xml
@@ -250,7 +250,7 @@
         <!-- Combine item adjustments (enabled by default) -->
 		<prop name="printReceiptItemAsText" type="String" value="0"/>
         <!-- Text report enabled -->
-        <prop name="textReportEnabled" type="String" value="0"/>
+        <prop name="textReportEnabled" type="String" value="1"/>
         <!-- Text report file name -->
         <prop name="textReportFileName" type="String" value="archive.txt"/>
         <!-- Text report empty lines enabled -->

diff --git a/Source/FiscalPrinterTest/Res/test.bat b/Source/FiscalPrinterTest/Res/test.bat
diff --git a/Source/FiscalPrinterTest/Res/test.sh b/Source/FiscalPrinterTest/Res/test.sh
diff --git a/Source/FiscalPrinterTest/src/PrinterTest.java b/Source/FiscalPrinterTest/src/PrinterTest.java
@@ -3995,6 +3995,10 @@ public void printFiscalReceipt145_7()
             printer.printRecItem("2. Item2", 124, 123400, 0, 124, "");
             printer.printRecTotal(10000, 10000, "");
             printer.endFiscalReceipt(false);
+
+            int docNumber = printer.readLongPrinterStatus().getDocumentNumber();
+            printer.printJournalDocNumber(docNumber);
+
         } catch (Exception e) {
             e.printStackTrace();
         }