diff --git a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png
index 5c7af2ed..33753e32 100644
Binary files a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png and b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png differ
diff --git a/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png b/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png
index b8d955a4..b424704b 100644
Binary files a/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png and b/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png differ
diff --git a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
index 4b9472f2..a33c56f8 100644
--- a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
@@ -532,7 +532,7 @@
 	<Height> 602 </Height>
 
 <Button>
-	<OverlayImage> xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeC/button_overlay_catalog_3_posi2.png") </OverlayImage>
+	<OverlayImage> xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_catalog_2_posi2.png") </OverlayImage>
 
 <State> $Sum5204020002 </State>
     <Filename>
@@ -660,13 +660,13 @@
 
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-04-02-0002"
-			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi2.png")
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")
 			DEBUGVAR OverlayMenuFilter2
 			DEBUGVAR OverlayMenuFilter2_Value
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-		Var OverlayMenuFilter = "xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi2.png")"
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")"
 
        Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
         
diff --git a/inter/sgp/xml/page_catalog_group_whey.lxml b/inter/sgp/xml/page_catalog_group_whey.lxml
index 23a939f6..e37d39fa 100644
--- a/inter/sgp/xml/page_catalog_group_whey.lxml
+++ b/inter/sgp/xml/page_catalog_group_whey.lxml
@@ -930,6 +930,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_Matcha.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_Matcha.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_Matcha.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0016, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1026,7 +1027,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0016"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0016, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0016, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -1205,7 +1215,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_Chocolate.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_Chocolate.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_Chocolate.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_3_posi2.png") </OverlayImage>
+	<OverlayImage> xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1305,13 +1315,13 @@
 
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-04-02-0002"
-			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi2.png")
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")
 			DEBUGVAR OverlayMenuFilter2
 			DEBUGVAR OverlayMenuFilter2_Value
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-		Var OverlayMenuFilter = "xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi2.png")"
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -1765,6 +1775,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_Strawberry.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_Strawberry.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_Strawberry.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0013, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_9_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1861,7 +1872,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0013"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0013, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0013, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -2590,6 +2610,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_Thaitea.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_Thaitea.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_Thaitea.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0055, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2686,7 +2707,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0055"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0055, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0055, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -4240,6 +4270,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_caramel.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_caramel.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_caramel.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_4_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4336,7 +4367,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0009"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -4515,6 +4555,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_milk.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_milk.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_milk.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4611,7 +4652,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0010"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -4790,6 +4840,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_protein_isolated.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_protein_isolated.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_protein_isolated.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4886,7 +4937,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0011"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
@@ -5065,6 +5125,7 @@
 	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Vanilla_shake.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Vanilla_shake.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Vanilla_shake.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 52-04-02-0056, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_6_posi2.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -5161,7 +5222,16 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-		Var OverlayMenuFilter = ""
+
+		If PD_STAGE_2 = "Enable" Then
+			Var OverlayMenuFilter2 = "52-04-02-0056"
+			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-04-02-0056, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi2.png")
+			DEBUGVAR OverlayMenuFilter2
+			DEBUGVAR OverlayMenuFilter2_Value
+		Else
+			Var OverlayMenuFilter = ""
+		EndIf
+		Var OverlayMenuFilter = "xmlpro( 52-04-02-0056, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi2.png")"
 		
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml
index b4c2fc28..82e3a4ac 100644
--- a/inter/sgp/xml/page_collect_point_3.lxml
+++ b/inter/sgp/xml/page_collect_point_3.lxml
@@ -248,7 +248,7 @@
         ;    Var TaobinLeveImg = "/taoLevel1.png"
         ;EndIf
 
-        If TaobinLevel = "1" Then
+        If TaobinLevel = "2" Then
             Var TaobinLevelDesc1 = "Walking turtle level"
 			Var PointDiff = 150 - CoffeePointRank
             Var TaobinLevelDesc2 = "Earn " + PointDiff
@@ -268,7 +268,7 @@
 
         EndIf
 
-        If TaobinLevel = "2" Then
+        If TaobinLevel = "3" Then
             Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
         
             Var PointDiff = 350 - CoffeePointRank
@@ -289,7 +289,7 @@
 
         EndIf
 
-		If TaobinLevel = "3" Then
+		If TaobinLevel = "4" Then
             Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
         
             Var TaobinLevelDesc2 = ""
@@ -312,7 +312,7 @@
         ;    Var TaobinLeveImg = "/taoLevel1.png"
         ;EndIf
 
