before merge from inter

inter/mys/xml/event/promotion_2.xml

@@ -11470,16 +11470,16 @@
 		Var PD_CODE2 = "12-05-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "PEPSI"
+		Var aliasName[0] = "PEPSI Black"
-		Var aliasDesc[0] = "Pepsi, Ice"
+		Var aliasDesc[0] = "Pepsi Black, Ice"
 		Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
 		Var aliasDesc[1] = "เป๊ปซี่"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
+		Var aliasName[4] = "PEPSI Black"
-		Var aliasDesc[4] = "Pepsi, Ais"
+		Var aliasDesc[4] = "Pepsi Black, Ais"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>PEPSI</LanguageSlot1>
+		<LanguageSlot1>PEPSI Black</LanguageSlot1>
 		<LanguageSlot2>เป็ปซี่น้ำแข็ง</LanguageSlot2>
-		<LanguageSlot3>PEPSI</LanguageSlot3>
+		<LanguageSlot3>PEPSI Black</LanguageSlot3>
 		<LanguageSlot4>เป็ปซี่น้ำแข็ง</LanguageSlot4>
-		<LanguageSlot5>PEPSI</LanguageSlot5>
+		<LanguageSlot5>PEPSI Black</LanguageSlot5>
 		<LanguageSlot6>เป็ปซี่น้ำแข็ง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11573,11 +11573,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Pepsi, Ice</LanguageSlot1>
+		<LanguageSlot1>Pepsi Black, Ice</LanguageSlot1>
 		<LanguageSlot2>เป๊ปซี่</LanguageSlot2>
-		<LanguageSlot3>Pepsi, Ice</LanguageSlot3>
+		<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
 		<LanguageSlot4>เป๊ปซี่</LanguageSlot4>
-		<LanguageSlot5>Pepsi, Ais</LanguageSlot5>
+		<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5>
 		<LanguageSlot6>เป๊ปซี่</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

inter/mys/xml/event/promotion_3.xml

@@ -11470,16 +11470,16 @@
 		Var PD_CODE2 = "12-05-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "PEPSI"
+		Var aliasName[0] = "PEPSI Black"
-		Var aliasDesc[0] = "Pepsi, Ice"
+		Var aliasDesc[0] = "Pepsi Black, Ice"
 		Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
 		Var aliasDesc[1] = "เป๊ปซี่"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
+		Var aliasName[4] = "PEPSI Black"
-		Var aliasDesc[4] = "Pepsi, Ais"
+		Var aliasDesc[4] = "Pepsi Black, Ais"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>PEPSI</LanguageSlot1>
+		<LanguageSlot1>PEPSI Black</LanguageSlot1>
 		<LanguageSlot2>เป็ปซี่น้ำแข็ง</LanguageSlot2>
-		<LanguageSlot3>PEPSI</LanguageSlot3>
+		<LanguageSlot3>PEPSI Black</LanguageSlot3>
 		<LanguageSlot4>เป็ปซี่น้ำแข็ง</LanguageSlot4>
-		<LanguageSlot5>PEPSI</LanguageSlot5>
+		<LanguageSlot5>PEPSI Black</LanguageSlot5>
 		<LanguageSlot6>เป็ปซี่น้ำแข็ง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11573,11 +11573,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Pepsi, Ice</LanguageSlot1>
+		<LanguageSlot1>Pepsi Black, Ice</LanguageSlot1>
 		<LanguageSlot2>เป๊ปซี่</LanguageSlot2>
-		<LanguageSlot3>Pepsi, Ice</LanguageSlot3>
+		<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
 		<LanguageSlot4>เป๊ปซี่</LanguageSlot4>
-		<LanguageSlot5>Pepsi, Ais</LanguageSlot5>
+		<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5>
 		<LanguageSlot6>เป๊ปซี่</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

inter/mys/xml/event/promotion_pepsi_099.lxml

@@ -11470,16 +11470,16 @@
 		Var PD_CODE2 = "12-05-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "PEPSI"
