From a61c42cc41d6401cd1be4e1d5511dbce74222849 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 9 Jun 2025 11:23:06 +0700
Subject: [PATCH 1/6] GBR: remove lid option

---
 inter/gbr/xml/page_brewing3.lxml        | 244 ++++++++++++------------
 inter/gbr/xml/page_topping_select6.lxml | 168 ++++++++--------
 2 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/inter/gbr/xml/page_brewing3.lxml b/inter/gbr/xml/page_brewing3.lxml
index 18c40654..749b6841 100644
--- a/inter/gbr/xml/page_brewing3.lxml
+++ b/inter/gbr/xml/page_brewing3.lxml
@@ -1884,23 +1884,23 @@
 </EventClick>
 </Button>
 
-<Button>
-<X> XStraw </X>
-<Y> 1787 </Y>
-<State>bg_strawProblem_ST</State>
-<Filename>  bnStrawProblemReport </Filename>
-<FilenamePress> bpStrawProblemReport </FilenamePress>
-<EventClick>
-
-	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
-
-	__CMD "straw-alert-disable" 0 strawStr "-"
- 	__CMD "send-error-code" 1231 "-" "-"
-	Var bg_strawProblem_ST = "Invisible"
-
-	Refresh
-</EventClick>
-</Button>
+;<Button>
+;<X> XStraw </X>
+;<Y> 1787 </Y>
+;<State>bg_strawProblem_ST</State>
+;<Filename>  bnStrawProblemReport </Filename>
+;<FilenamePress> bpStrawProblemReport </FilenamePress>
+;<EventClick>
+;
+;	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+;
+;	__CMD "straw-alert-disable" 0 strawStr "-"
+; 	__CMD "send-error-code" 1231 "-" "-"
+;	Var bg_strawProblem_ST = "Invisible"
+;
+;	Refresh
+;</EventClick>
+;</Button>
 
 
 <Button>
@@ -1957,43 +1957,43 @@
 ;
 ; Lid button, Get one and report
 ;
-<Button>
-<X> 14 </X>
-<Y> 1787 </Y>
-<State>bg_lidProblem_ST</State>
-<Filename>  bnLidProblemReport </Filename>
-<FilenamePress> bpLidProblemReport </FilenamePress>
-<EventClick>
+;<Button>
+;<X> 14 </X>
+;<Y> 1787 </Y>
+;<State>bg_lidProblem_ST</State>
+;<Filename>  bnLidProblemReport </Filename>
+;<FilenamePress> bpLidProblemReport </FilenamePress>
+;<EventClick>
+;
+;	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
+;
+;	__CMD "lid-alert-disable" 0 lidStr "-"
+; 	__CMD "send-error-code" 1343 "-" "-"
+;	Var bg_lidProblem_ST = "Invisible"
+;
+;	Refresh
+;</EventClick>
+;</Button>
 
-	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
-
-	__CMD "lid-alert-disable" 0 lidStr "-"
- 	__CMD "send-error-code" 1343 "-" "-"
-	Var bg_lidProblem_ST = "Invisible"
-
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 14 </X>
-<Y> 1787 </Y>
-<State>GetLidButtonState</State>
-<Mode> "No" </Mode>
-<Filename>  bn_get_lid_image </Filename>
-<FilenamePress> bp_get_lid_image </FilenamePress>
-<EventClick>
-
-	If GetLidButtonState = "Enable" Then
-		Machine Lid
-		Var GetLidButtonCountDown = 12
-	EndIf
-
-	Var GetLidButtonState = "Press"
-
-	Refresh
-</EventClick>
-</Button>
+;<Button>
+;<X> 14 </X>
+;<Y> 1787 </Y>
+;<State>GetLidButtonState</State>
+;<Mode> "No" </Mode>
+;<Filename>  bn_get_lid_image </Filename>
+;<FilenamePress> bp_get_lid_image </FilenamePress>
+;<EventClick>
+;
+;	If GetLidButtonState = "Enable" Then
+;		Machine Lid
+;		Var GetLidButtonCountDown = 12
+;	EndIf
+;
+;	Var GetLidButtonState = "Press"
+;
+;	Refresh
+;</EventClick>
+;</Button>
 
 ;====================================================================
 <Button>
@@ -2018,77 +2018,77 @@
 </EventClick>
 </Button>
 
