THAI: Added Jemila sound

xml/event/jemila/page_collect_point_jemila_2.xml

@@ -16,9 +16,9 @@
 
 	Var Seeker.TaobinErrorNetwork = 0
 
-	 If show_eng = "true" Then 
+	 If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
-		
+
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
@@ -39,10 +39,10 @@
 		Var CollectPointError = "collect"
 		Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_error.xml"
 	EndIf
-		
+
-</EventOpen>                   
+</EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 	Var CountDownBrewing = BREW_CNT
 
 	Var ShowCountDownBrewing = CountDownBrewing
@@ -50,52 +50,52 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-      
+
-		
+
 			Var TaobinLevel = 0
-			Var CoffeePoint = 1 
+			Var CoffeePoint = 1
 
 			Var Seeker.TaobinErrorNetwork = 1
 			Var Seeker.PointTaobinStr = ParamCP
-			
+
 			Var TelephoneNumber = TelephoneNumberX
-			
+
 			Var Seeker.TNumberTaobinMember= TelephoneNumber
 			Var CollectPointError = "collect"
 			Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_error.xml"
-		
+
 	EndIf
 
 	TimerReset
 	Refresh
-</EventTimeout> 
+</EventTimeout>
 
 
 
 
-			
+
-<EventSecurity> 
+<EventSecurity>
-	Open "/media/bt/xml/security_alarm.xml" 
+	Open "/media/bt/xml/security_alarm.xml"
 </EventSecurity>
 
 <EventActionOk>
 		If Ext1a = "" Then
-			
+
 			Var Seeker.TaobinErrorNetwork = 1
 			Var Seeker.PointTaobinStr = ParamCP
 			Var TelephoneNumber = TelephoneNumberX
 			Var Seeker.TNumberTaobinMember = TelephoneNumber
 			Var CollectPointError = "collect"
 			Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_error.xml"
-			
+
 		Else
             Var TaobinName = Ext1b
             Var TelephoneNumber = TelephoneNumberX
             Var TNumberTaobinMemberXXX = TelephoneNumber
             Var Seeker.IsAlreadyGetReward = Ext1c
-            Var JemilaDewyglowOutOfStock = Ext1x4
+            Var JemilaDewyglowOutOfStock = Ext1d
-            Var ColorChangingBlushOutOfStock = Ext1x5
+            Var ColorChangingBlushOutOfStock = Ext1e
-            Var CuraMDRandomOutOfStock = Ext1x6
+            Var CuraMDRandomOutOfStock = Ext1f
 
 
             DEBUGVAR JemilaDewyglowOutOfStock
@@ -103,7 +103,7 @@
             DEBUGVAR CuraMDRandomOutOfStock
 
             If TaobinName = "" Then
-                Var Seeker.IsLineMember = 0 
+                Var Seeker.IsLineMember = 0
             Else
                 If TaobinName = "-" Then
                     Var Seeker.IsLineMember = 0
@@ -123,7 +123,7 @@
                     If CuraMDRandomOutOfStock = 1 Then
                         SAVELOG "All reward is out of stock writing flag 1 -> jemila_reward_out_of_stock"
                         WRITE_FILE "/mnt/sdcard/coffeevending/jemila_reward_out_of_stock" "1"
-                        
+
                         SAVELOG "skip to normal collect point."
                         If Seeker.CodeChannel = 1 Then
                             If Seeker.CollectPointMain = 1 Then
@@ -138,7 +138,7 @@
                         EndIf
                     EndIf
                 EndIf
-            EndIf   
+            EndIf
 
             ;If Seeker.IsAlreadyGetReward = 1 Then
             ;    SAVELOG "Already get reward skip to normal collect point."
@@ -209,7 +209,7 @@
 
 
             DEBUGVAR Ext1a
-            
+
             SPLIT Ext1a "/" 1 MenuPoint[0]
             SPLIT Ext1a "/" 2 MenuPoint[1]
             SPLIT Ext1a "/" 3 MenuPoint[2]
@@ -247,7 +247,7 @@
             ; Menu 1
             If Seeker.selected_a_drink = "12-03-02-0075" Then
                 If MenuPoint[0] = 1 then
-                
+
                 Else
                     Var MenuPoint[0] = 1
                     Var newPointIndex = 0
@@ -255,7 +255,7 @@
             EndIf
             If Seeker.selected_a_drink = "12-03-03-0075" Then
                 If MenuPoint[0] = 1 then
-                
+
                 Else
                     Var MenuPoint[0] = 1
                     Var newPointIndex = 0
@@ -264,17 +264,17 @@
 
 
             ; Menu 2
-            If Seeker.selected_a_drink = "12-05-02-0124" Then	
+            If Seeker.selected_a_drink = "12-05-02-0124" Then
                If MenuPoint[1] = 1 then
-                
+
                 Else
                     Var MenuPoint[1] = 1
                     Var newPointIndex = 1
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-05-03-0124" Then   
+            If Seeker.selected_a_drink = "12-05-03-0124" Then
                If MenuPoint[1] = 1 then
-                
+
                 Else
                     Var MenuPoint[1] = 1
                     Var newPointIndex = 1
@@ -283,17 +283,17 @@
 
 
             ; Menu 3
-            If Seeker.selected_a_drink = "12-02-02-0068" Then	
+            If Seeker.selected_a_drink = "12-02-02-0068" Then
                 If MenuPoint[2] = 1 then
-                
+
                 Else
                     Var MenuPoint[2] = 1
                     Var newPointIndex = 2
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-02-03-0068" Then   
+            If Seeker.selected_a_drink = "12-02-03-0068" Then
                 If MenuPoint[2] = 1 then
-                
+
                 Else
                     Var MenuPoint[2] = 1
                     Var newPointIndex = 2
@@ -302,9 +302,9 @@
 
 
             ; Menu 4
-            If Seeker.selected_a_drink = "12-05-02-0125" Then	
+            If Seeker.selected_a_drink = "12-05-02-0125" Then
                If MenuPoint[3] = 1 then
-                
+
                 Else
                     Var MenuPoint[3] = 1
                     Var newPointIndex = 3
@@ -313,17 +313,17 @@
 
 
             ; Menu 5
-            If Seeker.selected_a_drink = "12-01-02-0075" Then	
+            If Seeker.selected_a_drink = "12-01-02-0075" Then
                 If MenuPoint[4] = 1 then
-                
+
                 Else
                     Var MenuPoint[4] = 1
                     Var newPointIndex = 4
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-21-02-0075" Then   
+            If Seeker.selected_a_drink = "12-21-02-0075" Then
                 If MenuPoint[4] = 1 then
-                
+
                 Else
                     Var MenuPoint[4] = 1
                     Var newPointIndex = 4
@@ -332,17 +332,17 @@
 
 
             ; Menu 6
-            If Seeker.selected_a_drink = "12-03-02-0076" Then	
+            If Seeker.selected_a_drink = "12-03-02-0076" Then
                 If MenuPoint[5] = 1 then
-                
+
                 Else
                     Var MenuPoint[5] = 1
                     Var newPointIndex = 5
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-03-03-0076" Then   
+            If Seeker.selected_a_drink = "12-03-03-0076" Then
                 If MenuPoint[5] = 1 then
-                
+
                 Else
                     Var MenuPoint[5] = 1
                     Var newPointIndex = 5
@@ -351,17 +351,17 @@
 
 
             ; Menu 7
-            If Seeker.selected_a_drink = "12-02-02-0069" Then	
+            If Seeker.selected_a_drink = "12-02-02-0069" Then
                 If MenuPoint[6] = 1 then
-                
+
                 Else
                     Var MenuPoint[6] = 1
                     Var newPointIndex = 6
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-02-03-0069" Then   
+            If Seeker.selected_a_drink = "12-02-03-0069" Then
                 If MenuPoint[6] = 1 then
-                
+
                 Else
                     Var MenuPoint[6] = 1
                     Var newPointIndex = 6
@@ -370,17 +370,17 @@
 
 
             ; Menu 8
-            If Seeker.selected_a_drink = "12-05-02-0126" Then	
+            If Seeker.selected_a_drink = "12-05-02-0126" Then
                 If MenuPoint[7] = 1 then
-                
+
                 Else
                     Var MenuPoint[7] = 1
                     Var newPointIndex = 7
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-05-03-0126" Then   
+            If Seeker.selected_a_drink = "12-05-03-0126" Then
                 If MenuPoint[7] = 1 then
-                
+
                 Else
                     Var MenuPoint[7] = 1
                     Var newPointIndex = 7
@@ -389,17 +389,17 @@
 
 
             ; Menu 9
-            If Seeker.selected_a_drink = "12-05-02-0127" Then	
+            If Seeker.selected_a_drink = "12-05-02-0127" Then
                 If MenuPoint[8] = 1 then
-                
+
                 Else
                     Var MenuPoint[8] = 1
                     Var newPointIndex = 8
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-05-03-0127" Then   
+            If Seeker.selected_a_drink = "12-05-03-0127" Then
                 If MenuPoint[8] = 1 then
-                
+
                 Else
                     Var MenuPoint[8] = 1
                     Var newPointIndex = 8
@@ -408,17 +408,17 @@
 
 
             ; Menu 10
-            If Seeker.selected_a_drink = "12-02-02-0070" Then	
+            If Seeker.selected_a_drink = "12-02-02-0070" Then
                 If MenuPoint[9] = 1 then
-                
+
                 Else
                     Var MenuPoint[9] = 1
                     Var newPointIndex = 9
                 EndIf
             EndIf
-            If Seeker.selected_a_drink = "12-02-03-0070" Then   
+            If Seeker.selected_a_drink = "12-02-03-0070" Then
                 If MenuPoint[9] = 1 then
-                
+
                 Else
                     Var MenuPoint[9] = 1
                     Var newPointIndex = 9
@@ -431,109 +431,109 @@
             If MenuPoint[0] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[0]
+                Var PointName[CurrentIndexPoint] = MenuName[0]
                 If newPointIndex = 0 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[1] = 1 Then	
+            If MenuPoint[1] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[1]
+                Var PointName[CurrentIndexPoint] = MenuName[1]
                 If newPointIndex = 1 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[2] = 1 Then	
+            If MenuPoint[2] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[2]
+                Var PointName[CurrentIndexPoint] = MenuName[2]
                 If newPointIndex = 2 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[3] = 1 Then	
+            If MenuPoint[3] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[3]
+                Var PointName[CurrentIndexPoint] = MenuName[3]
                 If newPointIndex = 3 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[4] = 1 Then	
+            If MenuPoint[4] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[4]
+                Var PointName[CurrentIndexPoint] = MenuName[4]
                 If newPointIndex = 4 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[5] = 1 Then	
+            If MenuPoint[5] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[5]
+                Var PointName[CurrentIndexPoint] = MenuName[5]
                 If newPointIndex = 5 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[6] = 1 Then	
+            If MenuPoint[6] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[6]
+                Var PointName[CurrentIndexPoint] = MenuName[6]
                 If newPointIndex = 6 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[7] = 1 Then	
+            If MenuPoint[7] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[7]
+                Var PointName[CurrentIndexPoint] = MenuName[7]
                 If newPointIndex = 7 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[8] = 1 Then	
+            If MenuPoint[8] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[8]
+                Var PointName[CurrentIndexPoint] = MenuName[8]
                 If newPointIndex = 8 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
 
-            If MenuPoint[9] = 1 Then	
+            If MenuPoint[9] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                PointName[CurrentIndexPoint] = MenuName[9]
+                Var PointName[CurrentIndexPoint] = MenuName[9]
                 If newPointIndex = 9 Then
                     Var PointImage[CurrentIndexPoint] = "/new_point.png"
-                Else    
+                Else
                     Var PointImage[CurrentIndexPoint] = "/point.png"
                 EndIf
             EndIf
@@ -546,23 +546,23 @@
             DEBUGVAR Seeker.PointTaobinStr
             DEBUGVAR Seeker.TNumberTaobinMember
 
-            Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_3.xml" 
+            Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_3.xml"
 		EndIf
 
 </EventActionOk>
 
-<EventActionError> 
+<EventActionError>
 
 		Var Seeker.TaobinErrorNetwork = 1
