DO

image/event/image_template1

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/welcomedrink.png
+normal_eng=ROOT/taobin_project/image/event/welcomedrink_en.png
 normal_thai=ROOT/taobin_project/image/event/welcomedrink.png
-press_eng=ROOT/taobin_project/image/event/welcomedrink.png
+press_eng=ROOT/taobin_project/image/event/welcomedrink_en.png
 press_thai=ROOT/taobin_project/image/event/welcomedrink.png
-disable_eng=ROOT/taobin_project/image/event/welcomedrink.png
+disable_eng=ROOT/taobin_project/image/event/welcomedrink_en.png
 disable_thai=ROOT/taobin_project/image/event/welcomedrink.png

xml/event/promotion_oreo_welcome_drink.xml

@@ -8940,7 +8940,7 @@ LIMENADE SODA" </Value>
     <Filename> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
+            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"
         Else
             Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
         EndIf
@@ -8949,7 +8949,7 @@ LIMENADE SODA" </Value>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"    
+            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"    
         Else
             Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
         EndIf
@@ -8958,7 +8958,7 @@ LIMENADE SODA" </Value>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
+            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"
         Else
             Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
         EndIf

xml/page_board.xml

@@ -123,6 +123,10 @@
 		Var NoWaitMachineEnable = 1
 	EndIf
 
+	If BoxID > 200000 Then
+		Var NoWaitMachineEnable = 1
+	EndIf
+
 
 	If NoWaitMachineEnable = 1 Then
 		If stop_now = "true" Then
@@ -207,8 +211,6 @@
 	STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable
 	STRCONTAIN "1058" MaterialAvailable OreoEnable
 	
-	DEBUGVAR PromoteYuzuEnable
-
 	Var MenuKidEnable = "false"
 
 	;Var AppFastEnable = "false"
@@ -1039,7 +1041,8 @@
 
 		DEBUGVAR CountUpReloadAll
 		
-		If CountUpReloadAll > 40 Then
+		; Original value is 40
+		If CountUpReloadAll > 80 Then
 			Var NeedReboot = "false"
 
 			Var StartUpExt = "-"
@@ -1085,22 +1088,22 @@
 
 	;DEBUGVAR CountDownCheckCamera
 	DEBUGVAR Not#CameraSettingStatus
-	;If CountDownCheckCamera = 0 Then
+	If CountDownCheckCamera = 0 Then
-	;	
+		
-	;	If Not#CameraSettingStatus = "" Then
+		If Not#CameraSettingStatus = "" Then
-	;		If CameraCount = 1 Then
+			If CameraCount = 1 Then
-	;	
+		
-	;			Var CountDownCheckCamera = 2
+				Var CountDownCheckCamera = 2
-	;			CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
+				CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
-	;		Else
+			Else
-	;			Var CountDownCheckCamera = 5	
+				Var CountDownCheckCamera = 5	
-	;		EndIf
+			EndIf
-	;	Else
+		Else
-	;		Var CountDownCheckCamera = 20
+			Var CountDownCheckCamera = 30
-	;	EndIf
+		EndIf
-	;Else 
+	Else 
-	;	Var CountDownCheckCamera = CountDownCheckCamera - 1
+		Var CountDownCheckCamera = CountDownCheckCamera - 1
-	;EndIf
+	EndIf
 
 
 

xml/page_catalog2.xml

@@ -12,6 +12,8 @@
 	TopView "show"
 	; On open
 
+	Var IgnoreCollectPointByMe = 0
+
 
 	DEBUGVAR ToppingNewShow
 

xml/page_collect_point_1.xml

@@ -8,7 +8,11 @@
 <EventOpen>
 	; On open
 
-	
+	; jump
+	If IgnoreCollectPointByMe = 1 Then
+		Var IgnoreCollectPointByMe = 0
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"	
+	EndIf 
 
 	Var ShowErrorText = "Invisible"
 

xml/page_payment.xml

@@ -227,43 +227,7 @@
 	EndIf
 
 
-	If PepsiProEnable = 1 Then
+	; 
-		If UserSelectProductCode = "12-99-02-0009" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0002" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0006" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0007" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0008" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0001" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0003" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0005" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-		If UserSelectProductCode = "12-99-02-0004" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-
-		If UserSelectProductCode = "12-99-02-0019" Then
-			Var PromotionIDCurrentOrder = 5
-		EndIf
-
-		If SystemDateMonthInt = 7 Then
-			Var PromotionIDCurrentOrder = 0
-		EndIf
-	EndIf
 
 
 	DEBUGVAR PromotionIDCurrentOrder

xml/page_payment_cash.xml

@@ -910,6 +910,12 @@
 
 	DEBUGVAR MenuCautionImageStage0
 
+
+	If IgnoreCollectPointByMe = 1 Then
+		SAVELOG "Diable code because IgnoreCollectPointByMe = 1."
+		Var PayState2 = "Disable"
+	EndIf
+
 </EventOpen>
 
 <EventActionOk>

xml/page_topping_select_35.xml

@@ -354,33 +354,8 @@
 
 
 	Var DiscountWithIdentifyState = "Invisible"
-	Var BackToSchoolForFreeButtonState = "Invisible"
 
 
-	DEBUGVAR Price5Active 
-	DEBUGVAR EnableLiveness 
-	DEBUGVAR DiscountWithIdentifyState
-	DEBUGVAR BackToSchoolForFreeEnable
-
-	If BackToSchoolForFreeEnable = 1 Then
-		Var BackToSchoolForFreeEnable = 0
-		Var BackToSchoolForFreeButtonState = "Enable"
-	EndIf
-
-	DEBUGVAR BackToSchoolForFreeButtonState
-
-	If EnableLiveness = "true" Then
-		If CameraCount = 1 Then
-			; echo -n true  > /mnt/sdcard/enable_discount_price5
-			READ_FILE "/mnt/sdcard/enable_discount_price5" EnableDiscountPrice5
-			DEBUGVAR EnableDiscountPrice5
-			If EnableDiscountPrice5 = "true" Then
-				Var EnableDiscountWithIdentify = 1
-				Var DiscountWithIdentifyState = "Enable"
-			EndIf
-		EndIf
-	EndIf
-
 	If show_eng = "true" Then
 		Var CerealMilkX = 400
 	Else
@@ -3704,7 +3679,8 @@
 
 	;Var Seeker = "curr"
 
-	
+	Var IgnoreCollectPointByMe = 1
+
 	DEBUGVAR PriceDrinkTmp
 	
 	;Var Seeker.PriceDrink = PriceDrinkTmp

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.36"
+	Var XMLPageVersion = "7.37"
-	Var XMLPageVersionInt = 736
+	Var XMLPageVersionInt = 737
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>