5.4.0 release for web
This commit is contained in:
@@ -361,7 +361,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicenta-plugins</artifactId>
|
<artifactId>unicenta-plugins</artifactId>
|
||||||
<version>1.2.7</version>
|
<version>1.3.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.gluonhq</groupId>
|
<groupId>com.gluonhq</groupId>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
log.debug("Loading Sales screen! "+this.getClass());
|
log.debug("Loading Sales screen! "+this.getClass());
|
||||||
|
|
||||||
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
||||||
SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
|
SwingWorker<String, String> reloadLayaway = new SwingWorker() {
|
||||||
@Override
|
@Override
|
||||||
protected String doInBackground() throws Exception {
|
protected String doInBackground() throws Exception {
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -133,7 +133,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
m_App.getAppUserView().getUser().getName(),
|
m_App.getAppUserView().getUser().getName(),
|
||||||
"Void",
|
"Void",
|
||||||
"Ticket Deleted",
|
"Ticket Deleted",
|
||||||
0.0
|
(Object) 0.0
|
||||||
});
|
});
|
||||||
|
|
||||||
m_sCurrentTicket = null;
|
m_sCurrentTicket = null;
|
||||||
@@ -245,7 +245,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
m_jListTickets.setText("");
|
m_jListTickets.setText("");
|
||||||
newTicket();
|
newTicket();
|
||||||
} else {
|
} else {
|
||||||
showList = m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
|
showList = (Boolean) m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
|
||||||
if (showList) {
|
if (showList) {
|
||||||
m_jListTickets.doClick();
|
m_jListTickets.doClick();
|
||||||
}
|
}
|
||||||
@@ -500,7 +500,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
if (m_sCurrentTicket != null) {
|
if (m_sCurrentTicket != null) {
|
||||||
|
|
||||||
if (m_App.getProperties().getProperty("override.check").equals("true")) {
|
if (m_App.getProperties().getProperty("override.check").equals("true")) {
|
||||||
Integer secret = Integer.parseInt(m_App.getProperties().getProperty("override.pin"));
|
Integer secret = (Integer) Integer.parseInt(m_App.getProperties().getProperty("override.pin"));
|
||||||
Integer iValue = JNumberPop.showEditNumber(this, AppLocal.getIntString("title.override.enterpin"));
|
Integer iValue = JNumberPop.showEditNumber(this, AppLocal.getIntString("title.override.enterpin"));
|
||||||
|
|
||||||
if (iValue == null ? secret == null : iValue.equals(secret)) {
|
if (iValue == null ? secret == null : iValue.equals(secret)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user