+		Var aliasName[0] = "PEPSI Black"
-		Var aliasDesc[0] = "Pepsi, Ice"
+		Var aliasDesc[0] = "Pepsi Black, Ice"
 		Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
 		Var aliasDesc[1] = "เป๊ปซี่"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
+		Var aliasName[4] = "PEPSI Black"
-		Var aliasDesc[4] = "Pepsi, Ais"
+		Var aliasDesc[4] = "Pepsi Black, Ais"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -11557,11 +11557,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>PEPSI</LanguageSlot1>
+		<LanguageSlot1>PEPSI Black</LanguageSlot1>
 		<LanguageSlot2>เป็ปซี่น้ำแข็ง</LanguageSlot2>
-		<LanguageSlot3>PEPSI</LanguageSlot3>
+		<LanguageSlot3>PEPSI Black</LanguageSlot3>
 		<LanguageSlot4>เป็ปซี่น้ำแข็ง</LanguageSlot4>
-		<LanguageSlot5>PEPSI</LanguageSlot5>
+		<LanguageSlot5>PEPSI Black</LanguageSlot5>
 		<LanguageSlot6>เป็ปซี่น้ำแข็ง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -11573,11 +11573,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Pepsi, Ice</LanguageSlot1>
+		<LanguageSlot1>Pepsi Black, Ice</LanguageSlot1>
 		<LanguageSlot2>เป๊ปซี่</LanguageSlot2>
-		<LanguageSlot3>Pepsi, Ice</LanguageSlot3>
+		<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
 		<LanguageSlot4>เป๊ปซี่</LanguageSlot4>
-		<LanguageSlot5>Pepsi, Ais</LanguageSlot5>
+		<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5>
 		<LanguageSlot6>เป๊ปซี่</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

inter/mys/xml/page_catalog_group_other.lxml

@@ -927,8 +927,8 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
+		Var aliasName[4] = "PEPSI Black"
-		Var aliasDesc[4] = "Pepsi, Ais"
+		Var aliasDesc[4] = "Pepsi Black, Ais"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -1010,7 +1010,7 @@
 		<LanguageSlot2>เป็ปซี่น้ำแข็ง</LanguageSlot2>
 		<LanguageSlot3>PEPSI Black</LanguageSlot3>
 		<LanguageSlot4>เป็ปซี่น้ำแข็ง</LanguageSlot4>
-		<LanguageSlot5>PEPSI</LanguageSlot5>
+		<LanguageSlot5>PEPSI Black</LanguageSlot5>
 		<LanguageSlot6>เป็ปซี่น้ำแข็ง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -1026,7 +1026,7 @@
 		<LanguageSlot2>เป๊ปซี่</LanguageSlot2>
 		<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
 		<LanguageSlot4>เป๊ปซี่</LanguageSlot4>
-		<LanguageSlot5>Pepsi, Ais</LanguageSlot5>
+		<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5>
 		<LanguageSlot6>เป๊ปซี่</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -9281,6 +9281,272 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 12-05-01-0001 12-05-02-0001 12-05-03-0001 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-01-0001.Button,12-05-02-0001.Button,12-05-03-0001.Button,$Sum120501000112050200011205030001) </State> 