-<Button>
-<X> XStraw </X>
-<Y> 1787 </Y>
-<Height> 96 </Height>
-<State>bg_strawProblem_ST2</State>
-<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
-<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
-<EventClick>
-
-	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
-
-	__CMD "straw-alert-disable" 0 strawStr "-"
- 	__CMD "send-error-code" 1231 "-" "-"
-	Var bg_strawProblem_ST2 = "Invisible"
-
-	Refresh
-</EventClick>
-<Language>
-	<X> 0 </X>
-	<Y> 12 </Y>
-	<Width> 331 </Width>
-	<Height> 96 </Height>
-	<ID> 000401 </ID>
-</Language>
-</Button>
+;<Button>
+;<X> XStraw </X>
+;<Y> 1787 </Y>
+;<Height> 96 </Height>
+;<State>bg_strawProblem_ST2</State>
+;<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
+;<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
+;<EventClick>
+;
+;	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+;
+;	__CMD "straw-alert-disable" 0 strawStr "-"
+; 	__CMD "send-error-code" 1231 "-" "-"
+;	Var bg_strawProblem_ST2 = "Invisible"
+;
+;	Refresh
+;</EventClick>
+;<Language>
+;	<X> 0 </X>
+;	<Y> 12 </Y>
+;	<Width> 331 </Width>
+;	<Height> 96 </Height>
+;	<ID> 000401 </ID>
+;</Language>
+;</Button>
 ;-------------------------
-<Button>
-<X> 14 </X>
-<Y> 1787 </Y>
-<Height> 96 </Height>
-<State>bg_lidProblem_ST2</State>
-<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
-<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
-<EventClick>
+;<Button>
+;<X> 14 </X>
+;<Y> 1787 </Y>
+;<Height> 96 </Height>
+;<State>bg_lidProblem_ST2</State>
+;<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
+;<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
+;<EventClick>
+;
+;	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
+;
+;	__CMD "lid-alert-disable" 0 lidStr "-"
+; 	__CMD "send-error-code" 1343 "-" "-"
+;	Var bg_lidProblem_ST2 = "Invisible"
+;
+;	Refresh
+;</EventClick>
+;<Language>
+;	<X> 0 </X>
+;	<Y> 12 </Y>
+;	<Width> 331 </Width>
+;	<Height> 96 </Height>
+;	<ID> 000400 </ID>
+;</Language>
+;</Button>
 
-	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
-
-	__CMD "lid-alert-disable" 0 lidStr "-"
- 	__CMD "send-error-code" 1343 "-" "-"
-	Var bg_lidProblem_ST2 = "Invisible"
-
-	Refresh
-</EventClick>
-<Language>
-	<X> 0 </X>
-	<Y> 12 </Y>
-	<Width> 331 </Width>
-	<Height> 96 </Height>
-	<ID> 000400 </ID>
-</Language>
-</Button>
-
-<Button>
-<X> 40 </X>
-<Y> 1787 </Y>
-<State>GetLidButtonState2</State>
-<Mode> "No" </Mode>
-<Filename>   Var( DirImageDoing + "/bn_get_lid.png" ) </Filename>
-<FilenamePress> Var( DirImageDoing + "/bp_get_lid.png" ) </FilenamePress>
-<EventClick>
-
-	If GetLidButtonState2 = "Enable" Then
-		Machine Lid
-		Var GetLidButtonCountDown = 12
-	EndIf
-
-	Var GetLidButtonState2 = "Press"
-
-	Refresh
-</EventClick>
-</Button>
+;<Button>
+;<X> 40 </X>
+;<Y> 1787 </Y>
+;<State>GetLidButtonState2</State>
+;<Mode> "No" </Mode>
+;<Filename>   Var( DirImageDoing + "/bn_get_lid.png" ) </Filename>
+;<FilenamePress> Var( DirImageDoing + "/bp_get_lid.png" ) </FilenamePress>
+;<EventClick>
+;
+;	If GetLidButtonState2 = "Enable" Then
+;		Machine Lid
+;		Var GetLidButtonCountDown = 12
+;	EndIf
+;
+;	Var GetLidButtonState2 = "Press"
+;
+;	Refresh
+;</EventClick>
+;</Button>
 
 <EventUnitTest4>
 	; test drinkfail with phone number
diff --git a/inter/gbr/xml/page_topping_select6.lxml b/inter/gbr/xml/page_topping_select6.lxml
index 6edc8766..1485b380 100644
--- a/inter/gbr/xml/page_topping_select6.lxml
+++ b/inter/gbr/xml/page_topping_select6.lxml
@@ -6702,42 +6702,42 @@
 ;-BEGIN Lid straw
 <Block>
 <Width> 986 </Width>
