UOCL-315: improve formatting to start
This commit is contained in:
+4
-1
@@ -7,4 +7,7 @@ nbactions.xml
|
|||||||
*.log
|
*.log
|
||||||
docker.sock
|
docker.sock
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.settings/
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
|||||||
@@ -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,6 +228,7 @@ 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;
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -571,7 +568,6 @@ 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
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -642,8 +638,7 @@ 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));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user