-        If TaobinLevel = "1" Then
+        If TaobinLevel = "2" Then
             Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ"
 			Var PointDiff = 150 - CoffeePointRank
             Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff
@@ -332,7 +332,7 @@
 
         EndIf
 
-        If TaobinLevel = "2" Then
+        If TaobinLevel = "3" Then
             Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp
 
 			Var PointDiff = 350 - CoffeePointRank
@@ -353,7 +353,7 @@
 
         EndIf
 
-		If TaobinLevel = "3" Then
+		If TaobinLevel = "4" Then
             Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp
         
             Var TaobinLevelDesc2 = ""
@@ -1556,16 +1556,6 @@
 <Filename> Var( DirImage + taobinImgP55 )</Filename>
 </Button>
 
-<Text>
-<X> 250 </X>
-<Y> 745 </Y>
-<Size> 35 </Size>
-<Width> 1000 </Width>
-<Font> KanitRegularTTF </Font>
-<Color> 0x513C2F </Color>
-<Value> TaobinName </Value>
-</Text>
-
 <Text>
 <X> 250 </X>
 <Y> 790 </Y>
diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml
index db33af5d..83a5ae37 100644
--- a/inter/sgp/xml/page_member_prompt.lxml
+++ b/inter/sgp/xml/page_member_prompt.lxml
@@ -77,7 +77,7 @@
     Var DisplayPrompt = "Invisible"
     Var DisplayQR = "Enable"
 
-    Var Timeout = 15
+    Var Timeout = 10
 
 </EventClick>
 </Button>
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 8cd4eddd..ecbed23b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -833,7 +833,7 @@
 		Var TextPriceMenuY = 266
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
-		Var ShowButtonClick2 = "Enable"
+		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
 
 		Var PriceUnitText = "Price in SGD"
@@ -1111,11 +1111,6 @@
 	DEBUGVAR SettingDisableTaobinCredit
 	If SettingDisableTaobinCredit = "true" Then
 		Var ShowButtonClick2 = "Invisible"
-		If CountryName = "Singapore" Then
-			If SELLONLINE = 1 Then
-				Var ShowButtonClick2 = "Enable"
-			EndIf
-		EndIf
 	EndIf
 	DEBUGVAR ShowButtonClick2
 
@@ -1477,13 +1472,6 @@
 	;SAVELOG ShowButtonClickFull
 
 	If TaobinOnlineX = "true" Then
-	
-		If CountDownShowButton < 33 Then
-			If CountryName = "Singapore" Then
-				Var ShowButtonClick2 = "Invisible"
-				Refresh
-			EndIf
-		EndIf
 
 		If CountDownShowButton = 31 Then
 			Var ShowButtonClickFull = "Enable"
@@ -1494,9 +1482,6 @@
 		If CountDownShowButton = 3 Then
 			
 			Var ShowButtonClick = "Enable"
-			If CountryName = "Singapore" Then
-				Var ShowButtonClick2 = "Enable"
-			EndIf
 			Var ShowButtonClickFull = "Invisible"	
 			Refresh
 		EndIf
diff --git a/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml b/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml
index e4c91826..d9480242 100644
--- a/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml
+++ b/xml/page_catalog_group_pro_7up_lucky_draw_x2.xml
@@ -1,24 +1,24 @@
-
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
-    Var Timeout = 0
-
-
-    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
-</EventOpen>
-
-
-;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
-
-
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@@ -30,7 +30,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 43
+; menu_new_list 44
 	; ==================> Len = 12
 	; - 12-05-02-0095 - 
 <Block>
@@ -122,7 +122,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพเงินเดือนเถอะครับ
+	<Value> "อัพเงินเดือนเถอะครับ
 หัวหน้า" </Value>
 	</Text>
 	<Text>
@@ -144,7 +144,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Up my salary,
+	<Value> "Up my salary,
 please, boss!" </Value>
 	</Text>
 	<Text>
@@ -301,7 +301,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Exit Date!"
+		Var NameDrink = "Up Your Exit Date!"
 		Var NameDrinkTH = "อัพเดทด้วยครับ ลาออกเมื่อไหร่"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมชูกำลัง น้ำเชื่อมบ๊วย และโซดา"
 		Var DrinkDescription = "7UP, Energy Syrup, Ume Syrup and Soda"
@@ -375,7 +375,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพเดทด้วยครับ
+	<Value> "อัพเดทด้วยครับ
 ลาออกเมื่อไหร่" </Value>
 	</Text>
 	<Text>
