MYS: fix desc & hide button in page_catalog, SGP: change video main WTC

inter/mys/xml/page_catalog_group_tea.lxml

@@ -8331,7 +8331,7 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "TEH PEACH"
+		Var aliasName[4] = "THAI TEH PEACH"
 		Var aliasDesc[4] = "Teh Thai, Pic Sirap dan Air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
@@ -8422,7 +8422,7 @@
 		<LanguageSlot2>ชาพีช</LanguageSlot2>
 		<LanguageSlot3>PEACH TEA</LanguageSlot3>
 		<LanguageSlot4>ชาพีช</LanguageSlot4>
-		<LanguageSlot5>TEH PEACH</LanguageSlot5>
+		<LanguageSlot5>THAI TEH PEACH</LanguageSlot5>
 		<LanguageSlot6>ชาพีช</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -8598,15 +8598,15 @@
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEACH JASMINE TEA"
-		Var aliasDesc[0] = "Jasmine Tea, Peach Syrup &Milk"
+		Var aliasDesc[0] = "Jasmine Tea, Peach Syrup & Water"
 		Var aliasName[1] = "ชามะลิพีช"
 		Var aliasDesc[1] = "ชามะลิ และน้ำเชื่อมพีช"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "TEH SUSU PEACH"
-		Var aliasDesc[4] = "Teh Jasmin, Pic Sirap dan Susu"
+		Var aliasName[4] = "JASMINE TEH PEACH"
+		Var aliasDesc[4] = "Teh Jasmin, Pic Sirap dan air"
 		Var aliasName[5] = ""
 		Var aliasDesc[5] = ""
 		Var NameLang[0][0] = ""
@@ -8627,11 +8627,11 @@
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "Iced PEACH JASMINE TEA"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Jasmine Tea, Peach Syrup &Milk"
+		Var DescLang[1][0] = "Jasmine Tea, Peach Syrup"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Jasmine Tea, Peach Syrup &Milk"
+		Var DescLang[1][4] = "Jasmine Tea, Peach Syrup"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -8696,7 +8696,7 @@
 		<LanguageSlot2>ชามะลิพีช</LanguageSlot2>
 		<LanguageSlot3>PEACH JASMINE TEA</LanguageSlot3>
 		<LanguageSlot4>ชามะลิพีช</LanguageSlot4>
-		<LanguageSlot5>TEH SUSU PEACH</LanguageSlot5>
+		<LanguageSlot5>JASMINE TEH PEACH</LanguageSlot5>
 		<LanguageSlot6>ชามะลิพีช</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -8708,11 +8708,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Jasmine Tea, Peach Syrup &Milk</LanguageSlot1>
+		<LanguageSlot1>Jasmine Tea, Peach Syrup & Water</LanguageSlot1>
 		<LanguageSlot2>ชามะลิ และน้ำเชื่อมพีช</LanguageSlot2>
-		<LanguageSlot3>Jasmine Tea, Peach Syrup &Milk</LanguageSlot3>
+		<LanguageSlot3>Jasmine Tea, Peach Syrup & Water</LanguageSlot3>
 		<LanguageSlot4>ชามะลิ และน้ำเชื่อมพีช</LanguageSlot4>
-		<LanguageSlot5>Teh Jasmin, Pic Sirap dan Susu</LanguageSlot5>
+		<LanguageSlot5>Teh Jasmin, Pic Sirap dan air</LanguageSlot5>
 		<LanguageSlot6>ชามะลิ และน้ำเชื่อมพีช</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

inter/sgp/menu/lang.tsv

@@ -757,7 +757,7 @@ TextID	Note	English	Thai
 800660		Bucket	กระบะ
 800661		Shutter	ชัตเตอร์
 800662		Motor	แกนมอเตอร์
-
+800663		Whipper clean water	น้ำล้างหัวชง
 
 
 

inter/whatthecup/sgp/xml/page_catalog.lxml

@@ -813,7 +813,9 @@
 </EventUnitTest2>
 ; Initial for jump to page_brewing3.xml
 <EventUnitTest3>
-
+    Var buttonRemoveCup = "Enable"
+    DEBUGVAR buttonRemoveCup
 </EventUnitTest3>
 
+
 </Popup>

inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml

@@ -1536,6 +1536,8 @@
 <Image>
 <X> 374 </X>
 <Y> 382 </Y>
+<Width> 361 </Width>
+<Height> 466 </Height>
 <Filename> OverlayMenuFilter </Filename>
 </Image>
 

xml/page_board.xml

@@ -1483,7 +1483,7 @@
 			;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
 			Var img_press_main_page = ""
 
-			Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
+			Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc_new.mp4"
 
 			Var ShowButtonClickFull = "Enable"
 

xml/page_catalog.lxml

@@ -23,14 +23,7 @@
 	EndIf
 
 	If CountryName = "Malaysia" Then
-		DEBUGVAR FromFruityRaya
-		DEBUGVAR FromProThaiTea
-		DEBUGVAR FromProYuzu
-
-		Var FromFruityRaya = 0
-		Var FromProThaiTea = 0
-		Var FromProYuzu = 0
-		Var FromProYuzu250 = 0
+		Var ShowButtonClick2 = "Invisible"
 	EndIf
 
 	If UsePepsiTheme = 1 Then
@@ -215,6 +208,11 @@
 	EndIf
 
 
+   	If CountryName = "Malaysia" Then
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
 
 	DEBUGVAR ShowButtonClick2
 

xml/page_payment_cash.xml

@@ -48,6 +48,7 @@
 
 	;inter-xml-open
 	If CountryName = "Australia" Then
+	    DEBUGVAR CancelFlag
 		Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml"
 	EndIf