-<Height> 240 </Height>
+<Height> 188 </Height>
 <MarginTop> 20 </MarginTop>
 <State> ShowLidStraw </State>
 <Image>
-<Filename> "ROOT/taobin_project/image/topping_inter/bg_strawlid.png" </Filename>
+<Filename> "ROOT/taobin_project/image/topping2_en/bg_straw_only.png" </Filename>
 </Image>
 
-<Text>
-<X> 40 </X>
-<Y> 10 </Y>
-<Width> 500 </Width>
-<Height> 72 </Height>
-<Language>
-	<ID> 000066 </ID>
-</Language>
-</Text>
-
-<Text>
-<X> 120 </X>
-<Y> 80 </Y>
-<Width> 500 </Width>
-<Height> 72 </Height>
-<Language>
-	<ID> 000070 </ID>
-</Language>
-</Text>
-
-<Text>
-<X> 120 </X>
-<Y> 156 </Y>
-<Width> 500 </Width>
-<Height> 72 </Height>
-<Language>
-	<ID> 000071 </ID>
-</Language>
-</Text>
+;<Text>
+;<X> 40 </X>
+;<Y> 10 </Y>
+;<Width> 500 </Width>
+;<Height> 72 </Height>
+;<Language>
+;	<ID> 000066 </ID>
+;</Language>
+;</Text>
+;
+;<Text>
+;<X> 120 </X>
+;<Y> 80 </Y>
+;<Width> 500 </Width>
+;<Height> 72 </Height>
+;<Language>
+;	<ID> 000070 </ID>
+;</Language>
+;</Text>
+;
+;<Text>
+;<X> 120 </X>
+;<Y> 156 </Y>
+;<Width> 500 </Width>
+;<Height> 72 </Height>
+;<Language>
+;	<ID> 000071 </ID>
+;</Language>
+;</Text>
 
 
 
@@ -6808,59 +6808,59 @@
 
 
 ; LID left
-<Button>
-<X> 40 </X>
-<Y> 148 </Y>
-<State> LidState </State>
-<Mode> "No" </Mode>
-<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
-<EventClick>
-	SAVELOG "Click LID pic"
-	If LidState = "Press" Then
-		Var LidState = "Enable"
-
-		Var Seeker.thankLidFlag = 0
-
-	Else
-		Var LidState = "Press"
-
-		Var Seeker.thankLidFlag = 1
-
-	EndIf
-
-
-	DEBUGVAR SugarState1
-	Refresh
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 896 </X>
-<Y> 155 </Y>
-<State> LidState </State>
-<Mode> "No" </Mode>
-<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
-<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
-<EventClick>
-	SAVELOG "Click LID cb"
-	If LidState = "Press" Then
-		Var LidState = "Enable"
-
-		Var Seeker.thankLidFlag = 0
-
-	Else
-		Var LidState = "Press"
-
-		Var Seeker.thankLidFlag = 1
-
-	EndIf
-	Refresh
-</EventClick>
-</Button>
+;<Button>
+;<X> 40 </X>
+;<Y> 148 </Y>
+;<State> LidState </State>
+;<Mode> "No" </Mode>
+;<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
+;<EventClick>
+;	SAVELOG "Click LID pic"
+;	If LidState = "Press" Then
+;		Var LidState = "Enable"
+;
+;		Var Seeker.thankLidFlag = 0
+;
+;	Else
+;		Var LidState = "Press"
+;
+;		Var Seeker.thankLidFlag = 1
+;
+;	EndIf
+;
+;
+;	DEBUGVAR SugarState1
+;	Refresh
+;
+;</EventClick>
+;</Button>
+;
+;<Button>
+;<X> 896 </X>
+;<Y> 155 </Y>
+;<State> LidState </State>
+;<Mode> "No" </Mode>
+;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+;<EventClick>
+;	SAVELOG "Click LID cb"
+;	If LidState = "Press" Then
+;		Var LidState = "Enable"
+;
+;		Var Seeker.thankLidFlag = 0
+;
+;	Else
+;		Var LidState = "Press"
+;
+;		Var Seeker.thankLidFlag = 1
+;
+;	EndIf
+;	Refresh
+;</EventClick>
+;</Button>
 
 ;<Image>
 ;<State> StrawDeactiveButton </State>

From eeaed11dd032f36da846f85b5f1e490d14111980 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 9 Jun 2025 11:29:06 +0700
Subject: [PATCH 2/6] GBR: Not send PROBLEM2 if pay with credit card

