From 0265b6ddd8e7d96cc511224a4c7f58c1a7fbf7c4 Mon Sep 17 00:00:00 2001
From: wanlop run <wanlop.r@forth.co.th>
Date: Mon, 25 Dec 2023 21:10:29 +0700
Subject: [PATCH] select7

---
 animation01/play_list.tsv    | 10 ++++++++++
 xml/page_topping_select7.xml | 32 ++++++++++++++++----------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv
index ccadc78a..84346ece 100644
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@@ -943,3 +943,13 @@ PEACH MINT SODA	12-05-02-0070										24	120	15:00	23
 เต่าติมชามะลิ	12-41-03-0023
 เต่าติมโฮจิฉะ	12-41-03-0024
 TAO TIM GINGER	12-41-03-0025
+
+HOT GINGER CAFE LATTE	12-21-01-0061	1	10	6	2	3	4	5			24
+ICED GINGER CAFE LATTE	12-21-02-0061	1	10	6	2	3	4	5	23		24
+HOT GINGER MILK TEA	12-02-01-0053	1	6	10							24
+HOT GINGER YUZU TEA	12-02-01-0054	1	10	53							24
+ICED GINGER MILK TEA	12-02-02-0053	1	6	10	23						24
+ICED GINGER YUZU TEA	12-02-02-0054	1	10	53	23						24
+ICED GINGER MATCHA	12-02-02-0055	1	8	9	10	23					24
+GINGER MILK TEA SMOOTHIE	12-02-03-0053	1	6	10	23	41					24
+GINGER MILK TEA OREO SMOOTHIE	12-02-03-0056	1	6	10	40	23	40	41			24
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 18d09108..87bd71b9 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -1220,33 +1220,33 @@
 		EndIf
 
 
-		If TOPPING10 = "tampping-espv2" Then
+		If TOPPING8 = "tampping-espv2" Then
 			SAVELOG "                    tampping-espv2                     enable"
 			Var CustomCoffeeEnable = "True"
 			Var showCustomCoffee = "Enable"
 			var showCoffeeTamping = "Enable"
 
-			If toppingID10Default = "" Then
+			If toppingID8Default = "" Then
 				Var CustomCoffeeTampingState[1] = "PressForever"
 			Else
 				
-				If toppingID10index1 = toppingID10Default Then
-					Var CurrentCoffeeTampingId = toppingID10index1
+				If toppingID8index1 = toppingID8Default Then
+					Var CurrentCoffeeTampingId = toppingID8index1
 					Var CustomCoffeeTampingState[0] = "PressForever"
 					Var CustomCoffeeTampingState[1] = "Enable"
 					Var CustomCoffeeTampingState[2] = "Enable"
 
 				EndIf
 
-				If toppingID10index2 = toppingID10Default Then
-					Var CurrentCoffeeTampingId = toppingID10index2
+				If toppingID8index2 = toppingID8Default Then
+					Var CurrentCoffeeTampingId = toppingID8index2
 					Var CustomCoffeeTampingState[0] = "Enable"
 					Var CustomCoffeeTampingState[1] = "PressForever"
 					Var CustomCoffeeTampingState[2] = "Enable"
 				EndIf
 
-				If toppingID10index3 = toppingID10Default Then
-					Var CurrentCoffeeTampingId = toppingID10index3
+				If toppingID8index3 = toppingID8Default Then
+					Var CurrentCoffeeTampingId = toppingID8index3
 					Var CustomCoffeeTampingState[0] = "Enable"
 					Var CustomCoffeeTampingState[1] = "Enable"
 					Var CustomCoffeeTampingState[2] = "PressForever"
@@ -4421,7 +4421,7 @@
 			Var CustomCoffeeTampingState[1] = "Enable"
 			Var CustomCoffeeTampingState[2] = "Enable"
 
-			Var CurrentCoffeeTampingId = toppingID10index1
+			Var CurrentCoffeeTampingId = toppingID8index1
 
 			Function 2
 
@@ -4444,7 +4444,7 @@
 			Var CustomCoffeeTampingState[1] = "PressForever"
 			Var CustomCoffeeTampingState[2] = "Enable"
 
-			Var CurrentCoffeeTampingId = toppingID10index2
+			Var CurrentCoffeeTampingId = toppingID8index2
 
 			Function 2
 
@@ -4468,7 +4468,7 @@
 			Var CustomCoffeeTampingState[1] = "Enable"
 			Var CustomCoffeeTampingState[2] = "PressForever"
 
-			Var CurrentCoffeeTampingId = toppingID10index3
+			Var CurrentCoffeeTampingId = toppingID8index3
 
 
 			Function 2
@@ -5204,16 +5204,16 @@
 
 		If showCoffeeTamping = "Enable" Then
 			If CustomCoffeeTampingState[0] = "PressForever" Then
-				Var topping10 = toppingID10index1
+				Var topping8 = toppingID8index1
 			EndIf
 			If CustomCoffeeTampingState[1] = "PressForever" Then
-				Var topping10 = toppingID10index2
+				Var topping8 = toppingID8index2
 			EndIf
 			If CustomCoffeeTampingState[2] = "PressForever" Then
-				Var topping10 = toppingID10index3
+				Var topping8 = toppingID8index3
 			EndIf
 		Else
-			Var topping10 = 0
+			Var topping8 = 0
 		EndIf
 	Else
 		If toppingID2index3 = "" Then
@@ -5750,7 +5750,7 @@
 		EndIf
 
 		If showCoffeeTamping = "Enable" Then
-			If CurrentCoffeeTampingId = toppingID10Default Then
+			If CurrentCoffeeTampingId = toppingID8Default Then
 			Else
 				Var CustomCoffeeDefault = "false"
 			EndIf