@@ -397,7 +397,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your Exit Date!" </Value>
+	<Value> "Up Your Exit Date!" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -553,7 +553,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Single Status"
+		Var NameDrink = "Up My Single Status"
 		Var NameDrinkTH = "อัพตัสโสด โปรดผมได้บุญ"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Ume Syrup, Lime and Soda"
@@ -627,7 +627,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพตัสโสด
+	<Value> "อัพตัสโสด
 โปรดผมได้บุญ" </Value>
 	</Text>
 	<Text>
@@ -649,7 +649,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Single Status" </Value>
+	<Value> "Up My Single Status" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -805,7 +805,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP single status, how come gal!"
+		Var NameDrink = "Up single status, how come gal!"
 		Var NameDrinkTH = "อัพบอกโสด ไหงมีแฟนเฉย"
 		Var DrinkDescriptionTH = "เซเว่นอัพ กาแฟ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Espresso, Ume Syrup, Lime and Soda"
@@ -879,7 +879,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพบอกโสด
+	<Value> "อัพบอกโสด
 ไหงมีแฟนเฉย" </Value>
 	</Text>
 	<Text>
@@ -901,7 +901,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP single status,
+	<Value> "Up single status,
 how come gal!" </Value>
 	</Text>
 	<Text>
@@ -1058,7 +1058,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Lottery Luck"
+		Var NameDrink = "Up My Lottery Luck"
 		Var NameDrinkTH = "อัพโชคได้ไง ตั้งใจทุกงวด"
 		Var DrinkDescriptionTH = "เซเว่นอัพ กาแฟ น้ำเชื่อมสละ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Espresso, Salak Syrup, Lime and Soda"
@@ -1132,7 +1132,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพโชคได้ไง
+	<Value> "อัพโชคได้ไง
 ตั้งใจทุกงวด" </Value>
 	</Text>
 	<Text>
@@ -1154,7 +1154,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Lottery Luck" </Value>
+	<Value> "Up My Lottery Luck" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1310,7 +1310,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Bad Luck"
+		Var NameDrink = "Up My Bad Luck"
 		Var NameDrinkTH = "อัพโชคเอง โทษธูป โทษฝัน"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมสละ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Salak Syrup, Lime and Soda"
@@ -1384,7 +1384,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพโชคเอง โทษธูป
+	<Value> "อัพโชคเอง โทษธูป
 โทษฝัน" </Value>
 	</Text>
 	<Text>
@@ -1406,7 +1406,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Bad Luck" </Value>
+	<Value> "Up My Bad Luck" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1636,7 +1636,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพสกิลเตรียมปลิว
+	<Value> "อัพสกิลเตรียมปลิว
 แล้วครับ" </Value>
 	</Text>
 	<Text>
@@ -2065,7 +2065,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Answer Man"
+		Var NameDrink = "Up Your Answer Man"
 		Var NameDrinkTH = "อัพดุลเอ้ย ถามไรตอบได้"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมะพร้าว และโซดา"
 		Var DrinkDescription = "7UP, Coconut Syrup and Soda"
@@ -2139,7 +2139,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพดุลเอ้ย
+	<Value> "อัพดุลเอ้ย
 ถามไรตอบได้" </Value>
 	</Text>
 	<Text>
@@ -2161,7 +2161,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your Answer Man" </Value>
+	<Value> "Up Your Answer Man" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2317,7 +2317,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your New Menu,Hurry!"
+		Var NameDrink = "Up Your New Menu,Hurry!"
 		Var NameDrinkTH = "อัพเมนูใหม่ เมื่อไหร่ จะครบทุกตู้"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Lychee Syrup, Lime and Soda"
@@ -2391,7 +2391,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพเมนูใหม่ เมื่อไหร่
+	<Value> "อัพเมนูใหม่ เมื่อไหร่
 จะครบทุกตู้" </Value>
 	</Text>
 	<Text>
@@ -2413,7 +2413,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your New
+	<Value> "Up Your New
 Menu,Hurry!" </Value>
 	</Text>
 	<Text>
@@ -2563,9 +2563,9 @@ Menu,Hurry!" </Value>
 	<State> Flag( 12-05-02-0116.Button,$Sum1205020116) </State> 
 	<Button>
 	<State> $Sum1205020116 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Mint_lucky_draw_x2.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_Mint_lucky_draw_x2.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_Mint_lucky_draw_x2.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-02-0116, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -2574,7 +2574,7 @@ Menu,Hurry!" </Value>
 		Var NameDrinkTH = "อัพแอ้ แฮ่! นั่นมันตุ๊กแก"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Mint Syrup, Lime and Soda"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Mint_lucky_draw_x2.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_lime_Yuzu_lucky_draw_x2.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0116.Price
