do

inter/tha/xml/multi/page_catalog_group_coffee.lxml

@@ -175,7 +175,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/multi/page_catalog_group_coffee.skt

@@ -177,7 +177,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/multi/page_catalog_group_health.lxml

@@ -112,7 +112,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/multi/page_catalog_group_health.skt

@@ -115,7 +115,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/multi/page_catalog_group_milk.lxml

@@ -113,7 +113,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/multi/page_catalog_group_milk.skt

@@ -115,7 +115,7 @@
 				Var SaveStringInst = "ShowThai"
 				Var show_eng = "true"
 			EndIf
-			If LanguageShow "MYANMAR" Then
+			If LanguageShow = "MYANMAR" Then
 				Var show_eng = "false"
 				Var SaveStringInst = "ShowMYANMAR"
 			EndIf

inter/tha/xml/page_topping_select6.lxml

@@ -883,6 +883,7 @@
 <Color> "0xeae6e1" </Color>
 </Image>
 
+<<<<<<< HEAD
 
 <EventLanguageOnChange>
 	DEBUGVAR LanguageShowByIndex
@@ -1017,6 +1018,8 @@
 
 </EventLanguageOnChange>
 
+=======
+>>>>>>> 0513de0cc4536e83554493ea2ad713e100ac8daa
 <Button>
 <X> 990 </X>
 <Y> 438 </Y>
@@ -1186,6 +1189,139 @@
 </EventClick>
 </LangSwitch>
 
+<EventLanguageOnChange>
+	DEBUGVAR LanguageShowByIndex
+	DEBUGVAR LanguageShow
+
+	If LanguageShow = "ENG" Then
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 430
+		Var text_show_normal_x = 408
+		Var text_show_blend_x = 892
+		Var SugarZeroCalPrice_X = 540
+		Var text_cancel_xc = 53
+		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
+		Var OatMilkPrice_X = 260
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+		If BGSugar = "Enable" Then
+			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
+		EndIf
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown = "Please wait a moment"
+		EndIf
+	EndIf
+	If LanguageShow = "THAI" Then
+		Var topping_shot_price_x = 600
+		Var text_x_add_oreo_price = 420
+		Var text_show_normal_x = 386
+		Var text_show_blend_x = 852
+		Var SugarZeroCalPrice_X = 495
+		Var text_cancel_xc = 53
+		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 75
+		Var OatMilkPrice_X = 220
+		If show_name_len > 0 Then
+			Var showname = showname + "###size=68"
+		EndIf
+		Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
+		EndIf
+	EndIf
+	If LanguageShow = "MYANMAR" Then 
+		Var show_eng = "true"
+		DEBUGVAR show_eng
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 430
+		Var text_show_normal_x = 568
+		Var text_show_blend_x = 903
+		Var SugarZeroCalPrice_X = 540
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
+		Var text_cancel_xc = 5
+		Var text_cancel_yc = 30
+		Var show_eng = "true"
+		Var OatMilkPrice_X = 210
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+		Var DirImage = "ROOT/taobin_project/image/topping_mmr"
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
+		EndIf
+	EndIf
+
+	;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
+	;DEBUGVAR StringToppingOatMilkWithPrice
+	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	;DEBUGVAR StringToppingOatMilkWithPrice
+
+	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
+	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
+
+	;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
+	;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
+
+	Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
+
+	Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
+
+	Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
+
+	Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
+
+
+	;Var showname = aliasName[LanguageShowByIndex]
+	;Var showdesc = aliasName[LanguageShowByIndex]
+
+	If SelectDrinkType = 1 Then
+		Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
+		Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
+	Else
+		Var showname = aliasName[LanguageShowByIndex]
+		Var showdesc = aliasName[LanguageShowByIndex]
+		
+	EndIf
+		
+
+	DEBUGVAR showname
+	DEBUGVAR showdesc
+	DEBUGVAR IndexDrinktType
+	
+	BackslashNToEnter showname
+	BackslashNToEnter showdesc
+	CRLFToSpace showname
+	CRLFToSpace showdesc
+	Var Timeout = 0
+
+	Var ButtonLanguageCurrentXPosition = 990
+	Var ButtonLanguageCurrentYPosition = 438
+	Var ButtonLanguageListXPosition = 970
+	Var ButtonLanguageListYPosition = 430
+	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+	RefreshAll
+
+</EventLanguageOnChange>
+
 ; back
 <Button>
 <X> 19 </X>
@@ -6063,19 +6199,19 @@
 <Height> 65 </Height>
 <Language>
 	<ID> 000113 </ID>
-	<SubValue> OatMilkPrice </SubValue>
+	;<SubValue> OatMilkPrice </SubValue>
 </Language>
 </Text>
 
-;<Text>
+<Text>
-;<X> OatMilkPrice_X </X>
+<X> OatMilkPrice_X </X>
-;<Y> 77 </Y>
+<Y> 77 </Y>
-;<Font> KanitRegularTTF </Font>
+<Font> KanitRegularTTF </Font>
-;<State> "Enable" </State>
+<State> "Enable" </State>
-;<Size> 28 </Size>
+<Size> 28 </Size>
-;<Color> 0x84776F </Color>
+<Color> 0x84776F </Color>
-;<Value> OatMilkPrice </Value>
+<Value> OatMilkPrice </Value>
-;</Text>
+</Text>
 
 </Block>
 ;
@@ -7629,7 +7765,6 @@
 	DEBUGVAR Seeker.selected_a_drink
 
 	; Set drink
-
 	If Seeker = "curr" Then
 
 		;include="ROOT/taobin_project/inc/select_drink_current.inc"

menu/new-layout.tsv

@@ -1111,8 +1111,8 @@ IGNORE		เซเว่นอัพคุกกี้บัตเตอร์ป
 
 Name=OVALTINE
 IGNORE		โอวัลติน	OVALTINE	โอวัลติน นม โกโก้ และน้ำตาล 	OVALTINE, MILK, COCOA, AND SUGAR	12-03-01-0019	12-03-02-0019	12-03-03-0019
-IGNORE		โอวันตินรถโรงเรียนภูเขาไฟ	MINI BUS OVANTINE VOLCANO	โอวัลติน นม โกโก้ และน้ำตาล 	OVALTINE, MILK, COCOA, AND SUGAR	-	-	12-03-03-0094
+IGNORE		โอวัลตินรถโรงเรียนภูเขาไฟ	MINI BUS OVANTINE VOLCANO	โอวัลติน นม โกโก้ และน้ำตาล 	OVALTINE, MILK, COCOA, AND SUGAR	-	-	12-03-03-0094
-IGNORE		โอวันตินรถโรงเรียนซุปเปอร์ภูเขาไฟ	MINI BUS OVANTINE SUPER VOLCANO	โอวัลติน นม โกโก้ และน้ำตาล 	OVALTINE, MILK, COCOA, AND SUGAR	-	-	12-03-03-0095
+IGNORE		โอวัลตินรถโรงเรียนซุปเปอร์ภูเขาไฟ	MINI BUS OVANTINE SUPER VOLCANO	โอวัลติน นม โกโก้ และน้ำตาล 	OVALTINE, MILK, COCOA, AND SUGAR	-	-	12-03-03-0095