TavernerPOS - Source Code
Clone:
git clone http://www.librarysmith.co.uk/tavernerPOS
viewgit/viewgit/inc/functions.php:49 Function create_function() is deprecated [8192]Modify automatic load of last open ticket to only open tickets of OrderType.TAKE_OUT
Filename
src/com/floreantpos/ui/TicketListView.java
src/com/floreantpos/ui/views/SwitchboardView.java
diff --git a/src/com/floreantpos/ui/TicketListView.java b/src/com/floreantpos/ui/TicketListView.java
index b58f229..b3e3b74 100755
--- a/src/com/floreantpos/ui/TicketListView.java
+++ b/src/com/floreantpos/ui/TicketListView.java
@@ -273,14 +273,26 @@ public class TicketListView extends JPanel implements ITicketList {
}
- public Ticket getAllOpenTicketsWithUser(User user) {
+ public Ticket getAllOpenTicketsWithUser(User user, OrderType orderType) {
List<Ticket> listTicker = TicketDAO.getInstance().findOpenTicketsForUser(user);
Ticket ticket;
ticket=null;
- if (listTicker.size()>0) {
- ticket=listTicker.get(listTicker.size()-1);
+
+ if (orderType==null) {
+ if (listTicker.size()>0) {
+ ticket=listTicker.get(listTicker.size()-1);
+ }
+ } else {
+ if (listTicker.size()>0) {
+ for (int i = 0; i < listTicker.size()-1; i++ ) {
+ if (listTicker.get(i).getType()==orderType) {
+ ticket=listTicker.get(i);
+ }
+ }
+ }
}
+
return(ticket);
}
diff --git a/src/com/floreantpos/ui/views/SwitchboardView.java b/src/com/floreantpos/ui/views/SwitchboardView.java
index 0f5c926..cceb07f 100755
--- a/src/com/floreantpos/ui/views/SwitchboardView.java
+++ b/src/com/floreantpos/ui/views/SwitchboardView.java
@@ -502,7 +502,7 @@ public class SwitchboardView extends ViewPanel implements ActionListener, ITicke
public void loadPreviousOpenTicket() {
User user = Application.getCurrentUser();
- Ticket ticket=ticketList.getAllOpenTicketsWithUser(user);
+ Ticket ticket=ticketList.getAllOpenTicketsWithUser(user,OrderType.TAKE_OUT);
if (ticket!=null) editTicket(ticket);
}
- Details
- Last Updated: Monday, 04 April 2016 02:04
- Hits: 35090495