From 8444de9ad22a7bad3406686e881f4f9c2a966854 Mon Sep 17 00:00:00 2001
From: buzzcode2007 <73412182+buzz_lightsnack_2007@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:43:48 +0800
Subject: [PATCH] update discard check

---
 src/main/java/tech/iBeans/POSware/Lite/OnTransact.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/tech/iBeans/POSware/Lite/OnTransact.java b/src/main/java/tech/iBeans/POSware/Lite/OnTransact.java
index e9be9a5..eb3ae53 100644
--- a/src/main/java/tech/iBeans/POSware/Lite/OnTransact.java
+++ b/src/main/java/tech/iBeans/POSware/Lite/OnTransact.java
@@ -319,7 +319,7 @@ public class OnTransact extends javax.swing.JFrame {
 	// Window events
 	private void close_precheck(java.awt.event.WindowEvent evt) {
 		boolean CLOSING_STATE = receipt.clear; 
-		if (!receipt.clear) {CLOSING_STATE = confirm_discard();};
+		if (!receipt.clear) {CLOSING_STATE = reset();};
 
 		if (CLOSING_STATE) {evt.getWindow().dispose();};
 	}
@@ -330,8 +330,7 @@ public class OnTransact extends javax.swing.JFrame {
 
 	private boolean jToggleButton_DiscardActionPerformed(java.awt.event.ActionEvent evt) {
 		// When the discard button is clicked
-		boolean user_choice = confirm_discard();
-		if (user_choice) {init();};
+		boolean user_choice = reset();
 		jToggleButton_Discard.setSelected(false);
 		return (user_choice);
 	};
@@ -384,13 +383,14 @@ public class OnTransact extends javax.swing.JFrame {
 		refresh_interface();
 	};
 	
-	public static void reset() {
+	public static Boolean reset() {
 		/* Reset the transaction. */
 		Boolean DISCARD_STATE = (!transact.progress || confirm_discard());
 		if (DISCARD_STATE) {
 			init();
 		};
 		
+		return (DISCARD_STATE);
 	};
 
 	private SpinnerNumberModel model_price = new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, .01);