From 0c6b84dd5f19500463e980e05361169de11a7b20 Mon Sep 17 00:00:00 2001
From: hugh-unicenta <59798574+hugh-unicenta@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:56:03 +0000
Subject: [PATCH] UOCL-285: payment screen hanging (#42)

* UOCL-285: payment screen hanging

* UOCL-290: xls exports fix

* 5.3.2 release
---
 pom.xml                                       | 52 ++++++++++++-------
 .../java/com/unicenta/pos/forms/AppLocal.java |  2 +-
 .../pos/imports/CustomerCSVImport.java        |  6 ++-
 .../unicenta/pos/imports/JPanelCSVImport.java |  6 ++-
 .../unicenta/pos/imports/StockQtyImport.java  |  6 ++-
 .../unicenta/pos/payment/JPaymentSelect.java  |  2 +-
 .../pos/sales/shared/JTicketsBagShared.java   |  6 ++-
 .../com/unicenta/pos/transfer/Transfer.java   |  6 ++-
 src/main/resources/pos_messages.properties    |  2 +-
 9 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1522801..b6769bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.3.1</version>
+  <version>5.3.2</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -111,11 +111,42 @@
       <artifactId>itext</artifactId>
       <version>2.1.7</version>
     </dependency>
+
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports</artifactId>
+      <version>6.15.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.lowagie</groupId>
+          <artifactId>itext</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports-fonts</artifactId>
+      <version>6.15.0</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
-      <version>3.10.1</version>
+      <version>3.17</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi-ooxml</artifactId>
+      <version>3.17</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlbeans</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>5.1.1</version>
+    </dependency>
+
     <dependency>
       <groupId>net.sf.barcode4j</groupId>
       <artifactId>barcode4j</artifactId>
@@ -266,22 +297,7 @@
       <artifactId>fop</artifactId>
       <version>2.3</version>
     </dependency>
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports</artifactId>
-      <version>6.12.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.lowagie</groupId>
-          <artifactId>itext</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports-fonts</artifactId>
-      <version>6.0.0</version>
-    </dependency>
+
     <dependency>
       <groupId>ar.com.fdvs</groupId>
       <artifactId>DynamicJasper-core-fonts</artifactId>
diff --git a/src/main/java/com/unicenta/pos/forms/AppLocal.java b/src/main/java/com/unicenta/pos/forms/AppLocal.java
index e4b7557..75a66d0 100644
--- a/src/main/java/com/unicenta/pos/forms/AppLocal.java
+++ b/src/main/java/com/unicenta/pos/forms/AppLocal.java
@@ -30,7 +30,7 @@ public class AppLocal {
 
     public static final String APP_NAME = "uniCenta oPOS";
     public static final String APP_ID = "unicentaopos";
-    public static final String APP_VERSION = "5.3.1";
+    public static final String APP_VERSION = "5.3.2";
 
     private static final LocaleResources m_resources;
 
diff --git a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java b/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java
index 8fe269b..3242413 100644
--- a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java
+++ b/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java
@@ -41,6 +41,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -276,6 +278,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -304,7 +307,8 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
         }
       }
     };
-    pbWorker.execute();
+    // pbWorker.execute();
+    customExecutor.submit(pbWorker);
   }
 
   /**
diff --git a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java b/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java
index 348cc65..95edf35 100644
--- a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java
+++ b/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java
@@ -44,6 +44,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -292,6 +294,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
      * the UI responsiveness.
     */
     private void setWorker() {
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
         progress = 0;
         webPBar.setStringPainted(true);
 
@@ -320,7 +323,8 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 }    
             }
         };
-        pbWorker.execute();
+        //pbWorker.execute();
+        customExecutor.submit(pbWorker);
     }
 
     /**
diff --git a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java b/src/main/java/com/unicenta/pos/imports/StockQtyImport.java
index 9eb914b..9b6c8a6 100644
--- a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java
+++ b/src/main/java/com/unicenta/pos/imports/StockQtyImport.java
@@ -43,6 +43,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -511,6 +513,7 @@ public class StockQtyImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -539,7 +542,8 @@ public class StockQtyImport extends JPanel implements JPanelView {
         }
       }
     };
-    pbWorker.execute();
+    //pbWorker.execute();
+    customExecutor.submit(pbWorker);
   }
 
   /**
diff --git a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java
index 6e08809..a908d93 100644
--- a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java
+++ b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java
@@ -749,7 +749,7 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
             };
 
             //worker.execute();
-            customExecutor.execute(worker);
+            customExecutor.submit(worker);
         }
         catch (Exception ex) {
             System.out.println(ex.getMessage());
diff --git a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java
index ed97a35..8fe5884 100644
--- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java
+++ b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java
@@ -37,6 +37,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import javax.swing.*;
 
 /**
@@ -78,6 +80,7 @@ public class JTicketsBagShared extends JTicketsBag {
 
         log.debug("Loading Sales screen! "+this.getClass());
 
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
         SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
             @Override
             protected String doInBackground() throws Exception {
@@ -91,7 +94,8 @@ public class JTicketsBagShared extends JTicketsBag {
             }
         };
 
-        reloadLayaway.execute();
+        //reloadLayaway.execute();
+        customExecutor.submit(reloadLayaway);
 
         
         m_sCurrentTicket = null;
diff --git a/src/main/java/com/unicenta/pos/transfer/Transfer.java b/src/main/java/com/unicenta/pos/transfer/Transfer.java
index 3901ec9..6d95309 100644
--- a/src/main/java/com/unicenta/pos/transfer/Transfer.java
+++ b/src/main/java/com/unicenta/pos/transfer/Transfer.java
@@ -43,6 +43,8 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 
 /**
@@ -2721,6 +2723,7 @@ public final class Transfer extends JPanel implements JPanelView {
             JOptionPane.YES_NO_OPTION,
             JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
 
+      ExecutorService customExecutor = Executors.newCachedThreadPool();
       SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
         @Override
@@ -2731,7 +2734,8 @@ public final class Transfer extends JPanel implements JPanelView {
         }
       };
 
-      worker.execute();
+      //worker.execute();
+      customExecutor.submit(worker);
 
     }
     System.gc();
diff --git a/src/main/resources/pos_messages.properties b/src/main/resources/pos_messages.properties
index c32bde3..03c48ca 100644
--- a/src/main/resources/pos_messages.properties
+++ b/src/main/resources/pos_messages.properties
@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
 message.emptycustomer=Customer cannot be empty
 message.emptynumber=Number cannot be empty
 message.enterbuyprice=Enter new Buy Price
-message.eolupdate=<html><center><h2>Version 5.3.1 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
+message.eolupdate=<html><center><h2>Version 5.3.2 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
 message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK 
 message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
 message.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.