-	
+
 		Var Seeker.PointTaobinStr = ParamCP
 		Var TelephoneNumber = TelephoneNumberX
 		Var Seeker.TNumberTaobinMember= TelephoneNumber
 		Var CollectPointError = "collect"
 		Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_error.xml"
-	
 
-</EventActionError> 
+
+</EventActionError>
 
 <EventMachine>
 	If MachineStage = "drink-success" Then

xml/event/jemila/page_collect_point_jemila_3.xml

@@ -24,14 +24,14 @@
 
     Var PointRootDir = "ROOT/taobin_project/image/event/jemila"
 
-    If show_eng = "true" Then 
+    If show_eng = "true" Then
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 		Var CloseBtnImg = PointRootDir + "/continue_en_btn.png"
 	Else
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 		Var CloseBtnImg = PointRootDir + "/continue_btn.png"
 	EndIf
-	
+
 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0
 
@@ -108,7 +108,7 @@
 		Var subTitle_Y = 853
 
 		Var text8_X = 346
-		
+
 	EndIf
 
     If PointCount >= 7 Then
@@ -121,13 +121,13 @@
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	Var CountDownBrewing = BREW_CNT
 
 	Var ShowCountDownBrewing = CountDownBrewing
 
-	
+
 
 	Var Timeout = Timeout + 1
 	If Timeout > 10 Then
@@ -137,11 +137,11 @@
        Var UpdatePoint = 1
 	EndIf
 
-	
+
 
 	TimerReset
 	Refresh
-</EventTimeout> 
+</EventTimeout>
 
 
 <EventActionError>
@@ -165,9 +165,9 @@
     EndIf
 
 </EventActionOk>
-	
+
-<EventSecurity> 
+<EventSecurity>
-	Open "/media/bt/xml/security_alarm.xml" 
+	Open "/media/bt/xml/security_alarm.xml"
 </EventSecurity>
 
 
@@ -343,77 +343,77 @@
 <Text>
 <X> 192 </X>
 <Y> 1354 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[0] </Value>
 </Text>
 
 <Text>
 <X> 367 </X>
 <Y> 1354 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[1] </Value>
 </Text>
 
 <Text>
 <X> 542 </X>
 <Y> 1354 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[2] </Value>
 </Text>
 
 <Text>
 <X> 717 </X>
 <Y> 1354 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[3] </Value>
 </Text>
 
 <Text>
 <X> 281 </X>
 <Y> 1612 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[4] </Value>
 </Text>
 
 <Text>
 <X> 456 </X>
 <Y> 1612 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[5] </Value>
 </Text>
 
 <Text>
 <X> 631 </X>
 <Y> 1612 </Y>
-<Width> 270 </Width>
+<Width> 170 </Width>
 <Font> RobotoBold </Font>
 <Size> 14 </Size>
 <Color> 0x000000 </Color>
-<Align> Center </Align>
+<Align> center-vertical-horizontal </Align>
 <Value> PointName[6] </Value>
 </Text>
 
@@ -424,7 +424,7 @@
 <FilenamePress> CloseBtnImg </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; goto lid straw
     If PointCount >= 7 Then
         If SELLONLINE = 1 Then
@@ -455,14 +455,14 @@
 </Image>
 ;
 <Text>
-<X> XPosiShowCountDownBrew </X>
+    <X> XPosiShowCountDownBrew </X>
-<Y> 470 </Y>
+    <Y> 470 </Y>
-<Align> End </Align>
+    <Align> End </Align>
-<Width> 153 </Width>
+    <Width> 153 </Width>
-<Size> 88 </Size>
+    <Size> 88 </Size>
-<Font> RobotoBold </Font
+    <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+    <Color> 0x513C2F </Color>
-<Value> ShowCountDownBrewing </Value>
+    <Value> ShowCountDownBrewing </Value>
 </Text>
 
 <EventUnitTest3>

xml/event/jemila/page_jemila_random.xml

@@ -18,6 +18,8 @@
         Var SelectedState = "Invisible"
 
         Var SelectedRandomImg = ""
+        Var SelectedRandomX = 0
+        Var SelectedRandomY = 0
 
         If JemilaDewyglowOutOfStock = 0 Then
             Var rewardList[MaxRandomIndex] = "jemila_dewyglow"
@@ -226,7 +228,7 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
-        
+
 
     </EventOpen>
 
@@ -280,6 +282,8 @@
         <Filename> Var( DirImage + "/random_select_img_1.png") </Filename>
         <EventClick>
             Var SelectedRandomImg = DirImage + "/random_open_img_1.png"
+            Var SelectedRandomX = 163
+            Var SelectedRandomY = 662
             Function 2
         </EventClick>
     </Image>
@@ -291,6 +295,8 @@
         <Filename> Var( DirImage + "/random_select_img_2.png") </Filename>
         <EventClick>
             Var SelectedRandomImg = DirImage + "/random_open_img_2.png"
+            Var SelectedRandomX = 279
+            Var SelectedRandomY = 653
             Function 2
         </EventClick>
     </Image>
@@ -302,13 +308,15 @@
         <Filename> Var( DirImage + "/random_select_img_3.png") </Filename>
         <EventClick>
             Var SelectedRandomImg = DirImage + "/random_open_img_3.png"
+            Var SelectedRandomX = 108
+            Var SelectedRandomY = 712
             Function 2
         </EventClick>
     </Image>
 
     <Image>
-        <X> 0 </X>
+        <X> SelectedRandomX </X>
-        <Y> 380 </Y>
+        <Y> SelectedRandomY </Y>
         <State> SelectedState </State>
         <Filename> SelectedRandomImg </Filename>
     </Image>
@@ -321,8 +329,8 @@
         DEBUGVAR MaxRandomIndex
         Random2 0 MaxRandomIndex randResultInt
         DEBUGVAR randResultInt
-        Var randResultStr = rewardList[randResultInt] 
+        Var randResultStr = rewardList[randResultInt]
-        
+
         If randResultStr = "jemila_dewyglow" Then
             Var CodeType = "147"
         EndIf

xml/event/promotion_cocoa77.xml

@@ -6915,7 +6915,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -6988,7 +6988,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -7170,7 +7170,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -7243,7 +7243,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/promotion_jemila.xml

@@ -6915,7 +6915,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -6988,7 +6988,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -7170,7 +7170,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -7243,7 +7243,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/event/tricker.ev

@@ -29,7 +29,7 @@ Var Anniversary3VideoEnable = 0
 Var MomDayEnable = 0
 
 ; September / Oct
-; Enable app game 
+; Enable app game
 Var GameEnableFromTrickerEv = 0
 
 ; Enable pro Pepween
@@ -164,7 +164,7 @@ If SystemDateMonthInt = 7 Then
 			Var PassionMintPro = 1
 		EndIf
 	EndIf
-	
+
 	If SystemDateDayInt >= 22 Then
 		Var 7UpLuckyDrawX2Pro = 1
 	EndIf
@@ -218,7 +218,8 @@ If BoxID = 105005 Then
 	Var PassionMintPro = 0
 	Var MomCocoaPro = 0
 	Var MomCocoaProDiscountEnable = 0
-	Var RobinsonBeautyPro = 1
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
 EndIf
 
 If BoxID = 172331 Then
@@ -316,7 +317,7 @@ If taobin_nopro = "true" Then
 	Var MomCocoaPro = 0
 	Var RobinsonBeautyPro = 0
 	Var JemilaPro = 0
-	
+
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
 EndIf
@@ -358,6 +359,12 @@ Else
 EndIf
 
 
+If CollagenPowderEnable = "true" Then
+
+Else
+    Var JemilaPro = 0
+EndIf
+
 Var CurrentMainVideoTemp = 0
 
 
@@ -365,8 +372,7 @@ DEBUGVAR FreePowerup
 
 
 
-
+; Control collect promotion point behavior
-; Control collect promotion point behavior 
 Var New_Payment = 0
 Var NewFlowPaymentCode = 0
 

xml/menu_new_layout_gen.py

@@ -7,13 +7,13 @@
         return price_list[product_code_3]
     else:
         return '"-"'
-    
+
   def GetPrice(price_list, product_code):
     if product_code in price_list:
       return price_list[product_code]
     else:
       return '"-"'
-      
+
   def GetOriginalPrice_Old(original_price_list, product_code_1, product_code_2, product_code_3):
     if product_code_1 in original_price_list:
         return original_price_list[product_code_1]
@@ -23,13 +23,13 @@
         return original_price_list[product_code_3]
     else:
         return '"-"'
-    
+
   def GetOriginalPrice(original_price_list, product_code):
     if product_code in original_price_list:
       return original_price_list[product_code]
     else:
       return '"-"'
-    
+
   def GetTricker(tricker_list, product_code_1, product_code_2, product_code_3):
     if product_code_1 in tricker_list:
         return tricker_list[product_code_1]
@@ -44,7 +44,7 @@
 
   if "v2" in param:
     print("Version 1 ignore ")
-  else:  
+  else:
     menu_white_color_catalog = False
     menu_xml_var = ""
     if current_file_name == "page_catalog_group_recommend.skt":
@@ -53,12 +53,12 @@
     else:
       touch_less_gen = False
       button_add_string = ""
-    
+
     if current_file_name == "page_catalog_group_recommend_double_pro.skt":
       double_pro_gen = True
     else:
       double_pro_gen = False
-    
+
     if current_file_name == "page_catalog_group_recommend_triple_pro.skt":
       triple_pro_gen = True
     else:
@@ -133,7 +133,7 @@
       menu_white_color_catalog = True
     else:
       from_my_mint_promotion = False
-    
+
     if current_file_name == "page_catalog_group_pro_bad_valentine.skt":
       from_bad_valentine = True
       # menu_white_color_catalog = True
@@ -242,7 +242,7 @@
     else:
       from_cocoa77 = False
       cocoa77_fix_price = False