+	<Button>
+	<State> $Sum120501000112050200011205030001 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_lemonade.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_lemonade.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_lemonade.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_lemonade.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-05-01-0001.Price
+		Var PriceD2 = $12-05-02-0001.Price
+		Var PriceD3 = $12-05-03-0001.Price
+		Var PD_CODE1 = "12-05-01-0001"
+		Var PD_CODE2 = "12-05-02-0001"
+		Var PD_CODE3 = "12-05-03-0001"
+		; begin lang 
+		Var aliasName[0] = "LIMENADE"
+		Var aliasDesc[0] = "Limenade, Sugar"
+		Var aliasName[1] = "น้ำมะนาว"
+		Var aliasDesc[1] = "น้ำมะนาว น้ำตาล"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "LIMAU AIS"
+		Var aliasDesc[4] = "Sirap Limau, Gula, Ais"
+		Var NameLang[0][0] = "Hot LIMENADE"
+		Var NameLang[0][1] = "น้ำมะนาวร้อน"
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = "AIR LIMAU PANAS"
+		Var DescLang[0][0] = "Limenade, Sugar"
+		Var DescLang[0][1] = "น้ำมะนาว น้ำตาล"
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = "Limau,Gula"
+		Var NameLang[1][0] = "Iced LIMENADE"
+		Var NameLang[1][1] = "น้ำมะนาวเย็น"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = "LIMAU AIS"
+		Var DescLang[1][0] = "Limenade,Sugar, Ice"
+		Var DescLang[1][1] = "นำมะนาว น้ำตาล น้ำแข็ง"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = "Limau, Gula, Ais"
+		Var NameLang[2][0] = "LIMENADE SMOOTHIE"
+		Var NameLang[2][1] = "น้ำมะนาวปั่น"
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = "SMOOTHIE LIMAU"
+		Var DescLang[2][0] = "Limenade,Sugar, Ice"
+		Var DescLang[2][1] = "นำมะนาว น้ำตาล น้ำแข็ง"
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = "Limau, Gula, Ais"
+		; end lang 
+		Var PD_STAGE_1 = $12-05-01-0001.Button
+		Var PD_STAGE_2 = $12-05-02-0001.Button
+		Var PD_STAGE_3 = $12-05-03-0001.Button
+		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-0001"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-05-01-0001"
+			Else
+			Topping "Load" "12-05-03-0001"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>LIMENADE</LanguageSlot1>
+		<LanguageSlot2>น้ำมะนาว</LanguageSlot2>
+		<LanguageSlot3>LIMENADE</LanguageSlot3>
+		<LanguageSlot4>น้ำมะนาว</LanguageSlot4>
+		<LanguageSlot5>LIMAU AIS</LanguageSlot5>
+		<LanguageSlot6>น้ำมะนาว</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Limenade, Sugar</LanguageSlot1>
+		<LanguageSlot2>น้ำมะนาว น้ำตาล</LanguageSlot2>
+		<LanguageSlot3>Limenade, Sugar</LanguageSlot3>
+		<LanguageSlot4>น้ำมะนาว น้ำตาล</LanguageSlot4>
+		<LanguageSlot5>Sirap Limau, Gula, Ais</LanguageSlot5>
+		<LanguageSlot6>น้ำมะนาว น้ำตาล</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-05-01-0001.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-05-01-0001.Button </State>
+	<Value> StringFmt(  $12-05-01-0001.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-0001.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-05-02-0001.Button </State>
+	<Value> StringFmt( $12-05-02-0001.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> $12-05-03-0001.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-05-03-0001.Button </State>
+	<Value> StringFmt(  $12-05-03-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120501000112050200011205030001 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		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 $Sum120501000112050200011205030001 = "Disable" Then
+				STRCONTAIN "ERR" $12-05-01-0001.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-05-02-0001.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-05-03-0001.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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum120501000112050200011205030001 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 12-05-02-0026 12-05-03-0026 

inter/mys/xml/page_catalog_group_recommend.lxml

@@ -10759,16 +10759,16 @@
 		Var PD_CODE2 = "12-05-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "PEPSI"
+		Var aliasName[0] = "PEPSI Black"
-		Var aliasDesc[0] = "Pepsi, Ice"
+		Var aliasDesc[0] = "Pepsi Black, Ice"
 		Var aliasName[1] = "เป็ปซี่น้ำแข็ง"
 		Var aliasDesc[1] = "เป๊ปซี่"
 		Var aliasName[2] = "-"
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
+		Var aliasName[4] = "PEPSI Black"
-		Var aliasDesc[4] = "Pepsi, Ais"
+		Var aliasDesc[4] = "Pepsi Black, Ais"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -10846,11 +10846,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>PEPSI</LanguageSlot1>
+		<LanguageSlot1>PEPSI Black</LanguageSlot1>
 		<LanguageSlot2>เป็ปซี่น้ำแข็ง</LanguageSlot2>
-		<LanguageSlot3>PEPSI</LanguageSlot3>
+		<LanguageSlot3>PEPSI Black</LanguageSlot3>
 		<LanguageSlot4>เป็ปซี่น้ำแข็ง</LanguageSlot4>
-		<LanguageSlot5>PEPSI</LanguageSlot5>
+		<LanguageSlot5>PEPSI Black</LanguageSlot5>
 		<LanguageSlot6>เป็ปซี่น้ำแข็ง</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -10862,11 +10862,11 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Pepsi, Ice</LanguageSlot1>
+		<LanguageSlot1>Pepsi Black, Ice</LanguageSlot1>
 		<LanguageSlot2>เป๊ปซี่</LanguageSlot2>
-		<LanguageSlot3>Pepsi, Ice</LanguageSlot3>
+		<LanguageSlot3>Pepsi Black, Ice</LanguageSlot3>
 		<LanguageSlot4>เป๊ปซี่</LanguageSlot4>
-		<LanguageSlot5>Pepsi, Ais</LanguageSlot5>
+		<LanguageSlot5>Pepsi Black, Ais</LanguageSlot5>
 		<LanguageSlot6>เป๊ปซี่</LanguageSlot6>
 	</LanguageGroup>
 	</Text>

xml/event/tricker.ev

@@ -33,7 +33,7 @@ Var MomDayEnable = 0
 Var GameEnableFromTrickerEv = 0
 
 ; Enable pro Pepween
-Var PepweenEnable = 1
+Var PepweenEnable = 0
 
 ; Enable pro Tamatian. 16-30 Sep
 Var TamatianEnable = 0
@@ -90,6 +90,10 @@ If BoxID = 172644 Then
 	Var MilkChoiceVeganEnable = 1
 EndIf
 
+If ConfigNumer = 1581 Then
+	Var PepweenEnable = 0
+EndIf
+
 
 Var GameEnableFromTrickerEv = 1
 

xml/page_board.xml

@@ -1000,7 +1000,12 @@
 
 			Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
 			
-			DEBUGVAR NETCORE_EVENT_CNT_X
+			If NETCORE_EVENT_CNT_X = 30 Then
+				DEBUGVAR NETCORE_EVENT_CNT_X
+			EndIf
+			If NETCORE_EVENT_CNT_X = 90 Then
+				DEBUGVAR NETCORE_EVENT_CNT_X
+			EndIf
 
 			If NETCORE_EVENT_CNT_X > 300 Then
 				Var stop_now = "true"

xml/page_brewing3.xml

@@ -9,6 +9,7 @@
 
 	Var GetMoreStrawCount = 3
 
+	Var CountUpWhenBREW_CNT = 0
 	DEBUGVAR TxRef1
 
 	SAVELOG "page_brewing3.xml"
@@ -809,6 +810,22 @@
 	EndIf
 	
 
+	If BREW_CNT = 0 Then
+		If CountUpWhenBREW_CNT > 56 Then
+			Var CountUpWhenBREW_CNT = 0
+			Var drink_success_set = "-"
+			READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+			DEBUGVAR drink_success_set
+			If drink_success_set = "1" Then
+				Var MachineState_Result = 1
+			EndIf
+
+		EndIf
+
+		Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
+
+	EndIf
+
 	If Timeout > 480 Then
 		SAVELOG " Timeout > 480"
 		Var MachineState_Result = 2

xml/page_drinkok.xml

@@ -180,6 +180,7 @@
 	EndIf
 
 
+	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
 
 </EventOpen>
 <Timeout> 500 </Timeout>

xml/page_topping_select5.xml

@@ -48,7 +48,7 @@
 	Var CHECK_EventOpen_Double = 0
 
 	If RecipeTag3 = "CoffeePlay" Then
-		;Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
 	EndIf
 
 	If BoxID = 200001 Then

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.74"
+	Var XMLPageVersion = "7.75"
-	Var XMLPageVersionInt = 774
+	Var XMLPageVersionInt = 775
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>