---
 inter/gbr/xml/page_drinkfail_gbr.lxml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/inter/gbr/xml/page_drinkfail_gbr.lxml b/inter/gbr/xml/page_drinkfail_gbr.lxml
index bd78cf96..7484d991 100644
--- a/inter/gbr/xml/page_drinkfail_gbr.lxml
+++ b/inter/gbr/xml/page_drinkfail_gbr.lxml
@@ -171,8 +171,11 @@
          			Var VendingTSIDProblem = VendingTSID
           		EndIf
 
+                If Seeker.CreditCard = 1 Then
 
-          		PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
+                Else
+              		PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
+                EndIf
 
            	EndIf
 

From 767920cf6d3a3d3b7165fc25d0db711fa616f16e Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 9 Jun 2025 13:02:39 +0700
Subject: [PATCH 3/6] GBR: reset UKBMemberID

---
 xml/page_payment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index a1f70572..49688172 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -181,6 +181,7 @@
 	Var Seeker.IntVendingCredit = 0
 
 	Var EMAMemberID = ""
+	Var UKBMemberID = ""
 
 	Var Seeker.StoreCreditFlag = 0
 	Var Seeker.pageStoreCredit0 = 0

From 2b7d73fcb77d0b5c9e20ad1ebb1d949a7cb14184 Mon Sep 17 00:00:00 2001
From: Ittipat Lusuk <ittipat.l@forth.co.th>
Date: Mon, 9 Jun 2025 14:59:29 +0700
Subject: [PATCH 4/6] Topping8: Fixed coffee shot invisible state

---
 xml/page_topping_select8.xml | 52 ++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index acdecc0b..b3e36b94 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -8323,7 +8323,31 @@
 				EndIf
 			EndIf
 		Else
-			Var return = "Invisible"
+			If showShotEnable = "Press" Then
+				If TOPPING1 = "Suger 4 step cold" Then
+					Var return = "Invisible"
+				Else
+					If TOPPING1 = "Suger 4 step hot" Then
+						Var return = "Invisible"
+					Else
+						Var return = "Enable"
+					EndIf
+				EndIf
+			Else
+				If showShotEnable = "Disable" Then
+					If TOPPING1 = "Suger 4 step cold" Then
+						Var return = "Invisible"
+					Else
+						If TOPPING1 = "Suger 4 step hot" Then
+							Var return = "Invisible"
+						Else
+							Var return = "Enable"
+						EndIf
+					EndIf
+				Else
+					Var return = "Invisible"
+				EndIf
+			EndIf
 		EndIf
 	)
 	</State>
@@ -8429,7 +8453,31 @@
 					EndIf
 				EndIf
 			Else
-				Var return = "Invisible"
+				If showShotEnable = "Press" Then
+					If TOPPING1 = "Suger 4 step cold" Then
+						Var return = "Enable"
+					Else
+						If TOPPING1 = "Suger 4 step hot" Then
+							Var return = "Enable"
+						Else
+							Var return = "Invisible"
+						EndIf
+					EndIf
+				Else
+					If showShotEnable = "Disable" Then
+						If TOPPING1 = "Suger 4 step cold" Then
+							Var return = "Enable"
+						Else
+							If TOPPING1 = "Suger 4 step hot" Then
+								Var return = "Enable"
+							Else
+								Var return = "Invisible"
+							EndIf
+						EndIf
+					Else
+						Var return = "Invisible"
+					EndIf
+				EndIf
 			EndIf
 	)
 	</State>

From 859ce1b1c02ac970ba5431e6c3ba00e92849c0e3 Mon Sep 17 00:00:00 2001
From: Ittipat Lusuk <ittipat.l@forth.co.th>
Date: Mon, 9 Jun 2025 15:27:33 +0700
Subject: [PATCH 5/6] update langs

---
 inter/tha/menu/lang.tsv      | 18 +++++++++---------
 xml/page_topping_select8.xml |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv
index 6629d769..fc4a9fe9 100644
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@@ -135,13 +135,13 @@
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
 000104		Water level (long)	ปริมาณน้ำ (Long)	水位			ရေအဆင့် (ရှည်)
 000105		Coffee bean quantity 	ปริมาณเมล็ดกาแฟ	咖啡豆量			ကော်ဖီစေ့ ပမာဏ
