[-] Fixed error with header and trailer print

[-] Fixed error with discount in receipt template
shtrih-m · May 13, 2022 · af728e7 · af728e7
1 parent 6d6f416
commit af728e7
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 38 deletions.
diff --git a/History.txt b/History.txt
@@ -12,6 +12,8 @@
 
   [+] Added parameter autoPrintZReport to jpos.xml to automatically print 
       Z report in beginFiscalReceipt method
+  [-] Fixed error with header and trailer print
+  [-] Fixed error with discount in receipt template
 
 ********************************************************************************
 

diff --git a/Source/Core/src/com/shtrih/fiscalprinter/SMFiscalPrinterImpl.java b/Source/Core/src/com/shtrih/fiscalprinter/SMFiscalPrinterImpl.java
@@ -154,9 +154,9 @@ enum Boolean {
     private volatile boolean interrupted = false;
     private Integer fdVersion = null;
     private boolean capLastErrorText = true;
-    private int[] taxRates = null;
     private FDOParameters fdoParameters = null;
     public boolean isTableTextCleared = false;
+    private final Map<Integer, Integer> taxRates = new HashMap<Integer, Integer>();
 
     public SMFiscalPrinterImpl(PrinterPort port, PrinterProtocol device,
             FptrParameters params) {
@@ -352,22 +352,6 @@ private void beforeCommand(PrinterCommand command) throws Exception {
         }
     }
 
-    private void readTaxRates() throws Exception
-    {
-        if (taxRates != null){
-            return;
-        }
-
-        ReadTableInfo command = readTableInfo(PrinterConst.SMFP_TABLE_TAX);
-        if (command.isSucceeded()) {
-            int rowCount = command.getRowCount();
-            taxRates = new int[rowCount + 1];
-            for (int i = 1; i <= rowCount; i++) {
-                taxRates[i] = Integer.parseInt(readTable2(PrinterConst.SMFP_TABLE_TAX, i, 1));
-            }
-        }
-    }
-
     private void afterCommand(PrinterCommand command) throws Exception {
         for (IPrinterEvents printerEvents : events) {
             try {
@@ -3717,13 +3701,19 @@ public String getTaxName(int number) throws Exception {
         return readTable2(PrinterConst.SMFP_TABLE_TAX, number, 2);
     }
 
-    public int getTaxRate(int number) throws Exception {
-        return taxRates[number];
+    public int getTaxRate(int number) throws Exception 
+    {
+        Integer taxRate = taxRates.get(number);
+        if (taxRate == null)
+        {
+            taxRate = Integer.parseInt(readTable2(PrinterConst.SMFP_TABLE_TAX, number, 1));
+            taxRates.put(number, taxRate);
+        }
+        return taxRate;
     }
 
     public long getTaxAmount(int tax, long amount) throws Exception
     {
-        readTaxRates();
         double taxRate = getTaxRate(tax) / 10000.0;
         return Math.round(amount * taxRate / (1 + taxRate));
     }

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/DriverHeader.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/DriverHeader.java
@@ -38,15 +38,8 @@ public DriverHeader(SMFiscalPrinter printer) throws Exception {
         this.printer = printer;
 
         int numHeaderLines = printer.getParams().numHeaderLines;
-        if (numHeaderLines < printer.getNumHeaderLines()){
-            numHeaderLines = printer.getNumHeaderLines();
-        }
         header = new ReceiptLines(numHeaderLines);
-
         int numTrailerLines = printer.getParams().numTrailerLines;
-        if (numTrailerLines < printer.getNumTrailerLines()){
-            numTrailerLines = printer.getNumTrailerLines();
-        }
         trailer = new ReceiptLines(numTrailerLines);
     }
 

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSaleReceiptItem.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSaleReceiptItem.java
@@ -166,7 +166,7 @@ public String getPostLine() {
     /**
      * @return the discounts
      */
-    public FSDiscounts getDiscounts() {
+    private FSDiscounts getDiscounts() {
         return discounts;
     }
 

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java
@@ -693,7 +693,7 @@ public void printFSSaleNoTemplate(FSSaleReceiptItem item) throws Exception {
         printReceiptItem(item);
         printOperationTLV(item);
 
-        long discountTotal = item.getDiscounts().getTotal();
+        long discountTotal = item.getDiscount();
         if (discountTotal != 0) {
             String text = "=" + StringUtils.amountToString(discountTotal);
             getDevice().printLines("СКИДКА", text);
@@ -1432,13 +1432,11 @@ public void applyDiscounts() throws Exception {
     public void applyItemDiscounts(FSSaleReceiptItem item, Vector fpItems)
             throws Exception 
     {
-        long discount = item.getDiscounts().getTotal();
+        long discount = item.getDiscount();
         long total = item.getTotal() - discount;
         long price = item.getPrice();
         double quantity = item.getQuantity();
 
-        item.getDiscounts().clear();
-
         if (discount == 0) {
             fpItems.add(item);
             return;

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 = "651-1-gb844f91";
+    public static final String VERSION = "651-2-g6d6f416";
 }
diff --git a/Source/FiscalPrinterTest/Res/jpos.xml b/Source/FiscalPrinterTest/Res/jpos.xml
@@ -87,7 +87,7 @@
         <!-- 0 - command 10h, short status request  -->
         <!-- 1 - command 11h, long status request  -->
         <!-- 2 - status command selected by driver -->
-        <prop name="statusCommand" type="String" value="2"/>
+        <prop name="statusCommand" type="String" value="1"/>
         <!-- Localization file name -->
         <prop name="messagesFileName" type="String" value="shtrihjavapos_ru.properties"/>
         <!-- Wrap text enabled -->
@@ -255,13 +255,11 @@
         <prop name="textReportEmptyLinesEnabled" type="String" value="0"/>
 		<!-- Receipt template -->
 		<prop name="FSCombineItemAdjustments" type="String" value="0"/>
-		<prop name="ReceiptTemplateEnabled" type="String" value="0"/>
+		<prop name="ReceiptTemplateEnabled" type="String" value="1"/>
 		<prop name="FieldSeparator" type="String" value=":"/>
 		<prop name="ItemTableHeader" type="String"  value="-------------------HEADER-----------------"/>
 		<prop name="ItemTableTrailer" type="String" value="-------------------TRAILER----------------"/>
-		<prop name="ItemRowFormat" type="String" value="%3lFIELD0%%36lTITLE%%3FIELD1%%22SUM% X %5lQUAN%%=$10TOTAL_TAX%:
-		%TAG_NAME2108% %TAG_VALUE2108%:
-		%TAG_NAME2115% %TAG_VALUE2115%"/>
+		<prop name="ItemRowFormat" type="String"      value="%TAG_VALUE2115%%38lTITLE% %8SUBJECT_TYPE%:%7lTAX_NAME% %8PRICE% %8DISCOUNT% %8SUM%*%6lQUAN%%2lTAG_VALUE2108%%8TOTAL%:%5TAG_VALUE1222%:%TAG_VALUE1225%:%TAG_NAME1226% %TAG_VALUE1226%:%TAG_NAME1171% %TAG_VALUE1171%"/>
 		<!-- <prop name="DiscountFormat" type="String" value="    СКИДКА  %29lTITLE%%=$10TOTAL%"/> -->
 		<prop name="DiscountFormat" type="String" value=""/>
 		<!-- <prop name="ChargeFormat" type="String"   value="    НАДБАВКА  %29lTITLE%%=$10TOTAL%"/> -->

diff --git a/Source/FiscalPrinterTest/src/PrinterTest.java b/Source/FiscalPrinterTest/src/PrinterTest.java
@@ -1046,6 +1046,7 @@ public void printFiscalReceipt() {
             //printReceiptWithError5();
 
             printReceiptWithError9();
+            //printFiscalReceipt666();
         } catch (Exception e) {
             e.printStackTrace();
         }