diff --git a/pom.xml b/pom.xml index dd2def6..342d60f 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ com.unicenta unicenta-plugins - 1.2.7 + 1.2.9-SNAPSHOT com.gluonhq diff --git a/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java b/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java index 4bf2af0..70bee99 100644 --- a/src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java +++ b/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); } 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 8fe5884..a924e82 100644 --- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java +++ b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java @@ -53,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 @@ -140,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 l = dlReceipts.getSharedTicketList(); int count = l.size(); + + if (count > existingOrderCount) { + log.info("New Order Received from the API!"); + // show Order Window +// List 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(""); } @@ -427,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 diff --git a/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java b/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java index f9defc1..ba6f022 100644 --- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java +++ b/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));