@@ -2644,7 +2644,7 @@ Menu,Hurry!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "อัพแอ้ แฮ่!
+	<Value> "อัพแอ้ แฮ่!
 นั่นมันตุ๊กแก" </Value>
 	</Text>
 	<Text>
@@ -2666,7 +2666,7 @@ Menu,Hurry!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Up-Eh, That's
+	<Value> "Up-Eh, That's
 a Gecko" </Value>
 	</Text>
 	<Text>
@@ -2823,7 +2823,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Tasks by 4!"
+		Var NameDrink = "Up Your Tasks by 4!"
 		Var NameDrinkTH = "อัพงานด่วน ขอก่อนสี่โมง"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมกล้วย และโซดา"
 		Var DrinkDescription = "7UP, Banana Syrup and Soda"
@@ -2895,9 +2895,9 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "อัพงานด่วน
+	<Value> "อัพงานด่วน
 ขอก่อนสี่โมง" </Value>
 	</Text>
 	<Text>
@@ -2906,7 +2906,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
 	<Value> "เซเว่นอัพ น้ำเชื่อมกล้วย และโซดา" </Value>
 	</Text>
@@ -2917,9 +2917,9 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Your Tasks by 4!" </Value>
+	<Value> "Up Your Tasks by 4!" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2927,7 +2927,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "7UP, Banana Syrup and Soda" </Value>
 	</Text>
@@ -3075,7 +3075,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Days of Refreshment"
+		Var NameDrink = "Up Days of Refreshment"
 		Var NameDrinkTH = "อัพบราฮัม มีบุตร 7 คน"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมเมล่อน และโซดา"
 		Var DrinkDescription = "7UP, Melon Syrup and Soda"
@@ -3147,9 +3147,9 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "อัพบราฮัม
+	<Value> "อัพบราฮัม
 มีบุตร 7 คน" </Value>
 	</Text>
 	<Text>
@@ -3158,7 +3158,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
 	<Value> "เซเว่นอัพ น้ำเชื่อมเมล่อน และโซดา" </Value>
 	</Text>
@@ -3169,9 +3169,10 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Days of Refreshment" </Value>
+	<Value> "Up Days of
+Refreshment" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3179,7 +3180,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "7UP, Melon Syrup and Soda" </Value>
 	</Text>
@@ -3327,7 +3328,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Love Game"
+		Var NameDrink = "Up Your Love Game"
 		Var NameDrinkTH = "อัพเดทหัวใจ พร้อมลงสนาม"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมพีช และโซดา"
 		Var DrinkDescription = "7UP, Peach Syrup and Soda"
@@ -3399,9 +3400,9 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "อัพเดทหัวใจ
+	<Value> "อัพเดทหัวใจ
 พร้อมลงสนาม" </Value>
 	</Text>
 	<Text>
@@ -3410,7 +3411,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
 	<Value> "เซเว่นอัพ น้ำเชื่อมพีช และโซดา" </Value>
 	</Text>
@@ -3421,9 +3422,9 @@ a Gecko" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Your Love Game" </Value>
+	<Value> "Up Your Love Game" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3431,7 +3432,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0xFFFFFF </Color>
+	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "7UP, Peach Syrup and Soda" </Value>
 	</Text>
