From f7025e8dbba0db2239f2ff63e8813e97121f1b5d Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Fri, 12 Nov 2021 14:26:42 +0700
Subject: [PATCH] fix select3

---
 xml/page_topping_select3.xml | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml
index b5ca691c..4bb53866 100644
--- a/xml/page_topping_select3.xml
+++ b/xml/page_topping_select3.xml
@@ -150,6 +150,9 @@
 
 	Machine DoorClose
 	Machine DoorLidClose
+
+	Var ButtonNext = "false"
+
 </EventOpen>
 <Timeout> 2000 </Timeout>
 <EventTimeout> 
@@ -657,7 +660,11 @@
 		If CART_COUNT = 3 Then
 			Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_catalog.xml" 
+			If ButtonNext = "true" Then
+				Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_catalog.xml" 
+			EndIf
 		EndIf
 	EndIf
 
@@ -1481,6 +1488,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
+	
+
 	Var PriceDrink = PriceDrinkTmp
 	SAVELOG "USER press next ( topping ) - new"
 	DEBUGVAR topping1
@@ -1522,8 +1531,26 @@
 	; Pack
 	Topping "Pack" ExtendData
 
+	If CART_COUNT  = 0 Then
+		Open "ROOT/taobin_project/xml/page_payment.xml" 
+	Else
+		
+		If CART1_STATUS = "EMPTY" Then
+			Cart "AddMenuID" 1
+		Else
+			If CART2_STATUS = "EMPTY" Then
+				Cart "AddMenuID" 2
+			Else
+				If CART3_STATUS = "EMPTY" Then
+					Cart "AddMenuID" 3
+				EndIf
+			EndIf
+		EndIf
 
-	Open "ROOT/taobin_project/xml/page_payment.xml" 
+		Var CartUpdate = "true"
+		Var ButtonNext = "true"
+
+	EndIf
 </EventClick>
 </Button>