-000106		Coffee level	ความเข้มของกาแฟ	咖啡浓度			ကော်ဖီအဆင့်
+000106		Coffee level	ความเจ้มจ้นของกาแฟ	咖啡浓度			ကော်ဖီအဆင့်
 000107		Tamping Pressure	แรงกดกาแฟ (Tamp)	填压力度			Tamping Pressure
 		Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18	Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18	Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18		Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18	Font=Kanit,Type=Regular,Size=16,Color=0x513C2F,LineHeight=18
 000108		Medium	กลาง	中度			အလယ်
 000109		Just Right	กำลังพอดี	刚刚好			လိုက်လျော
-000110		Dark	เข้ม	深焙			ပြင်း
-000111		Darker	เข้มกว่า	更深焙			ပိုပြင်း
+000110		Dark	เจ้มจ้น	深焙			ပြင်း
+000111		Darker	เจ้มจ้นกว่า	更深焙			ပိုပြင်း
 		Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,LineHeight=46		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,LineHeight=46
 000112		Alternative Milk	นมทางเลือก	替代牛奶			အစားထိုးနို့
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
@@ -279,18 +279,18 @@
 002022		D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=20]	เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=20]	自定义你的杯子，你的风格 [(最多可选 1 项)###Font=KanitLight,Size=20]			ကိုယ်ပိုင်စတိုင်နဲ့ ခွက်လုပ်ပါ[(အများဆုံး ၁ အချက်)###Font=KanitLight,Size=20]
 							
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
-002028		Taiwanese tea Intensity	ความข้นของชาไต้หวัน	台湾茶浓度			တိုင်ဝမ်လက်ဖက်ရည်အား
+002028		Taiwanese tea Intensity	ความเจ้มจ้นของชาไต้หวัน	台湾茶浓度			တိုင်ဝမ်လက်ဖက်ရည်အား
 002029		Sugar type	ประเภทน้ำตาล	糖类选择			သကြား အမျိုးအစား
 002030		Sweetness	ความหวาน	甜度			အချိုချင်း
 002031		Espresso Shot	เอสเพรสโซ่ช็อต	浓缩咖啡份数			အီစပရိုဆို ရိုက်ခြင်း
-002032		Milk Intensity	ความเข้มข้นของนม	牛奶浓度			နို့ပေါ် အင်တင်စတီ
-002033		Cocoa Intensity	ความข้นของโกโก้	可可浓度			ကိုကိုအင်တင်စတီ
-002034		Ovaltine Intensity	ความข้นของโอวัลติน	阿华田浓度			အော်ဗယ်တင်း အင်တင်စတီ
+002032		Milk Intensity	ความเจ้มจ้นของนม	牛奶浓度			နို့ပေါ် အင်တင်စတီ
+002033		Cocoa Intensity	ความเจ้มจ้นของโกโก้	可可浓度			ကိုကိုအင်တင်စတီ
+002034		Ovaltine Intensity	ความเจ้มจ้นของโอวัลติน	阿华田浓度			အော်ဗယ်တင်း အင်တင်စတီ
 002035		Energy Shot	เอเนอร์จี้ช็อต	能量饮品添加			စွမ်းအင် ရိုက်ခြင်း
 002036		Jemila Collagen 2000mg\n[Japanese & Danish ingredients for healthy skin.###Font=KanitLight,Size=15]	Jemila Collagen 2000mg\n[ผิวสุขภาพดีด้วยสารสกัดจาก 3 ประเทศ ได้แก่ คอลลาเจน จากญี่ปุ่น และ ผงมะเขือเทศจากเดนมาร์ก ###Font=KanitLight,Size=15]	Jemila 胶原蛋白 2000mg\n[日本 & 丹麦原料，呵护健康肌肤。###Font=KanitLight,Size=15]			Jemila ကော်လာဂျင် 2000mg\n[ဂျပန်နှင့်ဒန်မတ်ပါဝင်သော ပြန်ရန် ကျန်းမာသော အသားအရည်###Font=KanitLight,Size=15]
 002037		Oreo Volcano Topping\n[The perfect blend of cookie and cream.###Font=KanitLight,Size=15]	ท็อปปิ้งโอริโอภูเขาไฟ\n[บิด ชิมครีม จุ่มนมในคำเดียว ไม่ลองไม่ได้แล้ว!###Font=KanitLight,Size=15]	奥利奥火山配料\n[曲奇与奶油的完美融合。###Font=KanitLight,Size=15]			အော်ရီယို ဗော်ကာနို တိုပပင်၊\n[ကောက်ကီနှင့် ကရိမ်တို့၏ အပြည့်အစုံပေါင်းစပ်မှု###Font=KanitLight,Size=15]
 002038		Ovaltine Volcano Topping\n[Crunchy Ovaltine goodness in every sip.###Font=KanitLight,Size=15]	ท็อปปิ้งโอวัลตินภูเขาไฟ\n[อร่อย กรุบกรอบ ได้รสชาติโอวัลตินแบบเต็ม ๆ คำ###Font=KanitLight,Size=15]	阿华田火山配料\n[每一口都充满香脆阿华田美味。###Font=KanitLight,Size=15]			အော်ဗယ်တင်း ဗော်ကာနို တိုပပင်၊\n[အချိုလေးကြဲသော အော်ဗယ်တင်းအရသာကို လုံးဝခံစားနိုင်ပါသည်###Font=KanitLight,Size=15]
-002039		Cocoa Volcano Topping\n[The perfect blend of cocoa###Font=KanitLight,Size=15]	ท็อปปิ้งโกโก้ภูเขาไฟ\n[ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้###Font=KanitLight,Size=15]	可可火山配料\n[可可的完美融合。###Font=KanitLight,Size=15]			ကိုကို ဗော်ကာနို တိုပပင်၊\n[ကိုကိုအရသာနှင့် အပြည့်အစုံပေါင်းစပ်မှု###Font=KanitLight,Size=15]
+002039		Cocoa Volcano Topping\n[The perfect blend of cocoa###Font=KanitLight,Size=15]	ท็อปปิ้งโกโก้ภูเขาไฟ\n[ระเบิดความเจ้มจ้น อร่อยเต็มคำกับภูเขาไฟโกโก้###Font=KanitLight,Size=15]	可可火山配料\n[可可的完美融合。###Font=KanitLight,Size=15]			ကိုကို ဗော်ကာနို တိုပပင်၊\n[ကိုကိုအရသာနှင့် အပြည့်အစုံပေါင်းစပ်မှု###Font=KanitLight,Size=15]
 002040		Strawberry syrup\n[Sweet and tart strawberry syrup! A must-have for berry lovers.###Font=KanitLight,Size=15]	เพิ่มสตรอว์เบอรี่ไซรัป\n[เปรี้ยวนิด ๆ หวานหน่อย ๆ ตอบโจทย์สายสตรอว์เบอร์รี่เลิฟเวอร์###Font=KanitLight,Size=15]	草莓糖浆\n[酸甜可口的草莓糖浆！莓果爱好者必试！###Font=KanitLight,Size=15]			စတောဘဲရီဆီရပ်၊\n[ချိုမြိန်နှင့် တင်းမာသောအရသာ။###Font=KanitLight,Size=15]
 002041		Yuzu syrup\n[Discover the bright and tangy taste of our yuzu syrup.###Font=KanitLight,Size=15]	เพิ่มยูซุไซรัป\n[กลิ่นหอม รสชาติที่สดชื่น เปรี้ยวหวานลงตัวใส่กับเมนูไหนก็เข้ากัน###Font=KanitLight,Size=15]	柚子糖浆\n[感受柚子糖浆的清新酸甜风味。###Font=KanitLight,Size=15]			ရူးဇူးဆီရပ်၊\n[ကျွန်ုပ်တို့၏ ရူးဇူးဆီရပ်၏ အသက်သွင်းသော အရသာကို ရှာဖွေပါ။###Font=KanitLight,Size=15]
 							
@@ -301,7 +301,7 @@
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
 002043		Oreo Topping\n[Cookie Bliss!###Font=KanitLight,Size=15]	ท็อปปิ้งโอริโอภูเขาไฟ\n[(กรุบกรอบเคี้ยวเพลิน)###Font=KanitLight,Size=15]	Oreo 配料\n[酥脆美味！###Font=KanitLight,Size=15]			Oreo ထပ်ထည့်မှု၊\n[ကူကီးအရသာကို စိတ်ကြွနေစေမယ်!###Font=KanitLight,Size=15]
 002044		Ovaltine Topping\n[Malt Madness!###Font=KanitLight,Size=15]	ท็อปปิ้งโอวัลตินภูเขาไฟ\n[(ฟินจริง ๆ ท้าให้ลอง)###Font=KanitLight,Size=15]	Ovaltine 配料\n[麦芽狂欢！###Font=KanitLight,Size=15]			Ovaltine ထပ်ထည့်မှု၊\n[မော့စ်အရသာ အရမ်းပြင်းထန်တယ်။###Font=KanitLight,Size=15]
-002045		Cocoa Topping\n[Rich & Decadent!###Font=KanitLight,Size=15]	ท็อปปิ้งโกโก้ภูเขาไฟ\n[(ระเบิดความเข้ม อร่อยเต็มคำกับภูเขาไฟโกโก้)###Font=KanitLight,Size=15]	 可可配料\n[浓郁奢华享受！###Font=KanitLight,Size=15]			Cocoa ထပ်ထည့်မှု၊\n[အရသာပြင်းပြပြီး ခံစားခွင့်ကြီးတယ်။###Font=KanitLight,Size=15]
+002045		Cocoa Topping\n[Rich & Decadent!###Font=KanitLight,Size=15]	ท็อปปิ้งโกโก้ภูเขาไฟ\n[(ระเบิดความเจ้มจ้น อร่อยเต็มคำกับภูเขาไฟโกโก้)###Font=KanitLight,Size=15]	 可可配料\n[浓郁奢华享受！###Font=KanitLight,Size=15]			Cocoa ထပ်ထည့်မှု၊\n[အရသာပြင်းပြပြီး ခံစားခွင့်ကြီးတယ်။###Font=KanitLight,Size=15]
 							
 002046		Ring it up.	ซื้อเลย	马上购买			ဝယ်လိုက်ပါ
 002047		Just this,(no toppings)	ซื้อเลย (ไม่รับท็อปปิ้ง)	马上购买（不加配料）			ဝယ်လိုက်ပါ (တော့ပင်းမထည့်ပါ)
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index b3e36b94..528b6e4d 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -461,8 +461,8 @@
 		Var custom_coffee_level_medium_text_x = 560
 		Var custom_coffee_level_medium_price_x = 600
 		Var custom_coffee_level_right_text_x = 676
-		Var custom_coffee_level_darker_text_x = 880
-		Var custom_coffee_level_dark_text_x = 790
+		Var custom_coffee_level_darker_text_x = 875
+		Var custom_coffee_level_dark_text_x = 780
 
 		Var SugarZeroCalPrice_X = 482
 

From c4c9506a9d0c6c5b5aba8296b8d846b98a6cc77a Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Mon, 9 Jun 2025 15:35:45 +0700
Subject: [PATCH 6/6] GBR & AUS: Update remove cup

---
 inter/aus/xml/page_remove_cup.lxml            |  48 ++++++++++++------
 .../image/user_take_cup_en/bd_door_open.png   | Bin 0 -> 3370 bytes
 .../user_take_cup_en/bd_door_open_rem.png     | Bin 0 -> 3370 bytes
 inter/gbr/menu/lang.tsv                       |   2 +
 inter/gbr/xml/page_remove_cup.lxml            |  42 ++++++++++-----
 xml/page_remove_cup.xml                       |   4 ++
 6 files changed, 67 insertions(+), 29 deletions(-)
 create mode 100644 inter/common/image/user_take_cup_en/bd_door_open.png
 create mode 100644 inter/common/image/user_take_cup_en/bd_door_open_rem.png

diff --git a/inter/aus/xml/page_remove_cup.lxml b/inter/aus/xml/page_remove_cup.lxml
index b49cc780..4332ba80 100644
--- a/inter/aus/xml/page_remove_cup.lxml
+++ b/inter/aus/xml/page_remove_cup.lxml
@@ -15,7 +15,7 @@
 	DEBUGVAR "AUS Remove Cup"
 
     Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
-		
+
 	LED LedDoorDoor 5 255 255 255 255
 
 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
@@ -25,19 +25,16 @@
 	Var remove_cup_name = ""
 	Var remove_cup_image = ""
 
+	Var remove_cup_button_text = "Press Here"
+
 	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
-	
-	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetail + " / "
-	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-	If InternationalEnable = 1 Then
-		Var MachineErrorDetailAll = MachineErrorDetailEng
-	EndIf
+	;SAVELOG MachineErrorDetail
+	Var MachineErrorDetailAll = MachineErrorDetailEng
 
 
 	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
@@ -109,21 +106,40 @@
 <Y> 1661 </Y>
 <Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_door_open.png" ) </FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/bd_door_open_rem.png" ) </FilenameDisable2>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
-<EventClick> 
+<EventClick>
 	;include=ROOT/taobin_project/inc/remove_cup_button.inc
+
+	If buttonRemoveCup = "Enable" Then
+        Var remove_cup_button_text = "Press Here"
+    EndIf
+
+    If buttonRemoveCup = "Disable" Then
+        Var remove_cup_button_text = "Please Wait..."
+    EndIf
+
+    If buttonRemoveCup = "Disable2" Then
+        Var remove_cup_button_text = "Please take cup below"
+    EndIf
 </EventClick>
-<Language>
-  <ID> 000411 </ID>
-  <X> 80 </X>
-  <Y> 40 </Y>
-  <Width> 500 </Width>
-  <Height> 50 <Height>
-</Language>
 </Button>
 
+<Text>
+    <X> 212 </X>
+    <Y> 1705 </Y>
+    <Width> 656 </Width>
+    <Font> KanitRegularTTF </Font>
+    <Size> 56 </Size>
+    <Color> 0xFFFFFF </Color>
+    <State> buttonRemoveCup </State>
+    <Value> remove_cup_button_text </Value>
+    <Align> Center </Align>
+<Text>
+
 
 <Image>
 <X> 125 </X>
diff --git a/inter/common/image/user_take_cup_en/bd_door_open.png b/inter/common/image/user_take_cup_en/bd_door_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cdca00d0e6a4ea6c2813d6b0bb8824cbd45730d
GIT binary patch
literal 3370
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

literal 0
HcmV?d00001

diff --git a/inter/common/image/user_take_cup_en/bd_door_open_rem.png b/inter/common/image/user_take_cup_en/bd_door_open_rem.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cdca00d0e6a4ea6c2813d6b0bb8824cbd45730d
GIT binary patch
literal 3370
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

literal 0
HcmV?d00001

diff --git a/inter/gbr/menu/lang.tsv b/inter/gbr/menu/lang.tsv
index ea2c2a60..54454fba 100644
--- a/inter/gbr/menu/lang.tsv
+++ b/inter/gbr/menu/lang.tsv
@@ -197,6 +197,8 @@ TextID	Note	English	Thai
 		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
 000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
 		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xCCCCCC,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xAAAAAA,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
 000411		Press Here	กดที่นี่
 
 
diff --git a/inter/gbr/xml/page_remove_cup.lxml b/inter/gbr/xml/page_remove_cup.lxml
index b64dae27..809d6ac5 100644
--- a/inter/gbr/xml/page_remove_cup.lxml
+++ b/inter/gbr/xml/page_remove_cup.lxml
@@ -25,6 +25,8 @@
 	Var remove_cup_name = ""
 	Var remove_cup_image = ""
 
+	Var remove_cup_button_text = "Press Here"
+
 	RootLayoutVisible 3 "show"
 
 </EventOpen>
@@ -32,12 +34,7 @@
 <EventTimeout>
 
 	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetail + " / "
-	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
-
-	If InternationalEnable = 1 Then
-		Var MachineErrorDetailAll = MachineErrorDetailEng
-	EndIf
+	Var MachineErrorDetailAll = MachineErrorDetailEng
 
 
 	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
@@ -109,21 +106,40 @@
 <Y> 1661 </Y>
 <Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_door_open.png" ) </FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/bd_door_open_rem.png" ) </FilenameDisable2>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick>
 	;include=ROOT/taobin_project/inc/remove_cup_button.inc
+
+	If buttonRemoveCup = "Enable" Then
+        Var remove_cup_button_text = "Press Here"
+    EndIf
+
+    If buttonRemoveCup = "Disable" Then
+        Var remove_cup_button_text = "Please Wait..."
+    EndIf
+
+    If buttonRemoveCup = "Disable2" Then
+        Var remove_cup_button_text = "Please take cup below"
+    EndIf
 </EventClick>
-<Language>
-  <ID> 000411 </ID>
-  <X> 80 </X>
-  <Y> 40 </Y>
-  <Width> 500 </Width>
-  <Height> 50 <Height>
-</Language>
 </Button>
 
+<Text>
+    <X> 212 </X>
+    <Y> 1705 </Y>
+    <Width> 656 </Width>
+    <Font> KanitRegularTTF </Font>
+    <Size> 56 </Size>
+    <Color> 0xFFFFFF </Color>
+    <State> buttonRemoveCup </State>
+    <Value> remove_cup_button_text </Value>
+    <Align> Center </Align>
+<Text>
+
 
 <Image>
 <X> 125 </X>
diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml
index 2cb8313b..9dffa049 100644
--- a/xml/page_remove_cup.xml
+++ b/xml/page_remove_cup.xml
@@ -23,6 +23,10 @@
 	If StrCountryShort = "AUS" Then
 		Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml"
 	EndIf
+	
+	If StrCountryShort = "GBR" Then
+	    Open "ROOT/taobin_project/inter/gbr/xml/page_remove_cup.lxml"
+	EndIf
 
 	If StrCountryShort = "SGP" Then
 		Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"