@@ -3560,6 +3561,258 @@ a Gecko" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; - 12-05-02-0121 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-02-0121.Button,$Sum1205020121) </State> 
+	<Button>
+	<State> $Sum1205020121 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Mint_lucky_draw_x2.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_Mint_lucky_draw_x2.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_Mint_lucky_draw_x2.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-05-02-0121, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Up Your Cash Flow"
+		Var NameDrinkTH = "อัพบุ๊คแบงก์ ไม่เห็นเงินเดือน"
+		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมินต์ โซดา"
+		Var DrinkDescription = "7UP, Mint Syrup and Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Mint_lucky_draw_x2.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-05-02-0121.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-05-02-0121"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-05-02-0121.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0121, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.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-05-02-0121"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $12-05-02-0121.NameE
+		Var menu_desc_eng_cold = $12-05-02-0121.descriptionE
+		Var menu_name_thai_cold = $12-05-02-0121.Name
+		Var menu_desc_thai_cold = $12-05-02-0121.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> 0x322B26 </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> "Up Your Cash Flow" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "7UP, Mint Syrup and Soda" </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> "Invisible" </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> "Invisible" </State>
+	<Value> StringFmt(  $-.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-05-02-0121.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-05-02-0121.Button </State>
+	<Value> StringFmt( $12-05-02-0121.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
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		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 $Sum1205020121 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-05-02-0121.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> $Sum1205020121 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 12
@@ -5190,7 +5443,7 @@ a Gecko" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Pepsi, Salak Syrup,  Lime
+	<Value> "Pepsi, Salak Syrup,  Lime
 and Soda" </Value>
 	</Text>
 	<Image>
@@ -5442,7 +5695,7 @@ and Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Pepsi, Salak Syrup,  Lime
+	<Value> "Pepsi, Salak Syrup,  Lime
 and Soda" </Value>
 	</Text>
 	<Image>
@@ -6667,7 +6920,7 @@ and Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "เป๊ปซี่สตรอว์เบอร์รี่
+	<Value> "เป๊ปซี่สตรอว์เบอร์รี่
 มะนาว" </Value>
 	</Text>
 	<Text>
@@ -6689,7 +6942,7 @@ and Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "PEPSI STRAWBERRY
+	<Value> "PEPSI STRAWBERRY
 LIME" </Value>
 	</Text>
 	<Text>
@@ -6920,7 +7173,7 @@ LIME" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "เป๊ปซี่สตรอว์เบอร์รี่
+	<Value> "เป๊ปซี่สตรอว์เบอร์รี่
 มะนาว" </Value>
 	</Text>
 	<Text>
@@ -6942,7 +7195,7 @@ LIME" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "PEPSI STRAWBERRY
+	<Value> "PEPSI STRAWBERRY
 LIME" </Value>
 	</Text>
 	<Text>
@@ -9714,7 +9967,7 @@ LIME" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Pepsi Energy Syrup,  Lime
+	<Value> "Pepsi Energy Syrup,  Lime
 and Soda" </Value>
 	</Text>
 	<Image>
@@ -10862,25 +11115,25 @@ and Soda" </Value>
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
-
-
-
-;BigLogoLayout
-
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
-
-</Popup>
+
+
+
+
+;BigLogoLayout
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
diff --git a/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml b/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml
index 65850b2e..25de8eff 100644
--- a/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml
+++ b/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml
@@ -30,7 +30,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 43
+; menu_new_list 44
 	; ==================> Len = 12
 	; - 12-05-02-0095 - 
 <Block>
@@ -301,7 +301,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Exit Date!"
+		Var NameDrink = "Up Your Exit Date!"
 		Var NameDrinkTH = "อัพเดทด้วยครับ ลาออกเมื่อไหร่"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมชูกำลัง น้ำเชื่อมบ๊วย และโซดา"
 		Var DrinkDescription = "7UP, Energy Syrup, Ume Syrup and Soda"
@@ -397,7 +397,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your Exit Date!" </Value>
+	<Value> "Up Your Exit Date!" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -553,7 +553,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Single Status"
+		Var NameDrink = "Up My Single Status"
 		Var NameDrinkTH = "อัพตัสโสด โปรดผมได้บุญ"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Ume Syrup, Lime and Soda"
@@ -649,7 +649,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Single Status" </Value>
+	<Value> "Up My Single Status" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -805,7 +805,7 @@ please, boss!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP single status, how come gal!"
+		Var NameDrink = "Up single status, how come gal!"
 		Var NameDrinkTH = "อัพบอกโสด ไหงมีแฟนเฉย"
 		Var DrinkDescriptionTH = "เซเว่นอัพ กาแฟ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Espresso, Ume Syrup, Lime and Soda"
@@ -901,7 +901,7 @@ please, boss!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP single status,
+	<Value> "Up single status,
 how come gal!" </Value>
 	</Text>
 	<Text>
@@ -1058,7 +1058,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Lottery Luck"
+		Var NameDrink = "Up My Lottery Luck"
 		Var NameDrinkTH = "อัพโชคได้ไง ตั้งใจทุกงวด"
 		Var DrinkDescriptionTH = "เซเว่นอัพ กาแฟ น้ำเชื่อมสละ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Espresso, Salak Syrup, Lime and Soda"
@@ -1154,7 +1154,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Lottery Luck" </Value>
+	<Value> "Up My Lottery Luck" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1310,7 +1310,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP My Bad Luck"
+		Var NameDrink = "Up My Bad Luck"
 		Var NameDrinkTH = "อัพโชคเอง โทษธูป โทษฝัน"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมสละ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Salak Syrup, Lime and Soda"
@@ -1406,7 +1406,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP My Bad Luck" </Value>
+	<Value> "Up My Bad Luck" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2065,7 +2065,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Answer Man"
+		Var NameDrink = "Up Your Answer Man"
 		Var NameDrinkTH = "อัพดุลเอ้ย ถามไรตอบได้"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมะพร้าว และโซดา"
 		Var DrinkDescription = "7UP, Coconut Syrup and Soda"
@@ -2161,7 +2161,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your Answer Man" </Value>
+	<Value> "Up Your Answer Man" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2317,7 +2317,7 @@ how come gal!" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your New Menu,Hurry!"
+		Var NameDrink = "Up Your New Menu,Hurry!"
 		Var NameDrinkTH = "อัพเมนูใหม่ เมื่อไหร่ จะครบทุกตู้"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Lychee Syrup, Lime and Soda"
@@ -2413,7 +2413,7 @@ how come gal!" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "UP Your New
+	<Value> "Up Your New
 Menu,Hurry!" </Value>
 	</Text>
 	<Text>
@@ -2563,9 +2563,9 @@ Menu,Hurry!" </Value>
 	<State> Flag( 12-05-02-0116.Button,$Sum1205020116) </State> 
 	<Button>
 	<State> $Sum1205020116 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Mint_lucky_draw_x2.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_Mint_lucky_draw_x2.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_Mint_lucky_draw_x2.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_lime_Yuzu_lucky_draw_x2.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-02-0116, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -2574,7 +2574,7 @@ Menu,Hurry!" </Value>
 		Var NameDrinkTH = "อัพแอ้ แฮ่! นั่นมันตุ๊กแก"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
 		Var DrinkDescription = "7UP, Mint Syrup, Lime and Soda"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Mint_lucky_draw_x2.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_lime_Yuzu_lucky_draw_x2.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0116.Price
@@ -2642,7 +2642,7 @@ Menu,Hurry!" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
+	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
 	<Value> "อัพแอ้ แฮ่!
 นั่นมันตุ๊กแก" </Value>
@@ -2653,7 +2653,7 @@ Menu,Hurry!" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
+	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
 	<Value> "เซเว่นอัพ น้ำเชื่อมมินต์ ผงมะนาว และโซดา" </Value>
 	</Text>
@@ -2664,7 +2664,7 @@ Menu,Hurry!" </Value>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
+	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
 	<Value> "Up-Eh, That's
 a Gecko" </Value>
@@ -2675,7 +2675,7 @@ a Gecko" </Value>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
+	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
 	<Value> "7UP, Mint Syrup, Lime and Soda" </Value>
 	</Text>
@@ -2823,7 +2823,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Tasks by 4!"
+		Var NameDrink = "Up Your Tasks by 4!"
 		Var NameDrinkTH = "อัพงานด่วน ขอก่อนสี่โมง"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมกล้วย และโซดา"
 		Var DrinkDescription = "7UP, Banana Syrup and Soda"
@@ -2919,7 +2919,7 @@ a Gecko" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Your Tasks by 4!" </Value>
+	<Value> "Up Your Tasks by 4!" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3075,7 +3075,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Days of Refreshment"
+		Var NameDrink = "Up Days of Refreshment"
 		Var NameDrinkTH = "อัพบราฮัม มีบุตร 7 คน"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมเมล่อน และโซดา"
 		Var DrinkDescription = "7UP, Melon Syrup and Soda"
@@ -3171,7 +3171,8 @@ a Gecko" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Days of Refreshment" </Value>
+	<Value> "Up Days of
+Refreshment" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3327,7 +3328,7 @@ a Gecko" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "UP Your Love Game"
+		Var NameDrink = "Up Your Love Game"
 		Var NameDrinkTH = "อัพเดทหัวใจ พร้อมลงสนาม"
 		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมพีช และโซดา"
 		Var DrinkDescription = "7UP, Peach Syrup and Soda"
@@ -3423,7 +3424,7 @@ a Gecko" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "UP Your Love Game" </Value>
+	<Value> "Up Your Love Game" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3560,6 +3561,258 @@ a Gecko" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; - 12-05-02-0121 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-02-0121.Button,$Sum1205020121) </State> 
+	<Button>
+	<State> $Sum1205020121 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Mint_lucky_draw_x2.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_7UP_Mint_lucky_draw_x2.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_7UP_Mint_lucky_draw_x2.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-05-02-0121, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Up Your Cash Flow"
+		Var NameDrinkTH = "อัพบุ๊คแบงก์ ไม่เห็นเงินเดือน"
+		Var DrinkDescriptionTH = "เซเว่นอัพ น้ำเชื่อมมินต์ โซดา"
+		Var DrinkDescription = "7UP, Mint Syrup and Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Mint_lucky_draw_x2.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-05-02-0121.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-05-02-0121"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-05-02-0121.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0121, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.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-05-02-0121"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $12-05-02-0121.NameE
+		Var menu_desc_eng_cold = $12-05-02-0121.descriptionE
+		Var menu_name_thai_cold = $12-05-02-0121.Name
+		Var menu_desc_thai_cold = $12-05-02-0121.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> 0x322B26 </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> "Up Your Cash Flow" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "7UP, Mint Syrup and Soda" </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> "Invisible" </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> "Invisible" </State>
+	<Value> StringFmt(  $-.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-05-02-0121.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-05-02-0121.Button </State>
+	<Value> StringFmt( $12-05-02-0121.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
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		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 $Sum1205020121 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-05-02-0121.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> $Sum1205020121 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 12
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index f384319b..b2fdfc20 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -777,7 +777,11 @@
 	;Open "ROOT/taobin_project/xml/page_catalog.xml"  
 	SAVELOG "collect_point1-p589."
 		
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	If CheckMemberPageCampaign = 1 Then
+		Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+	Else
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index 62a6eada..48fc3754 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -19,6 +19,7 @@
 	Var TaobinLevel = 0
 	Var Point2X = 0
 
+	Var Seeker.IsLineMember = 0
 	Var Seeker.TaobinErrorNetwork = 0
 
 
@@ -128,6 +129,12 @@
 				INT PointTaobinTmp
 
 				INT TaobinPDPA
+
+				If TaobinName = "-" Then
+					Var Seeker.IsLineMember = 0
+				Else
+					Var Seeker.IsLineMember = 1
+				EndIf
 				
 
 				Var TelephoneNumber = TelephoneNumberX
diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml
index e2dd3d48..ef06ad90 100644
--- a/xml/page_collect_point_3_28.xml
+++ b/xml/page_collect_point_3_28.xml
@@ -682,17 +682,23 @@
 			If GetDrink5Bath = 1 Then
 				Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
 			Else
-				If CheckMemberPageCampaign = 1 Then
-					; Go to comapaign ad and go back.
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				If Seeker.IsLineMember = 0 Then
+					If CheckMemberPageCampaign = 1 Then
+						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+					Else
+						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+					EndIf
 				Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 				EndIf
 			EndIf
 		Else
-			If CheckMemberPageCampaign = 1 Then
-				; Go to comapaign ad and go back.
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			If Seeker.IsLineMember = 0 Then
+				If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
@@ -836,17 +842,23 @@
 		If GetDrink5Bath = 1 Then
 			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
 		Else
-			If CheckMemberPageCampaign = 1 Then
-				
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			If Seeker.IsLineMember = 0 Then
+				If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
 		EndIf
 	Else
-		If CheckMemberPageCampaign = 1 Then
-			
-			Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+		If Seeker.IsLineMember = 0 Then
+			If CheckMemberPageCampaign = 1 Then
+				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
diff --git a/xml/page_display_get_15_discount.xml b/xml/page_display_get_15_discount.xml
index 15c9008d..adc3c1a0 100644
--- a/xml/page_display_get_15_discount.xml
+++ b/xml/page_display_get_15_discount.xml
@@ -35,12 +35,14 @@
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
 		EndIf
 	Else
-		If Timeout > 5 Then
+		If Seeker.IsLineMember = 0 Then
 			If CheckMemberPageCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
+		Else
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
 	EndIf
 
@@ -178,8 +180,12 @@
 	If FromCheckMemberPoint = 1 Then
 		Open "ROOT/taobin_project/xml/page_check_member2.xml"
 	Else
-		If CheckMemberPageCampaign = 1 Then
-			Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+		If Seeker.IsLineMember = 0 Then
+			If CheckMemberPageCampaign = 1 Then
+				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
diff --git a/xml/page_display_get_drink_5_baht.xml b/xml/page_display_get_drink_5_baht.xml
index a60d6d63..4113c5ee 100644
--- a/xml/page_display_get_drink_5_baht.xml
+++ b/xml/page_display_get_drink_5_baht.xml
@@ -52,8 +52,12 @@
 			If FromCheckMemberPoint = 1 Then
 				Open "ROOT/taobin_project/xml/page_check_member2.xml"
 			Else
-				If CheckMemberPageCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				If Seeker.IsLineMember = 0 Then
+					If CheckMemberPageCampaign = 1 Then
+						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+					Else
+						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+					EndIf
 				Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 				EndIf
@@ -152,8 +156,12 @@
 		If FromCheckMemberPoint = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
 		Else
-			If CheckMemberPageCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			If Seeker.IsLineMember = 0 Then
+				If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml
index 95ab7b3c..5111d891 100644
--- a/xml/page_payment_cash-SGP.xml
+++ b/xml/page_payment_cash-SGP.xml
@@ -2461,32 +2461,6 @@ EndIf
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
-<Button>
-<X> 0 </X>
-<Y> 1870 </Y>
-<State> SGPSimMode </State>
-<Color> "0xFFBF00" </Color>
-<Width> 1080 </Width>
-<Height> 60 </Height>
-<EventClick>
-	DEBUGVAR SGPSimMode
-	MakeDrinkV1  SelectDrink SelectSugarID
-	Open "ROOT/taobin_project/xml/page_thankyou.xml"
-</EventClick>
-</Button>
-
-<Text>
-<X> 5 </X>
-<Y> 1880 </Y>
-<State> SGPSimMode </State>
-<Size> 24 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
-<Font> RobotoRegular </Font>
-<Color> 0xFFFFFF </Color>
-<Value> "Test Bypass Payment" </Value>
-</Text>
-
 
 <EventUnitTest1>
 
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 0acc2cc5..1b604b3e 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -270,8 +270,12 @@
 	If CountDownThankyou = 0 Then 
 		
 		If IgnoreNetCore = "true" Then 
-			If CheckMemberPageCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			If Seeker.IsLineMember = 0 Then
+				If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
@@ -288,9 +292,12 @@
 
 
 		If RoadShow = "true" Then
-
-			If CheckMemberPageCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+			If Seeker.IsLineMember = 0 Then
+				If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
@@ -368,8 +375,12 @@
 				EndIf
 
 				If 	CART_INDEX >= 2  Then   
-					If CheckMemberPageCampaign = 1 Then
-						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+					If Seeker.IsLineMember = 0 Then
+						If CheckMemberPageCampaign = 1 Then
+							Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+						Else
+							Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+						EndIf
 					Else
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 					EndIf
@@ -443,15 +454,23 @@
 								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 							EndIf
 						EndIf
-						If CheckMemberPageCampaign = 1 Then
-							Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+						If Seeker.IsLineMember = 0 Then
+							If CheckMemberPageCampaign = 1 Then
+								Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+							Else
+								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+							EndIf
 						Else
 							Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 						EndIf
 					Else
 						If 	CART_INDEX >= 2  Then   
-							If CheckMemberPageCampaign = 1 Then
-								Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+							If Seeker.IsLineMember = 0 Then
+								If CheckMemberPageCampaign = 1 Then
+									Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+								Else
+									Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+								EndIf
 							Else
 								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 							EndIf 
@@ -492,18 +511,26 @@
 								EndIf
 							EndIf
 
-							If CheckMemberPageCampaign = 1 Then
-								Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-							Else
-								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-							EndIf 
-						Else
-							If 	CART_INDEX >= 2  Then   
+							If Seeker.IsLineMember = 0 Then
 								If CheckMemberPageCampaign = 1 Then
 									Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 								Else
 									Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-								EndIf 
+								EndIf
+							Else
+								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+							EndIf
+						Else
+							If 	CART_INDEX >= 2  Then   
+								If Seeker.IsLineMember = 0 Then
+									If CheckMemberPageCampaign = 1 Then
+										Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+									Else
+										Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+									EndIf
+								Else
+									Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+								EndIf
 							EndIf
 							If CountryName = "Singapore" Then
 								; ask-if-member-yet
diff --git a/xml/process/payext_setup.ev b/xml/process/payext_setup.ev
index f55f24e7..7fe45d6c 100644
--- a/xml/process/payext_setup.ev
+++ b/xml/process/payext_setup.ev
@@ -4,3 +4,5 @@ If TelephoneNumberExt = "" Then
     Var TelephoneNumberExt = "0899999999"
 EndIf
 __CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID 
+Var payOrderChannel = "/XML|" +  Seeker.OrderChanel
+__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""