From 6210a7ef1085eb576cba5366d0ae45afd05fb9eb Mon Sep 17 00:00:00 2001 From: mjpcger <37701263+mjpcger@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:18:01 +0100 Subject: [PATCH 1/3] Missing Constants Added Constants that have been defined in UPOS 1.15.1 have been added. --- src/main/java/jpos/ElectronicValueRWConst.java | 16 ++++++++++++++++ src/main/java/jpos/FiscalPrinterConst.java | 4 ++++ src/main/java/jpos/POSPrinterConst.java | 14 ++++++++++++++ src/main/java/jpos/ScannerConst.java | 12 ++++++++++++ 4 files changed, 46 insertions(+) diff --git a/src/main/java/jpos/ElectronicValueRWConst.java b/src/main/java/jpos/ElectronicValueRWConst.java index 17a862d..01d5e79 100644 --- a/src/main/java/jpos/ElectronicValueRWConst.java +++ b/src/main/java/jpos/ElectronicValueRWConst.java @@ -99,6 +99,14 @@ // EVRW_TE_NOTIFY_LOCK // EVRW_TE_NOTIFY_CENTER_CHECK_COMPLETE // EVRW_TE_CONFIRM_PIN_ENTRY_BY_OUTER_PINPAD +// 2025-Feb-04 JavaPOS Release 1.15.2 MC +// Added new constants: +// EVRW_TAG_VR_VOID +// EVRW_TAG_VR_RETURN +// EVRW_TAG_VTT_SALES +// EVRW_TAG_VTT_CHARGE +// EVRW_TAG_VTT_CANCEL +// EVRW_TAG_VTT_RETURN // ///////////////////////////////////////////////////////////////////// @@ -314,6 +322,14 @@ public interface ElectronicValueRWConst public static final int EVRW_TAG_TT_COMPLETION = 10; // Added in release 1.15 public static final int EVRW_TAG_TT_PRE_SALES = 11; // Added in release 1.15 + public static final int EVRW_TAG_VR_VOID = 1; // Added in release 1.15.2 + public static final int EVRW_TAG_VR_RETURN = 2; // Added in release 1.15.2 + + public static final int EVRW_TAG_VTT_SALES = 1; // Added in release 1.15.2 + public static final int EVRW_TAG_VTT_CHARGE = 2; // Added in release 1.15.2 + public static final int EVRW_TAG_VTT_CANCEL = 3; // Added in release 1.15.2 + public static final int EVRW_TAG_VTT_RETURN = 4; // Added in release 1.15.2 + ///////////////////////////////////////////////////////////////////// // "transactionAccess" Method: "Control" Parameter Constants ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/jpos/FiscalPrinterConst.java b/src/main/java/jpos/FiscalPrinterConst.java index 1c0972a..6cb8c4b 100644 --- a/src/main/java/jpos/FiscalPrinterConst.java +++ b/src/main/java/jpos/FiscalPrinterConst.java @@ -48,6 +48,9 @@ // FPTR_RT_EOD_ORDINAL // Added new ErrorCodeExtended constant: // JPOS_EFPTR_DAY_END_REQUIRED +// 2025-Feb-04 JavaPOS Release 1.15.2 MC +// Added new GetData constant: +// FPTR_GD_VAT_ID_LIST // ///////////////////////////////////////////////////////////////////// @@ -284,6 +287,7 @@ public interface FiscalPrinterConst public static final int FPTR_GD_TENDER = 26; public static final int FPTR_GD_LINECOUNT = 27; public static final int FPTR_GD_DESCRIPTION_LENGTH = 28; + public static final int FPTR_GD_VAT_ID_LIST = 29; // Added in release 1.15.2 public static final int FPTR_PDL_CASH = 1; public static final int FPTR_PDL_CHEQUE = 2; diff --git a/src/main/java/jpos/POSPrinterConst.java b/src/main/java/jpos/POSPrinterConst.java index 53a5216..0c30df5 100644 --- a/src/main/java/jpos/POSPrinterConst.java +++ b/src/main/java/jpos/POSPrinterConst.java @@ -82,6 +82,14 @@ // Re-added dropped, misspelled slip cartridge constant for backwards // compatibility. // PTR_SUE_SLP_CARTDRIGE_OK +// 2025-Feb-04 JavaPOS Release 1.15.2 MC +// Marked Bar Code Symbology value as deprecated: +// PTR_BCS_EAN128 +// Added Bar Code Symbology value as replacement for PTR_BCS_EAN128: +// PTR_BCS_GS1128 +// Added Bar Code Symbology values: +// PTR_BCS_DOTCODE +// PTR_BCS_HANXIN // ///////////////////////////////////////////////////////////////////// @@ -275,6 +283,7 @@ public interface POSPrinterConst // barcode public static final int PTR_BCS_EAN13_S = 119; // EAN 13 with supplemental // barcode +@deprecated // Deprecated JavaPOS 1.15.2 public static final int PTR_BCS_EAN128 = 120; // EAN 128 public static final int PTR_BCS_OCRA = 121; // OCR "A" public static final int PTR_BCS_OCRB = 122; // OCR "B" @@ -290,6 +299,11 @@ public interface POSPrinterConst public static final int PTR_BCS_GS1DATABAR_E = 132; // GS1 DataBar Expanded public static final int PTR_BCS_GS1DATABAR_S = 133; // GS1 DataBar Stacked Omnidirectional public static final int PTR_BCS_GS1DATABAR_E_S = 134; // GS1 DataBar Expanded Stacked + + // Added in Release 1.15.2 + public static final int PTR_BCS_GS1128 = 120; // GS1-128 + public static final int PTR_BCS_DOTCODE = 124; // Dot Code + public static final int PTR_BCS_HANXIN = 125; // Han Xin Code // Two dimensional symbologies public static final int PTR_BCS_PDF417 = 201; diff --git a/src/main/java/jpos/ScannerConst.java b/src/main/java/jpos/ScannerConst.java index a498489..2cb4447 100644 --- a/src/main/java/jpos/ScannerConst.java +++ b/src/main/java/jpos/ScannerConst.java @@ -73,6 +73,13 @@ // SCAN_SDT_UsIntelligent // SCAN_SDT_UsPlanet // SCAN_SDT_PostNet +// 2025-Feb-04 JavaPOS Release 1.15.2 MC +// Marked ScanDataType constant as deprecated: +// SCAN_SDT_EAN128 +// Added ScanDataType constant as replacement for SCAN_SDT_EAN128: +// SCAN_SDT_GS1128 +// Added new ScanDataType constant: +// SCAN_SDT_DWCODE // ///////////////////////////////////////////////////////////////////// @@ -124,6 +131,7 @@ public interface ScannerConst // supplemental barcode public static final int SCAN_SDT_EAN13_S = 119; // EAN 13 with // supplemental barcode +@deprecated // Deprecated JavaPOS 1.15.2 public static final int SCAN_SDT_EAN128 = 120; // EAN 128 public static final int SCAN_SDT_OCRA = 121; // OCR "A" public static final int SCAN_SDT_OCRB = 122; // OCR "B" @@ -153,6 +161,10 @@ public interface ScannerConst public static final int SCAN_SDT_PLESSEY = 144; // Plessey Code public static final int SCAN_SDT_TELEPEN = 145; // Telepen + // One dimensional symbologies (added in Release 1.15.2) + public static final int SCAN_SDT_GS1128 = 120; // GS1-128 + public static final int SCAN_SDT_DWCODE = 146; // Digital Watermarking + // Composite Symbologies (Added in Release 1.8) public static final int SCAN_SDT_CCA = 151; // Composite Component A. public static final int SCAN_SDT_CCB = 152; // Composite Component B. From e69abd69297a45bec7e88cfc4b12bea3ff60cdb3 Mon Sep 17 00:00:00 2001 From: mjpcger <37701263+mjpcger@users.noreply.github.com> Date: Wed, 5 Feb 2025 21:14:58 +0100 Subject: [PATCH 2/3] Spelling Error Correction Of cause, @Deprecated must be written with capital D.. --- src/main/java/jpos/POSPrinterConst.java | 2 +- src/main/java/jpos/ScannerConst.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/jpos/POSPrinterConst.java b/src/main/java/jpos/POSPrinterConst.java index 0c30df5..e4a91da 100644 --- a/src/main/java/jpos/POSPrinterConst.java +++ b/src/main/java/jpos/POSPrinterConst.java @@ -283,7 +283,7 @@ public interface POSPrinterConst // barcode public static final int PTR_BCS_EAN13_S = 119; // EAN 13 with supplemental // barcode -@deprecated // Deprecated JavaPOS 1.15.2 +@Deprecated // Deprecated JavaPOS 1.15.2 public static final int PTR_BCS_EAN128 = 120; // EAN 128 public static final int PTR_BCS_OCRA = 121; // OCR "A" public static final int PTR_BCS_OCRB = 122; // OCR "B" diff --git a/src/main/java/jpos/ScannerConst.java b/src/main/java/jpos/ScannerConst.java index 2cb4447..8a173cd 100644 --- a/src/main/java/jpos/ScannerConst.java +++ b/src/main/java/jpos/ScannerConst.java @@ -131,7 +131,7 @@ public interface ScannerConst // supplemental barcode public static final int SCAN_SDT_EAN13_S = 119; // EAN 13 with // supplemental barcode -@deprecated // Deprecated JavaPOS 1.15.2 +@Deprecated // Deprecated JavaPOS 1.15.2 public static final int SCAN_SDT_EAN128 = 120; // EAN 128 public static final int SCAN_SDT_OCRA = 121; // OCR "A" public static final int SCAN_SDT_OCRB = 122; // OCR "B" From 91fcdb1378785cc14405eb14fb597c826b947ff9 Mon Sep 17 00:00:00 2001 From: mjpcger <37701263+mjpcger@users.noreply.github.com> Date: Fri, 7 Feb 2025 19:31:49 +0100 Subject: [PATCH 3/3] Added Javadoc Comments Javadoc comments have been added to explain why deprecation has been added to PTR_BCS_EAN128 and SCAN_SDT_EAN128. --- src/main/java/jpos/POSPrinterConst.java | 5 +++++ src/main/java/jpos/ScannerConst.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/jpos/POSPrinterConst.java b/src/main/java/jpos/POSPrinterConst.java index e4a91da..0249b28 100644 --- a/src/main/java/jpos/POSPrinterConst.java +++ b/src/main/java/jpos/POSPrinterConst.java @@ -283,6 +283,11 @@ public interface POSPrinterConst // barcode public static final int PTR_BCS_EAN13_S = 119; // EAN 13 with supplemental // barcode + /** + * EAN-128 is deprecated and has been replaced by GS1-128. Therefore, + * PTR_BCS_EAN128 has been replaced by PRT_BCS_GS1128. See specification + * of UPOS 1.15.1. + */ @Deprecated // Deprecated JavaPOS 1.15.2 public static final int PTR_BCS_EAN128 = 120; // EAN 128 public static final int PTR_BCS_OCRA = 121; // OCR "A" diff --git a/src/main/java/jpos/ScannerConst.java b/src/main/java/jpos/ScannerConst.java index 8a173cd..46551af 100644 --- a/src/main/java/jpos/ScannerConst.java +++ b/src/main/java/jpos/ScannerConst.java @@ -131,6 +131,12 @@ public interface ScannerConst // supplemental barcode public static final int SCAN_SDT_EAN13_S = 119; // EAN 13 with // supplemental barcode + + /** + * EAN-128 is deprecated and has been replaced by GS1-128. Therefore, + * SCAN_SDT_EAN128 has been replaced by SCAN_SDT_GS1128. See specification + * of UPOS 1.15.1. + */ @Deprecated // Deprecated JavaPOS 1.15.2 public static final int SCAN_SDT_EAN128 = 120; // EAN 128 public static final int SCAN_SDT_OCRA = 121; // OCR "A"