5.3.2 release

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;
 

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);
   }
 
   /**

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);
     }
 
     /**

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);
   }
 
   /**

src/main/java/com/unicenta/pos/payment/JPaymentSelect.java

@@ -19,6 +19,7 @@
 
 package com.unicenta.pos.payment;
 
+import com.unicenta.basic.BasicException;
 import com.unicenta.format.Formats;
 import com.unicenta.pos.customers.CustomerInfoExt;
 import com.unicenta.pos.customers.DataLogicCustomers;
@@ -26,19 +27,22 @@ import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSales;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.JFrame;
-import javax.swing.SwingWorker;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.swing.*;
 
 /**
  *
  * @author adrianromero
  */
+@Slf4j
 public abstract class JPaymentSelect extends javax.swing.JDialog
         implements JPaymentNotifier {
 
@@ -720,27 +724,37 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
 
     private void m_jButtonOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonOKActionPerformed
 
-        SwingWorker worker = new SwingWorker() {
-            @Override
-            protected Object doInBackground() throws Exception {
-                m_jButtonOK.setEnabled(false);
-                setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
-                return null;
-            }
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
 
-            @Override
-            public void done() {
-                m_jButtonOK.setEnabled(true);
-                m_jButtonCancel.setEnabled(true);
-                if (returnPayment != null) {
-                    m_aPaymentInfo.add(returnPayment);
-                    accepted = true;
-                    dispose();
+        try {
+            SwingWorker worker = new SwingWorker() {
+
+                @Override
+                protected Object doInBackground() {
+                    m_jButtonOK.setEnabled(false);
+                    setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
+                    return null;
                 }
-            }
-        };
 
-        worker.execute();
+                @Override
+                public void done() {
+                    m_jButtonOK.setEnabled(true);
+                    m_jButtonCancel.setEnabled(true);
+                    if (returnPayment != null) {
+                        m_aPaymentInfo.add(returnPayment);
+                        accepted = true;
+                        dispose();
+                    }
+                }
+            };
+
+            //worker.execute();
+            customExecutor.submit(worker);
+        }
+        catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+
     }//GEN-LAST:event_m_jButtonOKActionPerformed
 
     private void m_jButtonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonCancelActionPerformed

src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java

@@ -23,6 +23,8 @@ import com.unicenta.pos.catalog.CatalogSelector;
 import com.unicenta.pos.catalog.JCatalog;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.ticket.ProductInfoExt;
+import lombok.extern.slf4j.Slf4j;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -34,6 +36,7 @@ import javax.swing.event.ListSelectionListener;
  *
  * @author JG uniCenta
  */
+@Slf4j
 public class JPanelTicketSales extends JPanelTicket {
 
     private CatalogSelector m_cat;
@@ -95,6 +98,7 @@ public class JPanelTicketSales extends JPanelTicket {
      */
     @Override
     protected JTicketsBag getJTicketsBag() {
+        log.debug("Get JTickets Bag");
         return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
     }
     

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.*;
 
 /**
@@ -51,6 +53,7 @@ public class JTicketsBagShared extends JTicketsBag {
     private DataLogicSales dlSales = null;  
     private final DataLogicSystem dlSystem;    
     private Boolean showList;
+    private int existingOrderCount;
    
     
     /** Creates new form JTicketsBagShared
@@ -78,7 +81,8 @@ public class JTicketsBagShared extends JTicketsBag {
 
         log.debug("Loading Sales screen! "+this.getClass());
 
-        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
+        SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
             @Override
             protected String doInBackground() throws Exception {
                 while (true) {
@@ -91,7 +95,8 @@ public class JTicketsBagShared extends JTicketsBag {
             }
         };
 
-        reloadLayaway.execute();
+        //reloadLayaway.execute();
+        customExecutor.submit(reloadLayaway);
 
         
         m_sCurrentTicket = null;
@@ -128,7 +133,7 @@ public class JTicketsBagShared extends JTicketsBag {
                 m_App.getAppUserView().getUser().getName(),
                 "Void",   
                 "Ticket Deleted",
-              (Object) 0.0
+                0.0
             });
 
         m_sCurrentTicket = null;
@@ -136,12 +141,26 @@ public class JTicketsBagShared extends JTicketsBag {
     }
 
     public void updateCount() {
+
+        /*
+        1. Need to get / set  the existing count
+        2. When count increases show dialog
+         */
         try {
             List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
             int count = l.size();
+
+            if (count > existingOrderCount) {
+                log.info("New Order Received from the API!");
+                // show Order Window
+//                List<ReprintTicketInfo> ticketInfoList= dlSales.getReprintTicketList();
+//                JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this);
+//                String id = listDialog.showTicketsList(ticketInfoList, dlSales);
+            }
             
             if (count > 0) {
                 m_jListTickets.setText(Integer.toString(count));
+                existingOrderCount = count;
             } else {
                 m_jListTickets.setText("");
             }
@@ -226,7 +245,7 @@ public class JTicketsBagShared extends JTicketsBag {
                 m_jListTickets.setText("");                
                 newTicket();
             } else {
-                showList = (Boolean) m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
+                showList = m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
                 if (showList) {
                     m_jListTickets.doClick();                   
                 }
@@ -423,6 +442,10 @@ public class JTicketsBagShared extends JTicketsBag {
         ((JRootApp)m_App).closeAppView();
     }//GEN-LAST:event_m_jHoldActionPerformed
 
+    private void showOrderWindow() {
+
+    }
+
     private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
         SwingUtilities.invokeLater(new Runnable() {
             @Override

src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java

@@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog {
         m_ticket = null;
         m_ticketCopy = null;        
 
-ReprintTicketInfo m_Ticket = null;
+        ReprintTicketInfo m_Ticket = null;
         
         for (ReprintTicketInfo aticket : atickets) {
             m_jtickets.add(new JButtonTicket(aticket, dlSales));

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();

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.