unicenta-base/unicenta-opos
3
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

UOCL-315: improve formatting to start

Browse Source
This commit is contained in:
Hugh
2025-12-24 14:10:39 +00:00
parent 3e3076f2d5
commit 56c682520e
2 changed files with 685 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4 -1
View File
@@ -7,4 +7,7 @@ nbactions.xml
*.log *.log
docker.sock docker.sock
.DS_Store .DS_Store
.settings/
.classpath
.factorypath
.project
src/main/java/com/unicenta/pos/ticket/TicketInfo.java
+57 -62
View File
@@ -48,7 +48,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public static final int RECEIPT_PAYMENT = 2; public static final int RECEIPT_PAYMENT = 2;
public static final int RECEIPT_NOSALE = 3; public static final int RECEIPT_NOSALE = 3;
// JG Jun 2017 - contain partial/full refunds // JG Jun 2017 - contain partial/full refunds
public static final int REFUND_NOT = 0; // is a non-refunded ticket public static final int REFUND_NOT = 0; // is a non-refunded ticket
public static final int REFUND_PARTIAL = 1; public static final int REFUND_PARTIAL = 1;
public static final int REFUND_ALL = 2; public static final int REFUND_ALL = 2;
@@ -82,7 +82,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
private static String hostname; private static String hostname;
public static void setHostname(String name) { public static void setHostname(String name) {
hostname =name; hostname = name;
} }
public static String getHostname() { public static String getHostname() {
@@ -103,7 +103,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
payments = new ArrayList<>(); payments = new ArrayList<>();
taxes = null; taxes = null;
m_sResponse = null; m_sResponse = null;
oldTicket=false; oldTicket = false;
AppConfig config = new AppConfig(new File(new File( AppConfig config = new AppConfig(new File(new File(
System.getProperty("user.home")), AppLocal.APP_ID + ".properties")); System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
@@ -197,7 +197,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
payments.forEach((p) -> { payments.forEach((p) -> {
t.payments.add(p.copyPayment()); t.payments.add(p.copyPayment());
}); });
t.oldTicket=oldTicket; t.oldTicket = oldTicket;
// taxes are not copied, must be calculated again. // taxes are not copied, must be calculated again.
t.ticketstatus = ticketstatus; t.ticketstatus = ticketstatus;
@@ -212,6 +212,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public int getTicketType() { public int getTicketType() {
return tickettype; return tickettype;
} }
public void setTicketType(int tickettype) { public void setTicketType(int tickettype) {
this.tickettype = tickettype; this.tickettype = tickettype;
} }
@@ -219,6 +220,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public int getTicketId() { public int getTicketId() {
return m_iTicketId; return m_iTicketId;
} }
public void setTicketId(int iTicketId) { public void setTicketId(int iTicketId) {
m_iTicketId = iTicketId; m_iTicketId = iTicketId;
} }
@@ -226,10 +228,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public int getTicketStatus() { public int getTicketStatus() {
return ticketstatus; return ticketstatus;
} }
public void setTicketStatus(int ticketstatus) { public void setTicketStatus(int ticketstatus) {
if (m_iTicketId >0) { if (m_iTicketId > 0) {
this.ticketstatus = m_iTicketId; this.ticketstatus = m_iTicketId;
}else{ } else {
this.ticketstatus = ticketstatus; this.ticketstatus = ticketstatus;
} }
} }
@@ -243,7 +246,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public String getName(Object info) { public String getName(Object info) {
// JG Aug 2014 - Add User info // JG Aug 2014 - Add User info
List<String> name = new ArrayList<>(); List<String> name = new ArrayList<>();
String nameprop = getProperty("name"); String nameprop = getProperty("name");
@@ -289,7 +292,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")), AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
AppLocal.APP_ID + ".properties")); AppLocal.APP_ID + ".properties"));
m_config_host.load(); m_config_host.load();
String machineHostname =(m_config_host.getProperty("machine.hostname")); String machineHostname = (m_config_host.getProperty("machine.hostname"));
m_config_host = null; m_config_host = null;
return machineHostname; return machineHostname;
} }
@@ -318,15 +321,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
} }
public String getTransactionID(){ public String getTransactionID() {
return (getPayments().size()>0) return (getPayments().size() > 0)
? ( getPayments().get(getPayments().size()-1) ).getTransactionID() ? (getPayments().get(getPayments().size() - 1)).getTransactionID()
: StringUtils.getCardNumber(); //random transaction ID : StringUtils.getCardNumber(); // random transaction ID
} }
public String getReturnMessage(){ public String getReturnMessage() {
return ( (getPayments().get(getPayments().size()-1)) instanceof PaymentInfoMagcard ) return ((getPayments().get(getPayments().size() - 1)) instanceof PaymentInfoMagcard)
? ((PaymentInfoMagcard)(getPayments().get(getPayments().size()-1))).getReturnMessage() ? ((PaymentInfoMagcard) (getPayments().get(getPayments().size() - 1))).getReturnMessage()
: LocalRes.getIntString("button.OK"); : LocalRes.getIntString("button.OK");
} }
@@ -403,9 +406,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public double getSubTotal() { public double getSubTotal() {
double sum = 0.0; double sum = 0.0;
sum = m_aLines.stream().map((line) -> sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
line.getSubValue()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
return sum; return sum;
} }
@@ -418,9 +419,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
nsum = sum; nsum = sum;
} }
} else { } else {
sum = m_aLines.stream().map((line) -> sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
line.getTax()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
} }
return sum; return sum;
} }
@@ -437,10 +436,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public double getTotalPaid() { public double getTotalPaid() {
double sum = 0.0; double sum = 0.0;
sum = payments.stream().filter((p) -> sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
(!"debtpaid".equals(p.getName()))).map((p) -> (accumulator, _item) -> accumulator + _item);
p.getTotal()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
return sum; return sum;
} }
@@ -533,24 +530,24 @@ public final class TicketInfo implements SerializableRead, Externalizable {
AppConfig m_config = new AppConfig(new File( AppConfig m_config = new AppConfig(new File(
(System.getProperty("user.home")), AppLocal.APP_ID + ".properties")); (System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
m_config.load(); m_config.load();
String receiptSize =(m_config.getProperty("till.receiptsize")); String receiptSize = (m_config.getProperty("till.receiptsize"));
String receiptPrefix =(m_config.getProperty("till.receiptprefix")); String receiptPrefix = (m_config.getProperty("till.receiptprefix"));
m_config =null; m_config = null;
if (m_iTicketId > 0) { if (m_iTicketId > 0) {
String tmpTicketId=Integer.toString(m_iTicketId); String tmpTicketId = Integer.toString(m_iTicketId);
if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){ if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) {
if (receiptPrefix != null){ if (receiptPrefix != null) {
tmpTicketId=receiptPrefix+tmpTicketId; tmpTicketId = receiptPrefix + tmpTicketId;
} }
return tmpTicketId; return tmpTicketId;
} }
while (tmpTicketId.length()<Integer.parseInt(receiptSize)){ while (tmpTicketId.length() < Integer.parseInt(receiptSize)) {
tmpTicketId="0"+tmpTicketId; tmpTicketId = "0" + tmpTicketId;
} }
if (receiptPrefix != null){ if (receiptPrefix != null) {
tmpTicketId=receiptPrefix+tmpTicketId; tmpTicketId = receiptPrefix + tmpTicketId;
} }
return tmpTicketId; return tmpTicketId;
} else { } else {
@@ -571,29 +568,28 @@ public final class TicketInfo implements SerializableRead, Externalizable {
return m_sHost; return m_sHost;
} }
// Added JDL 28.05.13 for loyalty card functions
// Added JDL 28.05.13 for loyalty card functions
/** /**
* *
*/ */
public void clearCardNumber(){ public void clearCardNumber() {
loyaltyCardNumber=null; loyaltyCardNumber = null;
} }
/** /**
* *
* @param cardNumber * @param cardNumber
*/ */
public void setLoyaltyCardNumber(String cardNumber){ public void setLoyaltyCardNumber(String cardNumber) {
loyaltyCardNumber=cardNumber; loyaltyCardNumber = cardNumber;
} }
/** /**
* *
* @return * @return
*/ */
public String getLoyaltyCardNumber(){ public String getLoyaltyCardNumber() {
return (loyaltyCardNumber); return (loyaltyCardNumber);
} }
@@ -629,8 +625,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
return Formats.CURRENCY.formatValue(getTendered()); return Formats.CURRENCY.formatValue(getTendered());
} }
public String VoucherReturned(){ public String VoucherReturned() {
return Formats.CURRENCY.formatValue(getTotalPaid()- getTotal()); return Formats.CURRENCY.formatValue(getTotalPaid() - getTotal());
} }
public boolean getOldTicket() { public boolean getOldTicket() {
@@ -642,28 +638,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public String getTicketHeaderFooterData(String data) { public String getTicketHeaderFooterData(String data) {
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")) AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
, AppLocal.APP_ID + ".properties"));
m_config.load(); m_config.load();
String row =(m_config.getProperty("tkt."+data)); String row = (m_config.getProperty("tkt." + data));
return row; return row;
} }
public String printQRCode(String nameHeader, String vatHeader, String vatLabel){ public String printQRCode(String nameHeader, String vatHeader, String vatLabel) {
String name = getTicketHeaderFooterData(nameHeader); String name = getTicketHeaderFooterData(nameHeader);
String vatNumberHeader = getTicketHeaderFooterData(vatHeader); String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
String vatNumber = vatNumberHeader.split(vatLabel)[1]; String vatNumber = vatNumberHeader.split(vatLabel)[1];
String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate()); String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
String total = String.valueOf(getTotal()); String total = String.valueOf(getTotal());
String vatValue = String.valueOf(getTax()); String vatValue = String.valueOf(getTax());
return name+","+vatNumber+","+date+","+total+","+vatValue; return name + "," + vatNumber + "," + date + "," + total + "," + vatValue;
} }
public String printTicketHeaderLine1() { public String printTicketHeaderLine1() {
String lineData = getTicketHeaderFooterData("header1"); String lineData = getTicketHeaderFooterData("header1");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -673,7 +668,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine2() { public String printTicketHeaderLine2() {
String lineData = getTicketHeaderFooterData("header2"); String lineData = getTicketHeaderFooterData("header2");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -683,7 +678,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine3() { public String printTicketHeaderLine3() {
String lineData = getTicketHeaderFooterData("header3"); String lineData = getTicketHeaderFooterData("header3");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -693,7 +688,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine4() { public String printTicketHeaderLine4() {
String lineData = getTicketHeaderFooterData("header4"); String lineData = getTicketHeaderFooterData("header4");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -703,7 +698,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine5() { public String printTicketHeaderLine5() {
String lineData = getTicketHeaderFooterData("header5"); String lineData = getTicketHeaderFooterData("header5");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -713,7 +708,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine6() { public String printTicketHeaderLine6() {
String lineData = getTicketHeaderFooterData("header6"); String lineData = getTicketHeaderFooterData("header6");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -723,7 +718,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine1() { public String printTicketFooterLine1() {
String lineData = getTicketHeaderFooterData("footer1"); String lineData = getTicketHeaderFooterData("footer1");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -733,7 +728,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine2() { public String printTicketFooterLine2() {
String lineData = getTicketHeaderFooterData("footer2"); String lineData = getTicketHeaderFooterData("footer2");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -743,7 +738,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine3() { public String printTicketFooterLine3() {
String lineData = getTicketHeaderFooterData("footer3"); String lineData = getTicketHeaderFooterData("footer3");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -753,7 +748,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine4() { public String printTicketFooterLine4() {
String lineData = getTicketHeaderFooterData("footer4"); String lineData = getTicketHeaderFooterData("footer4");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -763,7 +758,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine5() { public String printTicketFooterLine5() {
String lineData = getTicketHeaderFooterData("footer5"); String lineData = getTicketHeaderFooterData("footer5");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -773,7 +768,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine6() { public String printTicketFooterLine6() {
String lineData = getTicketHeaderFooterData("footer6"); String lineData = getTicketHeaderFooterData("footer6");
if(lineData != null) { if (lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";