MYS: update catalog other, add ref for page pro pepsi melon

inter/mys/menu/lang.tsv

@@ -1036,7 +1036,7 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1049,7 +1049,7 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

inter/mys/xml/event/promotion_melonzy.lxml

@@ -10286,6 +10286,7 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
+		Var FromProMelon = 1
 		
 		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
 		
@@ -14050,3 +14051,4 @@
 
 
 </Popup>
+

inter/mys/xml/page_catalog_group_other.lxml

@@ -6307,15 +6307,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 12-05-02-0075 12-05-03-0075
+	; - 12-05-02-0075 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0075.Button,12-05-03-0075.Button,$Sum12050200751205030075) </State>
+	<State> Flag( 12-05-02-0075.Button,$Sum1205020075) </State> 
 	<Button>
-	<State> $Sum12050200751205030075 </State>
+	<State> $Sum1205020075 </State> 
 	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
@@ -6326,10 +6326,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0075.Price
-		Var PriceD3 = $12-05-03-0075.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "12-05-02-0075"
-		Var PD_CODE3 = "12-05-03-0075"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black MELON"
 		Var aliasDesc[0] = "Pepsi Black, Melon Syrup& Ice"
@@ -6367,22 +6367,22 @@
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "Pepsi Black, Sirap Melon, Ais"
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI Black MELON Smoothie"
+		Var NameLang[2][0] = ""
-		Var NameLang[2][1] = "เป๊ปซี่เมล่อน"
+		Var NameLang[2][1] = ""
-		Var NameLang[2][2] = "-"
+		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = "-"
+		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = "PEPSI Black MELON Smoothie"
+		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Pepsi Black, Melon Syrup& Ice"
+		Var DescLang[2][0] = ""
-		Var DescLang[2][1] = "เป๊ปซี่ น้ำเชื่อมเมล่อน โซดา"
+		Var DescLang[2][1] = ""
-		Var DescLang[2][2] = "-"
+		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = "-"
+		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = "Pepsi Black, Sirap Melon, Ais"
+		Var DescLang[2][4] = ""
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0075.Button
-		Var PD_STAGE_3 = $12-05-03-0075.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -6403,7 +6403,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "12-05-03-0075"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6498,7 +6498,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-05-03-0075.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -6508,8 +6508,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-03-0075.Button </State>
+	<State> "Invisible" </State>
-	<Value> StringFmt(  $12-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6534,10 +6534,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum12050200751205030075 = "Disable" Then
+			If $Sum1205020075 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $12-05-02-0075.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-05-03-0075.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -6571,7 +6571,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum12050200751205030075 </State>
+	<State> $Sum1205020075 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>