SGP: add overlay to whey, fix image in season pass set 2, disable reward btn, fix member ui & flow

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"
         

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 = ""
+
+		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 = ""
+
+		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 = ""
+
+		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 = ""
+
+		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 = ""
+
+		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 = ""
+
+		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 = ""
+
+		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"

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>

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>

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
 
@@ -1397,13 +1392,6 @@
 
 	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"
 			Var ShowButtonClick = "Invisible"
@@ -1413,9 +1401,6 @@
 		If CountDownShowButton = 3 Then
 			
 			Var ShowButtonClick = "Enable"
-			If CountryName = "Singapore" Then
-				Var ShowButtonClick2 = "Enable"
-			EndIf
 			Var ShowButtonClickFull = "Invisible"	
 			Refresh
 		EndIf

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>