From 80ccab2571683ccda90b8edefdfc762da01199ea Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Wed, 5 Jul 2023 19:07:01 +0700
Subject: [PATCH] ...

---
 xml/page_drinkfail2.xml | 133 ++++++++++++++++++++++++++--------------
 1 file changed, 87 insertions(+), 46 deletions(-)

diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
index c9c3b11f..129fdddf 100644
--- a/xml/page_drinkfail2.xml
+++ b/xml/page_drinkfail2.xml
@@ -4,7 +4,7 @@
 <Height> 1920 </Height>
 <Background> "0xEFEDEA" </Background>
 <Volume> SoundVolume </Volume>
-<Refresh> "Partial" </Refresh>
+;<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
@@ -154,6 +154,16 @@
 	EndIf
 
 	Var text22 = "/text22.png"
+
+	Var MaxNumber = 10
+
+	If CountryName = "Malaysia" Then
+		Var MaxNumber = 11
+	EndIf
+
+	If CountryName = "Indonesia" Then
+		Var MaxNumber = 12
+	EndIf 
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -212,15 +222,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "1"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 	
 </EventClick>
@@ -236,15 +249,19 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "2"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
 
 	
 </EventClick>
@@ -260,15 +277,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "3"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 	
 
@@ -285,15 +305,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "4"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 	
 
@@ -310,15 +333,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "5"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 
 
@@ -335,15 +361,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "6"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 
 
@@ -360,15 +389,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "7"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 	
 
@@ -385,15 +417,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "8"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+    Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
 	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 
 	
 </EventClick>
@@ -409,16 +444,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "9"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumberProblem 10
-	TimerReset
-	Refresh
+	 Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
-	Var ShowErrorText = "Invisible"
 
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
 	
 </EventClick>
 </Button>
@@ -433,16 +470,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Var TelephoneNumberProblem = TelephoneNumberProblem + "0"
-	Trim TelephoneNumberProblem 10
+	 Trim TelephoneNumberProblem MaxNumber
 	StrLen TelephoneNumberProblem TelNumLen
+
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	Var ShowErrorText = "Invisible"
 	Var ShowTextNumber = "Invisible"
 
 	TimerReset
 	Refresh
-	Var ShowErrorText = "Invisible"
 
 	
 </EventClick>
@@ -459,15 +498,17 @@
 <EventClick> 
 	Var Timeout = 0
 	Trim TelephoneNumberProblem  -1
-	Var Tel_Confirm_State = "Disable"
 	
 	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen < 10 Then 
+		Var Tel_Confirm_State = "Invisible"
+	EndIf
 	
 	If TelNumLen = 0 Then 
 		Var ShowTextNumber = "Enable"
 	EndIf
 
-	;Var ShowErrorText = "Invisible"
 	TimerReset
 	Refresh
 	
@@ -596,7 +637,7 @@
 <X> 400 </X>
 <Y> 1160 </Y>
 <State> ShowTextNumber </State>
-<Refresh> "Enable" </Refresh>
+;<Refresh> "Enable" </Refresh>
 <Filename> Var( DirImage + "/text15.png" )</Filename>
 </Image>
 
@@ -604,7 +645,7 @@
 <X> 293 </X>
 <Y> 1140 </Y>
 <State> ShowTextNumber </State>
-<Refresh> "Enable" </Refresh>
+;<Refresh> "Enable" </Refresh>
 <Filename> Var( DirImage + "/Group.png" )</Filename>
 </Image>
 
@@ -616,9 +657,9 @@
 <Size> 62 </Size>
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
-<Refresh> "Enable" </Refresh>
+
 <Value> TelephoneNumberProblem </Value>
-<Format> Telnum </Format>
+<Format> Telnum-mask-1 </Format>
 </Text>