-    
+
     if current_file_name == "page_catalog_group_pro_passion_mint.skt":
       passion_mint = True
       passion_mint_fix_price = {
@@ -272,6 +272,11 @@
     else:
       from_robinson_beauty = False
 
+    if current_file_name == "page_catalog_group_pro_jemila.skt":
+        from_jemila = True
+    else:
+        from_jemila = False
+
     #print ("######################################################################################################")
     idx_of_eng = 2
     out_xml('<FrameScroll> \r\n')
@@ -289,7 +294,7 @@
       out_xml('<Column> 2 </Column>\r\n')
     else:
       out_xml('<Column> 4 </Column>\r\n')
-    out_xml('<Script>\r\n') 
+    out_xml('<Script>\r\n')
 
     if "all" in verbose:
       print("current_file_name " + current_file_name)
@@ -317,10 +322,10 @@
       out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
       out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
       out_xml('\tEndIf\r\n')
-      
+
-    
+
     out_xml('</Script>\r\n')
-    
+
     pd_code_available = '##-##-##-####'
     count = 0
     count_test = 0
@@ -345,19 +350,19 @@
       out_xml('\t<Color> "0xeae6e1" </Color>\r\n')
       out_xml('\t<QRColor> "0x513C2F" </Color>\r\n')
       out_xml('\t<Height> 150 </Height>\r\n')
-      
+
       #out_xml('\t<State> TouchLessQrStg </State>\r\n')
       #out_xml('\t<Service> "Herr" </Service>\r\n')
       out_xml('\t<State> TouchLessQrStg </State>\r\n')
       out_xml('\t<Service> testservice </Service>\r\n')
-      
+
       out_xml('\t</QRCode>\r\n')
       out_xml('</Block>\r\n')
       out_xml(';dummy_layout.inc\r\n')
-    
+
     if double_pro_gen == True or triple_pro_gen:
       out_xml(';dummy_layout.inc\r\n')
-    
+
     def GenListMenu():
       for spl in  menu_new_list:
         #product_code = s
@@ -365,11 +370,11 @@
           continue
 
         if spl[0].startswith("TAG"):
-          out_xml( '\t;' + spl[0] + '\r\n')  
+          out_xml( '\t;' + spl[0] + '\r\n')
           continue
-        
 
-        out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
+
+        out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')
         menu_img = spl[7]
         out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n')
         out_xml( '<Block>\r\n')
@@ -377,7 +382,7 @@
         out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
         out_xml('\t<Width> 225 </Width>\r\n')
         out_xml('\t<Height> 296 </Height>\r\n')
-        str_con = "" 
+        str_con = ""
         str_con_var = ""
         if spl[4] != '-':
           str_con += spl[4] + '.Button,'
@@ -385,22 +390,22 @@
           str_con += spl[5] + '.Button,'
         if spl[6] != '-':
           str_con += spl[6] + '.Button,'
-    
+
         if spl[4] != '-':
           str_con_var += spl[4] + '-'
         if spl[5] != '-':
           str_con_var += spl[5] + '-'
         if spl[6] != '-':
           str_con_var += spl[6] + '-'
-    
+
         str_con_var = str_con_var.replace("-", "")
         if touch_less_gen == True or double_pro_gen == True or triple_pro_gen == True:
           str_con += "Disable=Invisible,"
-        
+
         str_con += "$Sum" + str_con_var
 
         out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
-        
+
         pd_code_1 = spl[4]
         pd_stage1 = '$' + spl[4] + '.Button'
         if spl[4] == "-" or len(spl[4]) == 0 :
@@ -412,22 +417,22 @@
         if spl[5] == "-" or len(spl[5]) == 0:
           pd_code_2 = pd_code_available
           pd_stage2 = '"Disable2"'
-        
+
         pd_code_3 = spl[6]
         pd_stage3 = '$' + spl[6] + '.Button'
         if spl[6] == "-" or len(spl[6]) == 0:
           pd_code_3 = pd_code_available
           pd_stage3 = '"Disable2"'
 
-      
 
-        
+
+
         out_xml( '\t<Button>\r\n')
         out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
         if menu_img.startswith("#"):
           out_xml( '\t<Filename> '+ menu_img[1:] + '_resting </Filename>\r\n')
           out_xml( '\t<FilenamePress> '+ menu_img[1:] + '_press </FilenamePress>\r\n')
-          out_xml( '\t<FilenameDisable> '+ menu_img[1:] + '_disable </FilenameDisable>\r\n')  
+          out_xml( '\t<FilenameDisable> '+ menu_img[1:] + '_disable </FilenameDisable>\r\n')
         else:
           out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
           out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')
@@ -443,23 +448,23 @@
           else:
             out_xml( '\t<OverlayImage> xmlpro( '+spl[5]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_'+ spl[11] +'.png") </OverlayImage>\r\n')
             menu_xml_var = 'xmlpro( '+spl[5]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")'
-          
+
         out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
         out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
         out_xml( '\t<EventOnClick> \r\n')
-        
 
-        # Default 
+
+        # Default
         out_xml( '\t\tVar NameDrink = "' + spl[1].replace("\\n", " ") + '"\r\n')
         out_xml( '\t\tVar NameDrinkTH = "' + spl[0].replace("\\n", " ") + '"\r\n')
         out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
         out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
-        
+
         if menu_img.startswith("#"):
           out_xml( '\t\tVar PictureDrink = bn_oreo_vo_get1_full_path\r\n')
         else:
           out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
-              
+
         out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
 
         if rerun_fix_price:
@@ -499,11 +504,11 @@
           out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
           out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
           out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n')
-        
+
         out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
         out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
         out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n')
-        
+
         out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n')
         out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
         out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
@@ -512,12 +517,12 @@
           out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
           out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')
 
-        
+
 
 
         out_xml( '\t\tVar SelectCountDrinkType = 0\r\n')
         out_xml( '\t\tVar DefaultDrinkType = 0\r\n')
-        
+
         out_xml( '\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
         out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n')
         out_xml( '\t\t\tVar DefaultDrinkType = 1\r\n')
@@ -566,16 +571,16 @@
         out_xml( '\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\r\n')
         out_xml( '\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\r\n')
         out_xml( '\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\r\n')
-        
 
 
-        
+
+
         out_xml( '\t\t\r\n')
         out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n')
         out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
         out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
         out_xml( '\t\tVar SelectDrinkType = 0\r\n')
-        
+
         if fixed_price > 0:
           out_xml( '\t\tVar From15THBPro = 1 \r\n')
 
@@ -606,24 +611,27 @@
 
         if from_nam_hom_coconut:
           out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n')
-        
+
         if from_cocoa77:
           out_xml( '\t\tVar FromCocoa77Pro = 1 \r\n')
-        
+
         if passion_mint:
           out_xml( '\t\tVar FromPassionMintPro = 1 \r\n')
 
         if from_robinson_beauty:
-          out_xml( '\t\tVar FromRobinsonBeautyPro = 1 \r\n')          
+          out_xml( '\t\tVar FromRobinsonBeautyPro = 1 \r\n')
+
+        if from_jemila:
+          out_xml( '\t\tVar FromJemilaPro = 1 \r\n')
+
 
-        
         out_xml( '\t\t\r\n')
         out_xml( '\t\t'+ button_add_string +'\r\n')
         out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
-        
+
         out_xml( '\t\t\r\n')
-        
+
-        
+
 
         out_xml( '\t</EventOnClick>\r\n')
         out_xml( '\t</Button>\r\n')
@@ -631,7 +639,7 @@
         if "all" in verbose:
           print("len= " + str(len( spl) ) )
 
-        
+
 
 
         menu_color_font = None
@@ -641,8 +649,8 @@
         if menu_white_color_catalog == True:
           menu_color_font = '0xFFFFFF'
           desc_color_font = '0xFFFFFF'
-    
+
-      
+
         if spl[1] != "None":
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X>  16   </X>\r\n')
@@ -667,7 +675,7 @@
           out_xml( '\t<Value> "' +  spl[2].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
 
-      
+
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X> 16 </X>\r\n')
           out_xml( '\t<Y> 164 </Y>\r\n')
@@ -691,7 +699,7 @@
           out_xml( '\t<Value> "' + spl[3].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
 
-          if spl[4] != "TAOTIM":  
+          if spl[4] != "TAOTIM":
             out_xml( '\t<Image>\r\n')
             out_xml( '\t<X> 16 </X>\r\n')
             out_xml( '\t<Y> 264 </Y>\r\n')
@@ -707,11 +715,11 @@
           if len(spl[4]) == 0 :
             shw = '"Invisible"'
             ice_tab_hot_show = False
-          
+
           if spl[4] == "TAOTIM":
             shw = '"Invisible"'
             ice_tab_hot_show = False
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 16 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -733,13 +741,13 @@
             out_xml( '\t<Size> 14 </Size>\r\n')
             out_xml( '\t<Width>220</Width>\r\n')
             out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-            
+
           out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
           out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
           out_xml( '\t<State> ' + shw + ' </State>\r\n')
-          
+
           #out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
-          
+
           if "inter" in param:
             if "free" in param:
               out_xml( '\t<Value> "Free" </Value>\r\n')
@@ -774,7 +782,7 @@
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
-          
+
           ice_tab_ice_show = True
 
           shw = "$" + spl[5] + ".Button"
@@ -789,7 +797,7 @@
           if spl[4] == "TAOTIM":
             shw = '"Invisible"'
             ice_tab_ice_show = False
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 81 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -849,7 +857,7 @@
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
-      
+
           ice_tab_blend_show = True
 
           if spl[4] == "TAOTIM":
@@ -902,7 +910,7 @@
             out_xml( '\t<Size> 14 </Size>\r\n')
             out_xml( '\t<Width>220</Width>\r\n')
             out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-          
+
           out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
           out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
           out_xml( '\t<State> ' + shw + ' </State>\r\n')
@@ -940,7 +948,7 @@
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 81 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -958,7 +966,7 @@
             out_xml( '\t\t\tEndIf\r\n')
           else:
             out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
-          
+
           out_xml( '\t\t\r\n')
           out_xml( '\t\tElse\r\n')
           out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
@@ -970,7 +978,7 @@
           out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>\r\n')
           out_xml( '\t</Image>\r\n')
 
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 49 </X>\r\n')
           out_xml( '\t<Y> 117 </Y>\r\n')
@@ -1007,7 +1015,7 @@
             out_xml( '\t</State>\r\n')
             out_xml( '\t<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>\r\n')
             out_xml( '\t</Image>\r\n')
-          
+
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X> 84 </X>\r\n')
           out_xml( '\t<Y> 266 </Y>\r\n')
@@ -1051,7 +1059,7 @@
           out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
           out_xml('\t<Width> 225 </Width>\r\n')
           out_xml('\t<Height> 296 </Height>\r\n')
-          str_con = "" 
+          str_con = ""
           str_con_var = ""
           if spl[8] != '-':
             str_con += spl[8] + '.Button,'
@@ -1059,22 +1067,22 @@
             str_con += spl[9] + '.Button,'
           if spl[6] != '-':
             str_con += spl[10] + '.Button,'
-      
+
           if spl[8] != '-':
             str_con_var += spl[8] + '-'
           if spl[9] != '-':
             str_con_var += spl[9] + '-'
           if spl[10] != '-':
             str_con_var += spl[10] + '-'
-      
+
           str_con_var = str_con_var.replace("-", "")
           if touch_less_gen == True or double_pro_gen == True or triple_pro_gen == True:
             str_con += "Disable=Invisible,"
-          
+
           str_con += "$Sum" + str_con_var
 
           out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
-          
+
           pd_code_1 = spl[8]
           pd_stage1 = '$' + spl[8] + '.Button'
           if spl[8] == "-" or len(spl[8]) == 0 :
@@ -1086,16 +1094,16 @@
           if spl[9] == "-" or len(spl[9]) == 0:
             pd_code_2 = pd_code_available
             pd_stage2 = '"Disable2"'
-          
+
           pd_code_3 = spl[10]
           pd_stage3 = '$' + spl[10] + '.Button'
           if spl[10] == "-" or len(spl[10]) == 0:
             pd_code_3 = pd_code_available
             pd_stage3 = '"Disable2"'
 
-          
 
-          
+
+
           out_xml( '\t<Button>\r\n')
           out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
           out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
@@ -1113,17 +1121,17 @@
             else:
               out_xml( '\t<OverlayImage> xmlpro( '+spl[9]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_'+ spl[11] +'.png") </OverlayImage>\r\n')
               menu_xml_var = 'xmlpro( '+spl[9]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")'
-          
+
           out_xml( '\t<EventOnClick> \r\n')
-          
+
-          # Default 
+          # Default
           out_xml( '\t\tVar NameDrink = "' + spl[1].replace("\\n", " ") + '"\r\n')
           out_xml( '\t\tVar NameDrinkTH = "' + spl[0].replace("\\n", " ") + '"\r\n')
           out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
           out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
-          
+
           out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
-                
+
           out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
 
           if wednesday_melon_fix_price:
@@ -1151,11 +1159,11 @@
             out_xml( '\t\tVar PriceD1 = $' + spl[8] + '.Price\r\n')
             out_xml( '\t\tVar PriceD2 = $' + spl[9] + '.Price\r\n')
             out_xml( '\t\tVar PriceD3 = $' + spl[10] + '.Price\r\n')
-          
+
           out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
           out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
           out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n')
-          
+
           out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n')
           out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
           out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
@@ -1164,13 +1172,13 @@
             out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
             out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')
 
-        
+
 
 
 
           out_xml( '\t\tVar SelectCountDrinkType = 0\r\n')
           out_xml( '\t\tVar DefaultDrinkType = 0\r\n')
-          
+
           out_xml( '\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
           out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n')
           out_xml( '\t\t\tVar DefaultDrinkType = 1\r\n')
@@ -1219,10 +1227,10 @@
           out_xml( '\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\r\n')
           out_xml( '\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\r\n')
           out_xml( '\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\r\n')
-          
 
 
-          
+
+
           out_xml( '\t\t\r\n')
           out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n')
           out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
@@ -1239,16 +1247,16 @@
 
           if from_lipit_pro:
             out_xml( '\t\tVar FromLipitPro = 1 \r\n')
-          
+
           if from_tea_time_pro:
             out_xml( '\t\tVar FromTeaTimePro = 1 \r\n')
 
           if wednesday_melon_fix_price:
             out_xml( '\t\tVar FromWednesdayMelonPro = 1 \r\n')
-          
+
           if from_nam_hom_coconut:
             out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n')
-          
+
           if from_cocoa77:
             out_xml( '\t\tVar FromCocoa77Pro = 1 \r\n')
 
@@ -1256,22 +1264,25 @@
             out_xml( '\t\tVar FromPassionMintPro = 1 \r\n')
 
           if from_robinson_beauty:
-            out_xml( '\t\tVar FromRobinsonBeautyPro = 1 \r\n')       
+            out_xml( '\t\tVar FromRobinsonBeautyPro = 1 \r\n')
+
+          if from_jemila:
+            out_xml( '\t\tVar FromJemilaPro = 1 \r\n')
 
           out_xml( '\t\t\r\n')
           out_xml( '\t\t\r\n')
-          
+
           out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
           out_xml( '\t\t\r\n')
-          
+
-          
+
 
           out_xml( '\t</EventOnClick>\r\n')
           out_xml( '\t</Button>\r\n')
 
-          
+
-      
+
-          
+
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X>  16   </X>\r\n')
           out_xml( '\t<Y>  164  </Y>\r\n')
@@ -1295,7 +1306,7 @@
           out_xml( '\t<Value> "' +  spl[2].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
 
-        
+
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X> 16 </X>\r\n')
           out_xml( '\t<Y> 164 </Y>\r\n')
@@ -1342,7 +1353,7 @@
           out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n')
           out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n')
           out_xml( '\t</Image>\r\n')
-          
+
           if "inter" in param:
             out_xml( '\t<Text>\r\n')
             out_xml( '\t<X> 50 </X>\r\n')
@@ -1361,7 +1372,7 @@
           out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
           out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
           out_xml( '\t<State> ' + shw + ' </State>\r\n')
-          
+
           if "inter" in param:
             if "free" in param:
               out_xml( '\t<Value> "Free" </Value>\r\n')
@@ -1385,7 +1396,7 @@
               out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
 
           out_xml( '\t</Text>\r\n')
-          
+
           ice_tab_ice_show = True
 
           shw = "$" + spl[9] + ".Button"
@@ -1444,9 +1455,9 @@
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[9])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
-          
+
           out_xml( '\t</Text>\r\n')
-      
+
           ice_tab_blend_show = True
 
           shw = "$" + spl[10] + ".Button"
@@ -1504,9 +1515,9 @@
               out_xml( '\t<Value> "฿' + str(GetPrice(passion_mint_fix_price, spl[10])) + '" </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')
-          
+
           out_xml( '\t</Text>\r\n')
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 81 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -1524,7 +1535,7 @@
             out_xml( '\t\t\tEndIf\r\n')
           else:
             out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
-          
+
           out_xml( '\t\t\r\n')
           out_xml( '\t\tElse\r\n')
           out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n')
@@ -1536,7 +1547,7 @@
           out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>\r\n')
           out_xml( '\t</Image>\r\n')
 
-          
+
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 49 </X>\r\n')
           out_xml( '\t<Y> 117 </Y>\r\n')
@@ -1573,7 +1584,7 @@
             out_xml( '\t</State>\r\n')
             out_xml( '\t<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>\r\n')
             out_xml( '\t</Image>\r\n')
-          
+
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X> 84 </X>\r\n')
           out_xml( '\t<Y> 266 </Y>\r\n')
@@ -1605,12 +1616,12 @@
 
           out_xml( '</Block>\r\n')
           if spl[0].startswith("TAG"):
-            out_xml( '\t;' + spl[0] + '\r\n')  
+            out_xml( '\t;' + spl[0] + '\r\n')
 
     count_test = count_test + 1
         #if count_test > 8 :
         #  break
-  
+
 
     if multi_pro_gen:
       for i in range(1, 5):
@@ -1641,8 +1652,8 @@
     else:
       out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
       GenListMenu()
-      
+
-        
+
 
     out_xml('</FrameScroll>\r\n')
 
@@ -1661,4 +1672,4 @@
     out_xml('</EventClick>\r\n')
     out_xml('</Button>\r\n')
 
-    
+

xml/page_board.xml

@@ -12,11 +12,11 @@
 	Var FileNumber = 1
 
 	Var img_press_main_page = "ROOT/taobin_project/image/main_page/bp_main_page_start.png"
-	
+
 	Var img_rest_main_page = ""
 	Var MemberButtonFileNameRest = ""
 	Var img_reset_topup = ""
-	
+
 	Var CNTDOWN_PROTECT_SCREEN_BLANK = 120
 	DEBUGVAR SoundVolume
 
@@ -26,10 +26,10 @@
 
 	Var eng_enable = "true"
 	Var thai_enable = "true"
-	
+
-	Var show_eng = "false"	
+	Var show_eng = "false"
 	Var NextOrder = "false"
-	
+
 	Var Seeker = "next"
 	Var Seeker.thankLidFlag = 0
 	Var Seeker.thankStrawFlag = 0
@@ -49,7 +49,7 @@
 
 	Var GetFreeFromError = 0
 
-	
+
 	Cart "DeleteMenuID" "ALL"
 	Var MultiPayEnable = "false"
 	;Var MultiPayEnable = "true"
@@ -67,7 +67,7 @@
 
 	Var PaidPaymentFromNextStage = 0
 	Var DrinkPaid = "-"
-	
+
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -92,7 +92,7 @@
 	Var OpunMediumTTF = "ROOT/taobin_project/font/Opun/Opun-Medium.ttf"
 	Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf"
 	Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf"
-	
+
 	Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
 
 	Var BlinkStar = "ROOT/taobin_project/image/animation/blink_star.gif"
@@ -127,14 +127,14 @@
 		Var XPosiShowCountDownBrew = 768
 		Var WQR = 290
 		Var HQR = 290
-		
+
 	EndIf
 
 
-	
+
 	Var MinPhoneNumber = 10
 	Var MaxPhoneNumber = 10
-	
+
 
 	Var TestLoopMakeDrink = 0
 	Var TestLoopSuccess = 0
@@ -161,13 +161,13 @@
 
 
 
-	
+
 
 
 
 	; take a look file page_board_1.xml
 
-	
+
 	If XMLProfile = "" Then
 		CacheVarStr "get" XMLProfile
 	Else
@@ -187,13 +187,13 @@
 
 	DEBUGVAR MaterialAvailable
 
-	STRCONTAIN "9501" MaterialAvailable TaobinOnline 
+	STRCONTAIN "9501" MaterialAvailable TaobinOnline
-	STRCONTAIN "9505" MaterialAvailable TermTemOnline 
+	STRCONTAIN "9505" MaterialAvailable TermTemOnline
 
 	; App fast
-	STRCONTAIN "1063" MaterialAvailable AppFastEnable 
+	STRCONTAIN "1063" MaterialAvailable AppFastEnable
-	STRCONTAIN "1046" MaterialAvailable WheyEnable 
+	STRCONTAIN "1046" MaterialAvailable WheyEnable
-	
+
 	STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable
 	STRCONTAIN "1058" MaterialAvailable OreoEnable
 
@@ -208,6 +208,7 @@
 	STRCONTAIN "1216" MaterialAvailable CoconutSyrupEnable
 	STRCONTAIN "1042" MaterialAvailable CocoaPowderEnable
 	STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
+	STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
 
 	;Var AppFastEnable = "false"
 	If AppFastEnable = "true" Then
@@ -238,9 +239,9 @@
 		Var WebAppShow = "Invisible"
 	EndIf
 
-	
+
 	Var TaobinOnlineX = "true"
-	
+
 	DEBUGVAR AppFastButtonState
 	DEBUGVAR MenuKidButtonState
 	DEBUGVAR TaobinOnline
@@ -248,14 +249,14 @@
 	DEBUGVAR WheyEnable
 
 	; Dtac.
-	
+
-	Var CAMPAIGN1 = "false" 
+	Var CAMPAIGN1 = "false"
 
 
 	If TaobinOnlineX = "true" Then
 		Var EventTurnOn = 0
 		; CountDownShowButton must value 35
-		Var CountDownShowButton = 35 
+		Var CountDownShowButton = 35
 		Var ShowButtonClickFull = "Invisible"
 
 		If LanguageInit = "ENG" Then
@@ -269,14 +270,14 @@
 		DEBUGVAR SystemDateMonthInt
 		DEBUGVAR SystemDateDayInt
 
-		
+
 	EndIf
 
 	If TaobinOnlineX = "false" Then
 		If TermTemOnline = "false" Then
 			; TODO
 			Machine Initial
-			Open "/ROOT/xml/outservice.xml" 
+			Open "/ROOT/xml/outservice.xml"
 		EndIf
 	EndIf
 
@@ -309,7 +310,7 @@
 		Var ShowButtonClick2 = "Enable"
 
 		; for test press button
-		Var ShowNetworkProblem = "Enable" 		
+		Var ShowNetworkProblem = "Enable"
 	EndIf
 
 
@@ -321,7 +322,7 @@
 
 
 
-		
+
 
 		Var QRCODE99x = ""
 
@@ -330,28 +331,28 @@
 		Var QRCODE99 = "https://taobin-beverage.web.app/" + QRCODE99x
 		;Var QRCODE99 = "https://uat-taobin-beverage.firebaseapp.com/" + QRCODE99x
 		WEB "ENABLE"
-		
+
 	Else
 
-		
+
 
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
-		
 
-		If NetworkStatus = "DOWN" Then 
+
+		If NetworkStatus = "DOWN" Then
 			Machine NetworkDown
 		EndIf
-		
+
 
 		Var QRCODE99 = ""
 		WEB "DISABLE"
-		
+
 	EndIf
 
 
-	
+
 
 
 	Var ShowPrice = "Enable"
@@ -393,8 +394,8 @@
 	;DEBUGVAR "FlushTxRef1"
 	;FlushTxRef1
 
-	
+
-	
+
 	StopLongPlay
 
 
@@ -406,10 +407,10 @@
 	Var led_new = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
 	DEBUGVAR led_new
-	If led_new = "1" Then 
+	If led_new = "1" Then
 
 		LEDv2 LedDoorCupV2 Off 255 194 166 20 6
- 
+
 		LEDv2 LedDoorLidV2 Off 255 255 255 20 6
 	Else
 
@@ -419,14 +420,14 @@
 
 	EndIf
 
-	
-	
 
-	
 
-	
+
+
+
+
 	Var showCart = "Invisible"
-	
+
 	Var LedLidBlink = "no"
 
 
@@ -436,14 +437,14 @@
 	If JXMLVersionInt > 412 Then
 		Var ToppingNewShow = "true"
 	EndIf
-	
+
 	DEBUGVAR XMLProfile
-	
+
 	Machine CancelWepApp
 
 
 	StrLen AdvertiseProfile AdvertiseProfileLen
-	
+
 
 	STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
 
@@ -470,7 +471,7 @@
 	Machine MenuLayoutNew
 
 	DEBUGVAR SpiralOnline
-	
+
 	Topping "ClearNextOrder" "-"
 
 
@@ -494,7 +495,7 @@
 	If CameraCount = 0 Then
 		CameraService "Start"
 	EndIf
-	
+
 	If CameraCount = "" Then
 		CameraService "Start"
 	EndIf
@@ -523,7 +524,7 @@
 
 
 	Machine __arm_toggle
-	
+
 	GetLongTimeInMinute CurrentTime
 
 	DEBUGVAR LastTimeClickOrder
@@ -533,8 +534,8 @@
 		GetLongTimeInMinute LastTimeClickOrder
 	EndIf
 
-	Var DiffTimeInMinute = CurrentTime - LastTimeClickOrder 
+	Var DiffTimeInMinute = CurrentTime - LastTimeClickOrder
-	
+
 	DEBUGVAR DiffTimeInMinute
 
 	If DiffTimeInMinute > 120 Then
@@ -543,16 +544,16 @@
 	EndIf
 
 	; zone config language
-	
+
 	SetLanguage LanguageInit
-	
+
 
 	Var InternationalEnable = 0
 	Var InternationalEnableStr = "false"
 	Var cups_sold_text = "เสิร์ฟแล้ว ( CUPS SOLD )"
 	Var XButtonMember = 212
 	Var YButtonMember = 1695
-	
+
 	; CountryName
 	If CountryName = "" Then
 		READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
@@ -586,13 +587,13 @@
 
 		;
 
-	
+
 	EndIf
 
 	; Zone set video main page.
 
-	; ignore collection point 
+	; ignore collection point
-	Var SettingIgnoreCollectPoint = 0 
+	Var SettingIgnoreCollectPoint = 0
 	Var SettingVideoBrewingUseCommon = 0
 
 	Var adver_brewing_en = 1
@@ -601,7 +602,7 @@
 	If CountryName = "Australia" Then
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
 	EndIf
-	
+
 	;inter-xml-open
 	If CountryName = "Malaysia" Then
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
@@ -639,7 +640,7 @@
 	If CountryName = "Malaysia" Then
 
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		EnableLanguage "MALAY"
@@ -714,7 +715,7 @@
 
 	;inter-page-board
 	If CountryName = "Indonesia" Then
-		
+
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/idr/video/script_video.ev"
 		Var TextPriceMenuSize = 14
 		Var show_eng_button_stage = "Invisible"
@@ -745,14 +746,14 @@
 	If CountryName = "Australia" Then
 
 		Var SettingVideoBrewingUseCommon = 1
-		
+
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		SetLanguage "ENG"
 		LanguageControl "UpdateList" "-"
-		
+
 		Var InternationalEnable = 1
 		Var show_eng = "true"
 		;Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main.mp4"
@@ -800,12 +801,12 @@
 	If CountryName = "USANewYork" Then
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
 
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		SetLanguage "ENG"
 		LanguageControl "UpdateList" "-"
-		
+
 		Var InternationalEnable = 1
 		Var show_eng = "true"
 		;Var VideoMainPage = "ROOT/taobin_project/inter/usaNY/video/video_main.mp4"
@@ -847,19 +848,19 @@
 
 	;inter-page-board
 	If CountryName = "Singapore" Then
-		
+
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		SetLanguage "ENG"
 		LanguageControl "UpdateList" "-"
-		
+
 		Var InternationalEnable = 1
 		Var show_eng = "true"
 		Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
 
-		
+
 		Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main.mp4"
 
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
@@ -927,27 +928,27 @@
 
 		;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-	
+
 
 
 	EndIf
 
 	;inter-page-board
 	; wait
-	
+
 	If CountryName = "UnitedArabEmirates Dubai" Then
 
 		SAVELOG "UnitedArabEmirates Dubai UnitedArabEmirates Dubai UnitedArabEmirates Dubai"
-		
+
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
-		
+
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		EnableLanguage "UAE_DUBAI"
 		SetLanguage "ENG"
 		LanguageControl "UpdateList" "-"
-		
+
 		Var InternationalEnable = 1
 		Var show_eng = "true"
 		Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
@@ -956,7 +957,7 @@
 
 		Var CountryRootPath = "ROOT/taobin_project/inter/uae_dubai/"
 		Var CountryShortName = "uae_dubai"
-		
+
 		Var TextPriceMenuSize = 12
 		Var TextPriceMenuY = 266
 		Var TextPriceMenuBlendX = 180
@@ -982,7 +983,7 @@
 
 		Var SettingDisableTaobinCredit = "true"
 		Var SettingDisableTaobinCode = "false"
-		
+
 		; Dubai disable point
 		Var SettingIgnoreCollectPoint = 1
 
@@ -997,12 +998,12 @@
 
 	If CountryName = "HongKong" Then
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
-		
+
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		SetLanguage "ENG"
 		LanguageControl "UpdateList" "-"
-		
+
 		Var InternationalEnable = 1
 		Var show_eng = "true"
 		Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
@@ -1078,7 +1079,7 @@
 		If Not#LanguageResult = "false" Then
 			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv"
 		EndIf
-		
+
 		Var RootPath = "ROOT/taobin_project/inter/common/"
 
 		Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
@@ -1105,15 +1106,15 @@
 	Else
 
 		Var ShowNetworkProblem = "Enable"
-		Var ShowButtonClick2 = "Invisible"		
+		Var ShowButtonClick2 = "Invisible"
 
-		If NetworkStatus = "DOWN" Then 
+		If NetworkStatus = "DOWN" Then
 			Machine NetworkDown
 		EndIf
-		
+
 		Var QRCODE99 = ""
 		WEB "DISABLE"
-		
+
 	EndIf
 
 	If GameInstalled = "" Then
@@ -1130,8 +1131,8 @@
 	RootLayoutVisible 3 "hide"
 
 	If SELLSTATUS = "DEACTIVE" Then
-		Open "/ROOT/xml/offline.xml" 
+		Open "/ROOT/xml/offline.xml"
-	EndIf	
+	EndIf
 
 	Var CheckCupStateDoorCupClose = ""
 
@@ -1157,7 +1158,7 @@
 
 	Var NoWaitMachineEnable = 1
 	DEBUGVAR NeedUpgrade
-	
+
 	If NoWaitMachineEnable = 1 Then
 		If stop_now = "true" Then
 			TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
@@ -1184,7 +1185,7 @@
 		Var ShowNetworkProblemText = ""
 	EndIf
 
-	Var SlientRefreshEnable = 0 
+	Var SlientRefreshEnable = 0
 
 	Var ShouldShowNamHomCoconutRemainReward = 0
 	Var ShowNamHomCoconutRemainReward = "Invisible"
@@ -1263,11 +1264,11 @@
 
 	XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
 	XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-	
+
 	Var CountDownPauseVideo2 = 2
 	DEBUGVAR CountDownPauseVideo2
 	Var TimeProfilePrice = 0
-	
+
 	;Machine NewPaymentOpenBrewingXMLEnable
 </EventOpen>
 
@@ -1277,9 +1278,9 @@
 			SAVELOG "Get Nam hom coconut remain reward error Ext1a is empty."
 		Else
 			DEBUGVAR Ext1a
-			
+
 			SPLIT2 Ext1a "/" RemainRewardSpl
-			
+
 			Var SuperSetRemain = RemainRewardSpl[0]
 			Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
 			Var CleansingGalRemain = RemainRewardSpl[2]
@@ -1295,7 +1296,7 @@
 			INT ClearGelRemain
 			INT E_GiftCard100BathRemain
 			INT ClearGel4mlRemain
-			
+
 			Var SumNamHomCoconutRemainReward = SuperSetRemain
 			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
 			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
@@ -1385,26 +1386,26 @@
 <EventUnitTest6>
 	Var XMLProfile = "ProfileIncrease35"
 	Var TimeProfilePrice = 0
-	
+
  </EventUnitTest6>
 
  <EventUnitTest7>
 	Var XMLProfile = "ProfileIncrease45"
 	Var TimeProfilePrice = 0
-	
+
  </EventUnitTest7>
 
  <EventUnitTest8>
 	Var XMLProfile = "PromoReduced"
 	Var TimeProfilePrice = 0
-	
+
  </EventUnitTest8>
 
   <EventUnitTest9>
 	Var XMLProfile = "Discount90Per"
 	CacheVarStr "put" XMLProfile
-	
+
-	
+
  </EventUnitTest9>
 
 <EventDrink>
@@ -1428,12 +1429,12 @@
 
 	Else
 		If NetworkStatus = "DOWN" Then
-		
+
 			Var WebAppShow = "Invisible"
 		EndIf
 		If SELLSTATUS = "DEACTIVE" Then
-				Open "/ROOT/xml/offline.xml" 
+				Open "/ROOT/xml/offline.xml"
-		EndIf	
+		EndIf
 
 		If NoWaitMachineEnable = 1 Then
 			If RecoveryRunning = "true" Then
@@ -1449,13 +1450,13 @@
 
 			EndIf
 		EndIf
-		
+
-		
+
 
 		If CLOSE_ORDER_NOW = "true" Then
 			TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
 		EndIf
-		
+
 		If MachineStage = "mcu-upgrade" Then
 			TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
 
@@ -1480,7 +1481,7 @@
 			EndIf
 
 			Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
-			
+
 			If NETCORE_EVENT_CNT_X = 30 Then
 				DEBUGVAR NETCORE_EVENT_CNT_X
 			EndIf
@@ -1498,11 +1499,11 @@
 			EndIf
 
 		Else
-			Var NETCORE_EVENT_CNT_X = 0 
+			Var NETCORE_EVENT_CNT_X = 0
-			Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT 
+			Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
 		EndIf
 
-		
+
 
 	EndIf
 
@@ -1510,33 +1511,33 @@
 		TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
 
 	EndIf
-	
+
 	If MachineStage = "remove-cup" Then
 		Open "ROOT/taobin_project/xml/page_remove_cup.xml"
 
 	EndIf
 
 	If BrewTimeoutExtend = 1 Then
-		DEBUGVAR BrewTimeoutExtend 
+		DEBUGVAR BrewTimeoutExtend
-		DEBUGVAR DoorCupPosition 
+		DEBUGVAR DoorCupPosition
 		If DoorCupPosition = "bottom" Then
 			SAVELOG "BrewTimeoutExtend = 0 Clear Error Flag"
-			Var BrewTimeoutExtend = 0 
+			Var BrewTimeoutExtend = 0
 			; clear stage
 
 		Else
-			
+
 			Var stop_now = "true"
 			Var stop_now_from_door_cup = 1
-			
+
 			TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
 		EndIf
 	Else
 		If DoorCupPosition = "Bottom" Then
-			Var BrewTimeoutExtend = 0 
+			Var BrewTimeoutExtend = 0
 
 		Else
-			Var BrewTimeoutExtend = 0 
+			Var BrewTimeoutExtend = 0
 		EndIf
 	EndIf
 
@@ -1564,18 +1565,18 @@
 			Var ShowButtonClick = "Invisible"
 			Refresh
 		EndIf
- 
+
 		If CountDownShowButton = 3 Then
-			
+
 			Var ShowButtonClick = "Enable"
-			Var ShowButtonClickFull = "Invisible"	
+			Var ShowButtonClickFull = "Invisible"
 			Refresh
 		EndIf
 
 		If CountDownPauseVideo > 0 Then
 			DEBUGVAR CountDownPauseVideo
 			; ignore
-			
+
 			Var CountDownPauseVideo = CountDownPauseVideo - 1
 			Var CountDownPauseVideo2 = CountDownPauseVideo - 1
 			DEBUGVAR CountDownPauseVideo2
@@ -1587,12 +1588,12 @@
 
 
 			If CountDownPauseVideo  = 1 Then
-			
+
 				TapScreen 860 1004
 
 			EndIf
 
-			
+
 			If CountDownPauseVideo  = 0 Then
 
 				Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -1603,7 +1604,7 @@
 
 				Var OpenFromPageBoard = 1
 
-				
+
 
 				If InternationalEnable = 1 Then
 
@@ -1618,12 +1619,12 @@
 
 				Else
 					If BeerTrapEnable = "true" Then
-						OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+						OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
 					Else
 						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
 					EndIf
         		EndIf
-	    	
+
 				Machine DoorClose
 
 				TopView "show"
@@ -1641,7 +1642,7 @@
 		Var CountUpReloadAll = CountUpReloadAll + 1
 
 		DEBUGVAR CountUpReloadAll
-		
+
 		; Original value is 40
 		If EnableMultiInstance = "true" Then
 
@@ -1667,7 +1668,7 @@
 		EndIf
 
 	EndIf
-	
+
 
 	If CupOnArm = "true" Then
 
@@ -1689,11 +1690,11 @@
 
 	If Seeker = "curr" Then
 		If DoorCupPosition = "bottom" Then
-			; It normal 
+			; It normal
 			Var EmergencyStop = "false"
 		Else
 			Var EmergencyStop = "true"
-			
+
 		EndIf
 	EndIf
 
@@ -1710,15 +1711,15 @@
 		EndIf
 	EndIf
 
-	
+
 
 	Var TimeProfilePrice = TimeProfilePrice + 1
 	If XMLProfilePrevious = XMLProfile Then
-		
+
 	Else
 		DEBUGVAR XMLProfile
 		DEBUGVAR XMLProfilePrevious
-		
+
 		If TimeProfilePrice = 5 Then
 			PRICE "Reset" "-"
 			PRICE "Load" "-"
@@ -1740,25 +1741,25 @@
 
 			Var XMLProfilePrevious = XMLProfile
 		EndIf
-		
+
 	EndIf
-	
+
 	Refresh
 
 	TimerReset
-</EventTimeout> 
+</EventTimeout>
 
-<EventEnd> 
+<EventEnd>
 	SAVELOG "EVENT END"
-	
+
 	If TaobinOnlineX = "true" Then
 		Var CountDownShowButton = 35
 	EndIf
-	
+
 	If TermTemOnline = "true" Then
 		Var CountDownShowButton = 28
 	EndIf
-	
+
 	Var CountDownPauseVideo = 6
 	If TaobinOnlineX = "true" Then
 		;TouchTapClose
@@ -1766,19 +1767,19 @@
 
 	;Open CurrentXMLFileName0
 	Refresh
-	
+
-</EventEnd> 
+</EventEnd>
 
 
 <EventNetDown>
 	SAVELOG NetworkStatus
-	;Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+	;Open "/mnt/sdcard/coffeevending/xml/main.xml"
 </EventNetDown>
 
 <EventNetDeactive>
 	SAVELOG NetworkStatus
 	If SELLSTATUS = "DEACTIVE" Then
-		Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+		Open "/mnt/sdcard/coffeevending/xml/main.xml"
 	EndIf
 </EventNetDeactive>
 
@@ -1790,7 +1791,7 @@
 
 			Var web_readyOK = web_ready
 			Var web_telnumOK = web_telnum
-			
+
 			Var web_app_prepar = "true"
 
 			; Handle penetrator
@@ -1809,7 +1810,7 @@
 		EndIf
 	Else
 	EndIf
- 
+
 </EventWebApp>
 
 
@@ -1833,13 +1834,13 @@
 <FilenamePress> img_press_main_page </FilenamePress>
 ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 
 	;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	If CocktailShow = "true" Then 
+	If CocktailShow = "true" Then
-		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
 	Else
-		
+
 		If SpiralOnline = "true" Then
 
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
@@ -1850,7 +1851,7 @@
 			Else
 				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
 			EndIf
-		
+
 		EndIf
 
 	EndIf
@@ -1869,10 +1870,10 @@
 <FilenamePress> MemberButtonFileName </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 
 	Var NextPage = "-"
-	
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
 	If InternationalEnable = 1 Then
@@ -1889,10 +1890,10 @@
 	Else
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_before_check_member.xml"
 	EndIf
-	
+
 	TopView "show"
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
-	
+
 
 </EventClick>
 </Button>
@@ -1906,10 +1907,10 @@
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_topup.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var PayDetail=""
 	Var NextPage = "-"
-	Open "ROOT/xml/service_menu.xml" 
+	Open "ROOT/xml/service_menu.xml"
 </EventClick>
 </Button>
 
@@ -1922,7 +1923,7 @@
 <Height> 1310 </Height>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 
 	SAVELOG "click ShowButtonClickFull"
 
@@ -1978,7 +1979,7 @@
 <Interval> 500 </Interval>
 <Filename>  Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
 <Filename>  Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
-<EventClick> 
+<EventClick>
 	Machine RemoveCup
 	Machine DoorLidOpen
 
@@ -1994,7 +1995,7 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
-<EventClick> 
+<EventClick>
 	If IgnoreNetCore = "true" Then
 
 		Var NextPage = "-"
@@ -2017,8 +2018,8 @@
 <State> "Enable" </State>
 <Width> 120 </Width>
 <Height> 120 </Height>
-<EventClick> 
+<EventClick>
-	
+
 	Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
@@ -2034,12 +2035,12 @@
 
 		Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
 		TRY OpenFileXML
-		
+
 		;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml"
 	Else
 
-		If BeerTrapEnable = "true" Then 
+		If BeerTrapEnable = "true" Then
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
 		Else
 			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
 		EndIf

xml/page_catalog.xml

@@ -19,12 +19,12 @@
 	Else
 
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog3.xml"
-		
+
 	EndIf
-	
+
 
 	;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	
+
 	TopView "show"
 	; On open
 
@@ -42,16 +42,16 @@
 	Var web_telnumOK = ""
 
 	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
-	
+
-	If CocktailShow = "true" Then 
+	If CocktailShow = "true" Then
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
 	EndIf
-	
+
 	If TermTemOnline = "true" Then
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
 	EndIf
-	
+
-	If Seeker = "curr" Then 	
+	If Seeker = "curr" Then
 		Machine DoorLidClose
 	EndIf
 
@@ -60,11 +60,11 @@
 
 	CoinVending OFF
 
-	
+
 	; Clear value
 	Topping "clear" "-"
 
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
@@ -74,12 +74,17 @@
 		Var DirImageCart = "ROOT/taobin_project/image/cart_en"
 
 		Var text_unavailable = "UNAVAILABLE###size=16"
-	
+
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page2"
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+
+		If FromJemilaPro = 1 Then
+		     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/taobin_sawade.m4a"
+		EndIf
+
 		Play PlaySoundLag
 
 		Var DirImageCart = "ROOT/taobin_project/image/cart_th"
@@ -116,7 +121,7 @@
 
 		;GenHashWithTimeStamp QRCODE99x
 		WEB "ENABLE"
-		
+
 	Else
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
@@ -129,7 +134,7 @@
 	EndIf
 
 	; 1035 is Coke.
-	STRCONTAIN "1035" MaterialAvailable CokeUI 
+	STRCONTAIN "1035" MaterialAvailable CokeUI
 
 	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
 	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
@@ -144,8 +149,8 @@
 	Var QRCODE99_Y = 1718
 
     Var showCart = "Invisible"
-    If MultiPayEnable = "true" Then 
+    If MultiPayEnable = "true" Then
-	    
+
 	    If CART_COUNT = 1 Then
 	        Var showCart = "Enable"
 	  		Var cart_image_bn = DirImageCart + "/bn_cart1.png"
@@ -154,7 +159,7 @@
 			Var QRCODE99_Y = 1580
 
 	    EndIf
-	    
+
 	    If CART_COUNT = 2 Then
 	        Var showCart = "Enable"
 	    	Var cart_image_bn = DirImageCart + "/bn_cart2.png"
@@ -164,7 +169,7 @@
 
 	    EndIf
 
-    
+
 
 	    If CART_COUNT = 3 Then
 	    		Open "ROOT/taobin_project/xml/page_payment_multi.xml"
@@ -183,7 +188,7 @@
 
 	EndIf
 
-	
+
 	Var menu_name_eng_hot = ""
 	Var menu_desc_eng_hot = ""
 	Var menu_name_thai_hot = ""
@@ -201,16 +206,16 @@
 	Var menu_desc_thai_blender = ""
 
 
-	
+
-	
+
-	If BoxID = 0 Then 
+	If BoxID = 0 Then
 		RebootWithCause "BoxID was zero"
 	EndIf
 
-	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	;SAVELOG SoundPlaying
 
@@ -219,21 +224,21 @@
 	EndIf
 
 	If countDownRetrun = 0 Then
-		 If  Seeker = "next" Then 
+		 If  Seeker = "next" Then
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
         Else
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"
         EndIf
 	EndIf
 
-	
+
 
 	Refresh
 	TimerReset
-</EventTimeout> 
+</EventTimeout>
 
 <EventChangeStatus>
-	;If ChangeStatus = "payout-end" Then 
+	;If ChangeStatus = "payout-end" Then
 	;	Var ChangeOK = 1
 	;EndIf
 </EventChangeStatus>
@@ -246,15 +251,15 @@
 			Cart "DeleteMenuID" "ALL"
 			Var web_readyOK = web_ready
 			Var web_telnumOK = web_telnum
-		
 
-		
+
+
 			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
 		EndIf
-		
+
 	Else
 	EndIf
- 
+
 </EventWebApp>
 
 <Image>
@@ -287,9 +292,9 @@
 <FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
-	If  Seeker = "next" Then 
+	If  Seeker = "next" Then
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
     EndIf
@@ -303,9 +308,9 @@
 <FilenamePress> show_btp  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; eng
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var show_eng = "false"
 	Else
 		Var show_eng = "true"
@@ -332,11 +337,11 @@
 <FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	
+
 	; eng
-	Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 
 </EventClick>
 </Button>
@@ -348,12 +353,12 @@
 <FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -366,12 +371,12 @@
 <FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -383,12 +388,12 @@
 <FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
 
 	EndIf
 </EventClick>
@@ -404,12 +409,12 @@
 <FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -423,10 +428,10 @@
 <FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
-	
+
 </EventClick>
 </Button>
 
@@ -438,12 +443,12 @@
 <FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -456,12 +461,12 @@
 <FilenamePress> bpSodaAndOther </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -475,10 +480,10 @@
 <FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; eng
-	Open "ROOT/taobin_project/xml/page_before_check_member.xml" 
+	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
-	
+
 </EventClick>
 </Button>
 
@@ -491,11 +496,11 @@
 <FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; eng
 	Var PayDetail=""
-	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
-	
+
 </EventClick>
 </Button>
 
@@ -525,7 +530,7 @@
 <Width> 200 </Width>
 <Height> 50 </Height>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var countClick = countClick + 1
 	If countClick = 3 Then
 
@@ -569,12 +574,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <Interval> 400</Interval>
-<EventClick> 
+<EventClick>
+
 
-		
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-		
+
-	
+
 </EventClick>
 </Button>
 
@@ -586,7 +591,7 @@
 
 			Var web_readyOK = web_ready
 			Var web_telnumOK = web_telnum
-			
+
 			Var web_app_prepar = "true"
 
 			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
@@ -594,7 +599,7 @@
 		EndIf
 	Else
 	EndIf
- 
+
 </EventWebApp>
 
 

xml/page_catalog_group_coffee.xml

@@ -39,7 +39,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 66
+; menu_new_list 67
 	; ==================> Len = 17
 	; 12-01-01-0001 - - 
 <Block>
@@ -2090,7 +2090,7 @@ ESPRESSO" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -2163,7 +2163,7 @@ ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2343,7 +2343,7 @@ ESPRESSO" </Value>
 	<OverlayImage> xmlpro( 12-21-01-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -2416,7 +2416,7 @@ ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2578,6 +2578,513 @@ ESPRESSO" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 12
+	; 12-01-01-0081 12-01-02-0081 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0081.Button,12-01-02-0081.Button,$Sum12010100811201020081) </State> 
+	<Button>
+	<State> $Sum12010100811201020081 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "STRONG COFFEE"
+		Var NameDrinkTH = "กาแฟดำ"
+		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
+		Var DrinkDescription = "Dark shot Espresso, Water"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0081.Price
+		Var PriceD2 = $12-01-02-0081.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0081"
+		Var PD_CODE2 = "12-01-02-0081"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0081.Button
+		Var PD_STAGE_2 = $12-01-02-0081.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-01-02-0081"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0081"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0081.NameE
+		Var menu_desc_eng_hot = $12-01-01-0081.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0081.Name
+		Var menu_desc_thai_hot = $12-01-01-0081.description
+		
+		Var menu_name_eng_cold = $12-01-02-0081.NameE
+		Var menu_desc_eng_cold = $12-01-02-0081.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0081.Name
+		Var menu_desc_thai_cold = $12-01-02-0081.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟดำ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟ และน้ำ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "STRONG COFFEE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Dark shot Espresso, Water" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0081.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-01-0081.Button </State>
+	<Value> StringFmt(  $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-02-0081.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-02-0081.Button </State>
+	<Value> StringFmt( $12-01-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum12010100811201020081 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum12010100811201020081 = "Disable" Then
+				STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-02-0081.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum12010100811201020081 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; 12-21-01-0081 12-21-02-0081 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-21-01-0081.Button,12-21-02-0081.Button,$Sum12210100811221020081) </State> 
+	<Button>
+	<State> $Sum12210100811221020081 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_blackcoffee.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_blackcoffee.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_blackcoffee.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<OverlayImage> xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png") </OverlayImage>
+	<EventOnClick> 
+		Var NameDrink = "STRONG COFFEE"
+		Var NameDrinkTH = "กาแฟดำ"
+		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
+		Var DrinkDescription = "Dark shot Espresso, Water"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_blackcoffee.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-21-01-0081.Price
+		Var PriceD2 = $12-21-02-0081.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-21-01-0081"
+		Var PD_CODE2 = "12-21-02-0081"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-21-01-0081.Button
+		Var PD_STAGE_2 = $12-21-02-0081.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "12-21-02-0081"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0081"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-21-01-0081.NameE
+		Var menu_desc_eng_hot = $12-21-01-0081.descriptionE
+		Var menu_name_thai_hot = $12-21-01-0081.Name
+		Var menu_desc_thai_hot = $12-21-01-0081.description
+		
+		Var menu_name_eng_cold = $12-21-02-0081.NameE
+		Var menu_desc_eng_cold = $12-21-02-0081.descriptionE
+		Var menu_name_thai_cold = $12-21-02-0081.Name
+		Var menu_desc_thai_cold = $12-21-02-0081.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟดำ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟ และน้ำ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "STRONG COFFEE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Dark shot Espresso, Water" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-21-01-0081.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-21-01-0081.Button </State>
+	<Value> StringFmt(  $12-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-21-02-0081.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-21-02-0081.Button </State>
+	<Value> StringFmt(  $12-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum12210100811221020081 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum12210100811221020081 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-02-0081.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum12210100811221020081 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 17
 	; 12-01-01-0013 - - 

xml/page_catalog_group_health.xml

@@ -55,7 +55,7 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ (อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน (อเมริกาโน)"
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png"
@@ -128,8 +128,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ
+	<Value> "อเมริกาโน" </Value>
-(อเมริกาโน)" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -310,7 +309,7 @@
 	<OverlayImage> xmlpro( 12-21-01-1003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ (อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน (อเมริกาโน)"
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png"
@@ -383,8 +382,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ
+	<Value> "อเมริกาโน" </Value>
-(อเมริกาโน)" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_recommend.xml

@@ -5936,7 +5936,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -6009,7 +6009,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -6191,7 +6191,7 @@ Sugar, Biscof" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "AMERICANO"
-		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
+		Var NameDrinkTH = "อเมริกาโน"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
@@ -6264,7 +6264,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟดำ(อเมริกาโน)" </Value>
+	<Value> "อเมริกาโน" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_drink_stuck.xml

@@ -11,11 +11,11 @@
 	DEBUGVAR Seeker.PictureDrink
 	DEBUGVAR Seeker.showname
 
-	
+
 	Var buttonRemoveCup = "Invisible"
 	Var TextBottomShow = "Enable"
-			
+
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
 	Else
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
@@ -33,7 +33,7 @@
 		Var bg_strawProblem_ST = "Enable"
 
 
-		If  Seeker.lidAction = 0 Then 
+		If  Seeker.lidAction = 0 Then
 		Else
 			;Var bg_strawProblem_Y = 1680
 			Var bg_strawlid_ST = "Invisible"
@@ -44,7 +44,7 @@
 
 	If Seeker.lidAction = 1 Then
 		Machine Lid
-		
+
 	EndIf
 
 	Var ExtendData = Seeker.ExtendData
@@ -54,7 +54,7 @@
 	Var StarwState = "Enable"
 	Var videoEnd = 0
 
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/complete_en/"
 
 	Else
@@ -70,7 +70,7 @@
 
 	StopLongPlay
 
-	;Var show_eng = "false"	
+	;Var show_eng = "false"
 
 
 	Var sendPayMultiFlag = 0
@@ -86,12 +86,12 @@
 
 
 
-	Var MultiGo = 1 
+	Var MultiGo = 1
 
 
 	Var sendPayMultiFlag = 1
 
-	
+
 	Var bg_strawlid_ST = "Invisible"
 	Var bg_strawProblem_ST = "Invisible"
 	Var StrawStateX = "Invisible"
@@ -114,7 +114,7 @@
 
 </EventOpen>
 <Timeout> 500 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	DEBUGVAR LastMakeDrinkResult
 
@@ -144,12 +144,12 @@
 		SAVELOG "Longer Time out"
 
 		If  NextOrder = "true" Then
-						
+
 			Var NextOrder = "false"
 			TransferVar "next" "curr"
 			Var Seeker = "curr"
 			SAVELOG "Make next order by take-cup with close-maintenance"
-							
+
 			Var error_code_stop_now = 1221
 
 			If DoorCupPosition = "bottom" Then
@@ -159,15 +159,15 @@
 				__CMD "error-code-1296" 0 "-" "-"
 			EndIf
 
-			Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
+			Open "ROOT/taobin_project/xml/page_cannotConti.xml"
-					
+
 		Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf 
+		EndIf
 	EndIf
 
 	If Timeout > 30 Then
-		Var MultiGo = 1 
+		Var MultiGo = 1
 	EndIf
 
 	If BlinkImg = 1 Then
@@ -181,17 +181,17 @@
 
 	EndIf
 
-	
 
-	
+
-	; Do not change 
+
+	; Do not change
 	;
 	If MachineStage = "show-menu" Then
 
 	EndIf
 
 
-	
+
 	; away
 	If  NextOrder = "true" Then
 
@@ -202,7 +202,7 @@
 
 			TransferVar "next" "curr"
 			Var Seeker = "curr"
-			
+
 			SAVELOG "Make next order by RejectOrder"
 			Open "ROOT/taobin_project/xml/page_cannotConti.xml"
 			; END
@@ -213,17 +213,17 @@
 		If PaySuccessWithDaemonTask = 1 Then
 				Var NextOrder = "false"
 				SAVELOG "Make next order by pass"
-				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
 		Else
-			If HaveCup = "false" Then 
+			If HaveCup = "false" Then
 				If MaybeHaveCup = "true" Then
 
 				Else
 					If CupChecking = "true" Then
-						
+
 					Else
-						If CupOnArm = "false" Then 
+						If CupOnArm = "false" Then
-							
+
 							If DoorCupPosition = "bottom" Then
 								; BEGIN
 								Var NextOrder = "false"
@@ -231,23 +231,23 @@
 								TransferVar "next" "curr"
 								Var Seeker = "curr"
 								SAVELOG "Make next order by take-cup pagedrinkstuct"
-								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+								Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
 								; END
 
-							Else 
+							Else
 								Machine DoorClose
-							EndIf 
+							EndIf
 						EndIf
 					EndIf
 				EndIf
 			EndIf
 		EndIf
 	EndIf
-	
+
 	;
-	
+
 	If MachineStage = "remove-cup" Then
-		
+
 		If  NextOrder = "false" Then
 			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 		Else
@@ -256,19 +256,19 @@
 			Var Timeout2 = Timeout2 + 1
 
 			If Timeout2 > 15 Then
-				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
 				Var Timeout2 = 0
 			EndIf
 
 		EndIf
 
 	EndIf
-	
+
 
 	If Timeout = 5 Then
-		If show_eng = "true" Then 
+		If show_eng = "true" Then
 			Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
-			
+
 			If CountryName = "Australia" Then
 				Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
 			EndIf
@@ -276,25 +276,29 @@
 			Play PlaySoundStraw
 		Else
 			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
-			
+
+			If FromJemilaPro = 1 Then
+			     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
+			EndIf
+
 			Play PlaySoundLag
 		EndIf
 	EndIf
 
-	
+
 	If MachineStage = "close-maintenance" Then
 		If stop_now = "true" Then
 			If  NextOrder = "true" Then
-						
+
 				Var NextOrder = "false"
 				TransferVar "next" "curr"
 				Var Seeker = "curr"
 				SAVELOG "Make next order by take-cup with close-maintenance"
-								
+
-				Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
+				Open "ROOT/taobin_project/xml/page_cannotConti.xml"
-						
+
 			Else
-				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 			EndIf
 		EndIf
 	EndIf
@@ -331,11 +335,11 @@
 	TimerReset
 	Refresh
 
-</EventTimeout> 
+</EventTimeout>
 
 <EventChangeStatus>
-	If ChangeStatus = "payout-end" Then 
+	If ChangeStatus = "payout-end" Then
-		Var MultiGo = 1 
+		Var MultiGo = 1
 	EndIf
 </EventChangeStatus>
 
@@ -376,7 +380,7 @@
 <Align> Center </Align>
 <Size> 48 </Size>
 <Color> 0x513C2F </Color>
-<Value> 
+<Value>
 	eval(
 		STRCONTAIN "size" Seeker.showname SizeFromSheet
 		If SizeFromSheet = "true" Then
@@ -385,7 +389,7 @@
 		Else
 			Var return = Seeker.showname
 		EndIf
-	) 
+	)
 </Value>
 </Text>
 
@@ -444,7 +448,7 @@
 <Interval> 500 </Interval>
 <Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
-<EventClick> 
+<EventClick>
 	;include=ROOT/taobin_project/inc/remove_cup_button.inc
 	Refresh
 </EventClick>

xml/page_drinkok.xml

@@ -12,11 +12,11 @@
 	DEBUGVAR Seeker.showname
 
 	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
-	
+
 	Var buttonRemoveCup = "Invisible"
 	Var TextBottomShow = "Enable"
-			
+
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
 	Else
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
@@ -34,7 +34,7 @@
 		Var bg_strawProblem_ST = "Enable"
 
 
-		If  Seeker.lidAction = 0 Then 
+		If  Seeker.lidAction = 0 Then
 		Else
 			;Var bg_strawProblem_Y = 1680
 			Var bg_strawlid_ST = "Invisible"
@@ -45,7 +45,7 @@
 
 	If Seeker.lidAction = 1 Then
 		Machine Lid
-		
+
 	EndIf
 
 	Var ExtendData = Seeker.ExtendData
@@ -55,7 +55,7 @@
 	Var StarwState = "Enable"
 	Var videoEnd = 0
 
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/complete_en/"
 
 	Else
@@ -63,7 +63,7 @@
 	EndIf
 
 	If LanguageShow = "UAE_DUBAI" Then
-	
+
 		Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
 
 	Else
@@ -89,7 +89,7 @@
 
 	StopLongPlay
 
-	;Var show_eng = "false"	
+	;Var show_eng = "false"
 
 
 	Var sendPayMultiFlag = 0
@@ -103,17 +103,17 @@
 	Var txtDrinkOKState = "Invisible"
 
 
-	If show_eng = "true" Then 
+	If show_eng = "true" Then
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
 		If CART_COUNT > 0 Then
-			If 	CART_INDEX < CART_COUNT  Then   
+			If 	CART_INDEX < CART_COUNT  Then
 
 				Var next_pic_bg = DirImage + "/Preparing.png"
 				Var BlinkImg = 1
 				Var txtDrinkOKState = "Enable"
 
-				Var cart_next = CART_INDEX + 1 
+				Var cart_next = CART_INDEX + 1
 				Var nextCount = "" + cart_next
 				Var nextCount = nextCount + "/"
 				Var nextCount = nextCount + CART_COUNT
@@ -121,13 +121,13 @@
 				If cart_next = 2 Then
 					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
 					Var next_name = CART2_NAME_ENG
-					
+
 				EndIf
 
 				If cart_next = 3 Then
 					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
 					Var next_name = CART3_NAME_ENG
-				
+
 				EndIf
 			EndIf
 
@@ -139,13 +139,13 @@
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png"
 		If CART_COUNT > 0 Then
-			If 	CART_INDEX < CART_COUNT  Then   
+			If 	CART_INDEX < CART_COUNT  Then
 
 				Var next_pic_bg = DirImage + "/Preparing.png"
 				Var BlinkImg = 1
 				Var txtDrinkOKState = "Enable"
 
-				Var cart_next = CART_INDEX + 1 
+				Var cart_next = CART_INDEX + 1
 				Var nextCount = "" + cart_next
 				Var nextCount = nextCount + "/"
 				Var nextCount = nextCount + CART_COUNT
@@ -153,13 +153,13 @@
 				If cart_next = 2 Then
 					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART2_PICTURE
 					Var next_name = CART2_NAME_THAI
-					
+
 				EndIf
 
 				If cart_next = 3 Then
 					Var next_pic = "ROOT/taobin_project/image/page_drink/" + CART3_PICTURE
 					Var next_name = CART3_NAME_THAI
-				
+
 				EndIf
 			EndIf
 
@@ -168,22 +168,22 @@
 	EndIf
 
 
-	Var MultiGo = 1 
+	Var MultiGo = 1
 
 
 		If CART_COUNT = 0 Then
 			Var sendPayMultiFlag = 1
 		Else
 
-			If 	CART_INDEX = CART_COUNT  Then  
+			If 	CART_INDEX = CART_COUNT  Then
 				If ChangeAmountSum > 0 Then
 					Change ChangeAmountSum
-					Var MultiGo = 0 
+					Var MultiGo = 0
 				EndIf
 			EndIf
-			
+
-		EndIf 
+		EndIf
-	
+
 	Var bg_strawlid_ST = "Invisible"
 	Var bg_strawProblem_ST = "Invisible"
 	Var StrawStateX = "Invisible"
@@ -217,7 +217,7 @@
 
 </EventOpen>
 <Timeout> 500 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	DEBUGVAR LastMakeDrinkResult
 
@@ -238,7 +238,7 @@
 	Var Timeout = Timeout + 1
 
 	If BrewTimeoutExtend = 1 Then
-		
+
 		DEBUGVAR BrewTimeoutExtend
 
 	EndIf
@@ -246,7 +246,7 @@
 	; 420 sec
 	If Timeout > 840 Then
 		Var CountForRetryStuck = 1
-		Open "ROOT/taobin_project/xml/page_drink_stuck.xml" 
+		Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
 	EndIf
 
 	; obsolete
@@ -255,12 +255,12 @@
 		DEBUGVAR TimeDelayDefault
 
 		If  NextOrder = "true" Then
-						
+
 			Var NextOrder = "false"
 			TransferVar "next" "curr"
 			Var Seeker = "curr"
 			SAVELOG "Make next order by take-cup with close-maintenance"
-							
+
 			Var error_code_stop_now = 1221
 
 			If DoorCupPosition = "bottom" Then
@@ -270,15 +270,15 @@
 				__CMD "error-code-1296" 0 "-" "-"
 			EndIf
 
-			Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
+			Open "ROOT/taobin_project/xml/page_cannotConti.xml"
-					
+
 		Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf 
+		EndIf
 	EndIf
 
 	If Timeout > 30 Then
-		Var MultiGo = 1 
+		Var MultiGo = 1
 	EndIf
 
 	If BlinkImg = 1 Then
@@ -292,22 +292,22 @@
 
 	EndIf
 
-	
 
 
-	; Do not change 
+
+	; Do not change
 	;
 	If MachineStage = "show-menu" Then
 
-		If 	CART_INDEX < CART_COUNT  Then   	
+		If 	CART_INDEX < CART_COUNT  Then
-			
+
 			If HaveCup = "false" Then
 				If CupChecking = "false" Then
 
 					Var CART_INDEX = CART_INDEX + 1
 					Cart "PreparID" CART_INDEX
 					Cart "MakeID" CART_INDEX
-					Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
+					Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
 
 				EndIf
 			Else
@@ -315,24 +315,24 @@
 				If DoorCupPosition = "bottom" Then
 					If HaveCup = "true" Then
 						If MaybeHaveCup = "true" Then
-							
+
-						Else 
+						Else
 							If CupChecking = "true" Then
-							
+
-							Else 
+							Else
 								Var buttonRemoveCup = "Enable"
 								Var txtDrinkOKState = "Enable"
 							EndIf
 						EndIf
 					EndIf
-					
+
 					If CupOnArm = "true" Then
 						If MaybeHaveCup = "true" Then
-							
+
-						Else 
+						Else
 							If CupChecking = "true" Then
-							
+
-							Else 
+							Else
 								Var buttonRemoveCup = "Enable"
 								Var txtDrinkOKState = "Enable"
 							EndIf
@@ -347,28 +347,28 @@
 		Else
 			If sendPayMultiFlag = 1 Then
 
-				
+
 				If DoorCupPosition = "bottom" Then
 					If HaveCup = "true" Then
 						If MaybeHaveCup = "true" Then
-							
+
-						Else 
+						Else
 							If CupChecking = "true" Then
-							
+
-							Else 
+							Else
 								Var buttonRemoveCup = "Enable"
 								Var txtDrinkOKState = "Enable"
 							EndIf
 						EndIf
 					EndIf
-					
+
 					If CupOnArm = "true" Then
 						If MaybeHaveCup = "true" Then
-							
+
-						Else 
+						Else
 							If CupChecking = "true" Then
-							
+
-							Else 
+							Else
 								Var buttonRemoveCup = "Enable"
 								Var txtDrinkOKState = "Enable"
 							EndIf
@@ -379,9 +379,9 @@
 				EndIf
 
 				Var Seeker.TNumberTaobinMember = ""
-				
+
 				If FailedCount > 0 Then
-					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
+					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
 				Else
 					If  NextOrder = "true" Then
 
@@ -392,7 +392,7 @@
 
 							TransferVar "next" "curr"
 							Var Seeker = "curr"
-							
+
 							SAVELOG "Make next order by RejectOrder"
 							Open "ROOT/taobin_project/xml/page_cannotConti.xml"
 							; END
@@ -403,17 +403,17 @@
 						If PaySuccessWithDaemonTask = 1 Then
 								Var NextOrder = "false"
 								SAVELOG "Make next order by pass"
-								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+								Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
 						Else
-							If HaveCup = "false" Then 
+							If HaveCup = "false" Then
 								If MaybeHaveCup = "true" Then
 
 								Else
 									If CupChecking = "true" Then
-										
+
 									Else
-										If CupOnArm = "false" Then 
+										If CupOnArm = "false" Then
-											
+
 											If DoorCupPosition = "bottom" Then
 												; BEGIN
 												Var NextOrder = "false"
@@ -421,19 +421,19 @@
 												TransferVar "next" "curr"
 												Var Seeker = "curr"
 												SAVELOG "Make next order by take-cup"
-												Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+												Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
 												; END
 
-											Else 
+											Else
 												Machine DoorClose
-											EndIf 
+											EndIf
 										EndIf
 									EndIf
 								EndIf
 							EndIf
 						EndIf
 					Else
-						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+						Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 					EndIf
 				EndIf
 			EndIf
@@ -441,9 +441,9 @@
 
 	EndIf
 
-	
+
 	;
-	
+
 	If MachineStage = "remove-cup" Then
 		If CART_COUNT = 0 Then
 			If  NextOrder = "false" Then
@@ -455,21 +455,21 @@
 				Var Timeout2 = Timeout2 + 1
 
 				If Timeout2 > 15 Then
-					Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+					Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
 					Var Timeout2 = 0
 				EndIf
 
 			EndIf
 		Else
-	
+
 			Var buttonRemoveCup = "Enable"
 			Var txtDrinkOKState = "Enable"
-		
+
 
 			Var Timeout2 = Timeout2 + 1
 
 			If Timeout2 > 15 Then
-				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
 				Var Timeout2 = 0
 			EndIf
 
@@ -478,9 +478,9 @@
 	EndIf
 
 	If Timeout = 5 Then
-		If show_eng = "true" Then 
+		If show_eng = "true" Then
 			Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
-			
+
 			If CountryName = "Malaysia" Then
 				Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
 			EndIf
@@ -504,25 +504,29 @@
 			Play PlaySoundStraw
 		Else
 			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
-			
+
+			If FromJemilaPro = 1 Then
+			     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
+			EndIf
+
 			Play PlaySoundLag
 		EndIf
 	EndIf
 
-	
+
 	If MachineStage = "close-maintenance" Then
 		If stop_now = "true" Then
 			If  NextOrder = "true" Then
-						
+
 				Var NextOrder = "false"
 				TransferVar "next" "curr"
 				Var Seeker = "curr"
 				SAVELOG "Make next order by take-cup with close-maintenance"
-								
+
-				Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
+				Open "ROOT/taobin_project/xml/page_cannotConti.xml"
-						
+
 			Else
-				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 			EndIf
 		EndIf
 	EndIf
@@ -539,11 +543,11 @@
 	TimerReset
 	Refresh
 
-</EventTimeout> 
+</EventTimeout>
 
 <EventChangeStatus>
-	If ChangeStatus = "payout-end" Then 
+	If ChangeStatus = "payout-end" Then
-		Var MultiGo = 1 
+		Var MultiGo = 1
 	EndIf
 </EventChangeStatus>
 
@@ -589,7 +593,7 @@
 <Font> KanitLightTTF </Font>
 <Size> 48 </Size>
 <Color> HeadlineColor </Color>
-<Value> 
+<Value>
 	eval(
 		STRCONTAIN "size" Seeker.showname SizeFromSheet
 		If SizeFromSheet = "true" Then
@@ -598,7 +602,7 @@
 		Else
 			Var return = Seeker.showname
 		EndIf
-	) 
+	)
 </Value>
 </Text>
 
@@ -657,7 +661,7 @@
 <Interval> 500 </Interval>
 <Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
-<EventClick> 
+<EventClick>
 	;Var buttonRemoveCup = "Invisible"
 	Machine RemoveCup
 	Machine DoorLidOpen
@@ -672,11 +676,11 @@
 <Y> 1680 </Y>
 <State>bg_strawlid_ST</State>
 <Filename> bg_strawlid </Filename>
-<EventClick> 
+<EventClick>
 
- 
 
-</EventClick> 
+
+</EventClick>
 </Button>
 
 <Button>
@@ -685,16 +689,16 @@
 <State>bg_strawProblem_ST</State>
 <Filename>  bnStrawProblemReport </Filename>
 <FilenamePress> bpStrawProblemReport </FilenamePress>
-<EventClick> 
+<EventClick>
 
 	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
-	
+
 	__CMD "straw-alert-disable" 0 strawStr "-"
  	__CMD "send-error-code" 1231 "-" "-"
 	Var bg_strawProblem_ST = "Invisible"
 
 	Refresh
-</EventClick> 
+</EventClick>
 </Button>
 
 ; straw left
@@ -706,23 +710,23 @@
 <Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
 <FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
-<EventClick> 
+<EventClick>
 	SAVELOG "Click straw cb"
 	If StrawStateX = "Press" Then
-		;Var StrawStateX = "Enable"	
+		;Var StrawStateX = "Enable"
 	Else
 		Var StrawStateX = "Press"
-		
+
 		If Seeker.strawAction = 0 Then
 			Var Seeker.strawAction = 1
 			Machine Straw
-			
+
 			Var bg_strawProblem_ST = "Enable"
 			;Var bg_strawlid_ST = "Invisible"
 			;Var LidStateX = "Invisible"
 			;Var StrawStateX = "Invisible"
 		EndIf
-		
+
 	EndIf
 	Refresh
 </EventClick>
@@ -736,19 +740,19 @@
 <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> 
+<EventClick>
+
 
-	
 	SAVELOG "Click straw cb"
 	If StrawStateX = "Press" Then
-		;Var StrawStateX = "Enable"	
+		;Var StrawStateX = "Enable"
 	Else
 		Var StrawStateX = "Press"
 
 		If Seeker.strawAction = 0 Then
 			Var Seeker.strawAction = 1
 			Machine Straw
-			
+
 			Var bg_strawProblem_ST = "Enable"
 			;Var bg_strawlid_ST = "Invisible"
 			;Var LidStateX = "Invisible"
@@ -758,7 +762,7 @@
 	EndIf
 
 	DEBUGVAR "PICHET"
-	
+
 	Refresh
 </EventClick>
 </Button>
@@ -774,13 +778,13 @@
 <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> 
+<EventClick>
 
 	If Seeker.thankLidFlag = 0 Then
-		
+
 		SAVELOG "Click LID pic"
 		If LidStateX = "Press" Then
-			;Var LidStateX = "Enable"	
+			;Var LidStateX = "Enable"
 		Else
 			Var LidStateX = "Press"
 			If Seeker.lidAction = 0 Then
@@ -789,7 +793,7 @@
 				Var straw_problem_ST = "Enable"
 			EndIf
 		EndIf
-		
+
 
 		DEBUGVAR SugarState1
 		Refresh
@@ -807,23 +811,23 @@
 <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> 
+<EventClick>
 
 	If Seeker.thankLidFlag = 0 Then
 
 		SAVELOG "Click LID cb"
 		If LidStateX = "Press" Then
-			;Var LidStateX = "Enable"	
+			;Var LidStateX = "Enable"
 		Else
 			Var LidStateX = "Press"
 			If Seeker.lidAction = 0 Then
 				Var Seeker.lidAction = 1
 				Machine Lid
-				
+
 			EndIf
 		EndIf
 		Refresh
-	
+
 	EndIf
 
 </EventClick>

xml/page_payment.xml

@@ -179,6 +179,10 @@
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
 		
+		If FromJemilaPro = 1 Then
+		     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/payment.m4a"
+		EndIf
+		
 		; Play Sound #zone
 		If SoundBackToSchoolEnable = 1 Then