THAI INTER: Fix drink_fail, page_thank_you before credit, fix show_error machine state, New_payment [Myanmar layout], Add ImageDoing

inter/tha/xml/multi/page_catalog.lxml

@@ -193,12 +193,12 @@
 	RootLayoutVisible 3 "show"
 
 	;for test!!!!!!!!!!!!!!!
-	If InternationalEnable = 1 Then
+	;If InternationalEnable = 1 Then
-		If CountryName = "Thailand" Then
+		;If CountryName = "Thailand" Then
-			Var ShowButtonClick2 = "Enable"
+			;Var ShowButtonClick2 = "Enable"
-			Var ButtontoTopupMenu = "Enable"
+			;Var ButtontoTopupMenu = "Enable"
-		EndIf
+		;EndIf
-	EndIf
+	;EndIf
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -793,20 +793,19 @@
 </EventUnitTest2>
 ; Initial for jump to page_brewing3.xml
 <EventUnitTest3>
-	;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml"
 
-	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
 </EventUnitTest3>
 
 <EventUnitTest5>
 
 
-	Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
+	Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 </EventUnitTest5>
 
 <EventUnitTest6>
 
-	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Open "ROOT/taobin_project/xml/page_show_error.lxml"
 </EventUnitTest6>
 
 <EventUnitTest7>

inter/tha/xml/page_topping_select6.lxml

@@ -880,134 +880,6 @@
 <Color> "0xeae6e1" </Color>
 </Image>
 
-
-<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
-		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
-		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"
-		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( 000108, LanguageShowByIndex)
-	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
-
-	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
-	
-	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>
-
 <Button>
 <X> 990 </X>
 <Y> 438 </Y>
@@ -1177,6 +1049,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>
@@ -2217,7 +2222,7 @@
 			If SugarZeroCalEnable = "true" Then
 
 				Var SugarZeroCalPrice = 10
-				Var priceFormat = "(+฿%.0f)"
+				Var priceFormat = " (+฿%.0f)"
 				Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
 
 				Var SugarNormalCheck = "PressForever"
@@ -2812,7 +2817,7 @@
 
 	Var high_light_drink_type = "Invisible"
 
-
+	Var IndexDrinktType = 0
 
 
 </EventClick>
@@ -2870,7 +2875,7 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
-
+	Var IndexDrinktType = 1
 
 </EventClick>
 <Language>
@@ -2928,7 +2933,7 @@
 	Topping "Load" PD_CODE3
 
 
-
+	Var IndexDrinktType = 2
 
 </EventClick>
 <Language>
@@ -6073,6 +6078,16 @@
 </Language>
 </Text>
 
+<Text>
+<X> OatMilkPrice_X </X>
+<Y> 77 </Y>
+<Font> KanitRegularTTF </Font>
+<State> "Enable" </State>
+<Size> 28 </Size>
+<Color> 0x84776F </Color>
+<Value> OatMilkPrice </Value>
+</Text>
+
 </Block>
 ;
 ;
@@ -8435,12 +8450,15 @@
 	If SelectCountDrinkType = 1 Then
 		If DefaultDrinkType = 1 Then
 			Var hot_button_state = "PressForever"
+			Var IndexDrinktType = 0
 		EndIf
 		If DefaultDrinkType = 2 Then
 			Var cold_button_state = "PressForever"
+			Var IndexDrinktType = 1
 		EndIf
 		If DefaultDrinkType = 3 Then
 			Var blend_button_state = "PressForever"
+			Var IndexDrinktType = 2
 		EndIf
 
 	EndIf

xml/page_NewBrewing3.xml

@@ -119,6 +119,36 @@
 		Var XStraw = 142
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_mmr.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_mmr.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_mmr.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_mmr.png"
+
+
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
+		Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
+
+		; wait for myanmar
+		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+		;Var XStraw = 274
+		Var XStraw = 142
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var waitAckPay = 0
 	Var VendingTSIDTmp = ""
 	Var VendingTSIDProblem = ""
@@ -160,7 +190,10 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
 	EndIf
 
-	DEBUGVAR show_eng
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
+	EndIf
 
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
@@ -393,6 +426,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -419,6 +456,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -691,6 +732,9 @@
 
 				PlayLong PlaySoundLag
 			EndIf
+			If LanguageShow = "MYANMAR" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then
@@ -1416,6 +1460,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 
 
 <EventUnitTest1>

xml/page_NewBrewing3Conti.xml

@@ -19,6 +19,16 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
 	Var text_next_order = DirImage + "/text_next_order.png"
@@ -768,6 +778,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <Button>
 <X> 792 </X>
 <Y> 1787 </Y>

xml/page_brewing3.xml

@@ -305,7 +305,7 @@
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 	EndIf
 
 	DEBUGVAR show_eng
@@ -527,6 +527,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
 
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
 				; reset
@@ -552,6 +556,9 @@
 				Else
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
+				If LanguageShow = "MYANMAR" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
 
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
 
@@ -847,6 +854,9 @@
 
 				PlayLong PlaySoundLag
 			EndIf
+			If LanguageShow = "MYANMAR" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then

xml/page_brewing3Conti.xml

@@ -49,7 +49,7 @@
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
 	EndIf
 

xml/page_drinkfail2-2.xml

@@ -17,6 +17,10 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing/"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
+	EndIf
+
 	
 	Var Timeout = 0
 	StopLongPlay

xml/page_drinkfail2.xml

@@ -8,6 +8,8 @@
 <EventOpen>
 	; On open
 
+	RootLayoutVisible 3 "hide"
+
 	Var Seeker.TNumberTaobinMember = ""
 
 	

xml/page_drinkfail4.xml

@@ -17,6 +17,10 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing/"
 	EndIf
 
+    If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
+	EndIf
+
 	
 	Var Timeout = 0
     Var GetFreeFlag = 0

xml/page_lid_straw.xml

@@ -115,8 +115,8 @@
 
 			Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing_mmr/"
 			Var PictureBegin = "txt_"
-			;Var PictureEnd = "_mmr.png"
+			Var PictureEnd = "_mmr.png"
-			Var PictureEnd = "_en.png"
+			;Var PictureEnd = "_en.png"
 		EndIf
 
 	Else

xml/page_show_error.lxml

@@ -10,6 +10,12 @@
 	Var countClick = 0
 	Var countClick2 = 0
 
+	If InternationalEnable = 1 Then
+		If CountryName = "Thailand" Then
+			Var CurrentPageShowError = 1
+		EndIf
+	EndIf
+
 
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
@@ -190,13 +196,42 @@
 
 	Function 2
 
-	Refresh
+	RefreshAll
 </EventLanguageOnChange>
 
 <Function2>
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
 	Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+
+	If InternationalEnable = 1 Then
+		If CountryName = "Thailand" Then
+			If MachineStage = "show-menu" Then
+				If LanguageShow = "THAI" Then 
+					Var DirImage = "ROOT/taobin_project/image/vending_error"
+				EndIf
+				If LanguageShow = "ENG" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "JAPAN" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "CHINA" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "MALAY" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "UAE_DUBAI" Then
+					Var DirImage = CountryRootPath + "image/vending_error_en"
+				EndIf
+				If LanguageShow = "MYANMAR" Then
+					Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
 	If MachineStage = "mcu-upgrade" Then
 		If LanguageShow = "THAI" Then 
 			Var DirImage = "ROOT/taobin_project/image/vending_error"
@@ -420,7 +455,7 @@
 
 <Image>
 <State> show_error_normal </State>
-<X> 127 </X>
+<X> 0 </X>
 <Y> 1750 </Y>
 <Filename> Var(DirImage + "/text2.png") </Filename>
 </Image>
@@ -441,7 +476,7 @@
 
 <Image>
 <State> show_error_sp1 </State>
-<X> 127 </X>
+<X> 0 </X>
 <Y> 1685 </Y>
 <Filename> Var(DirImage + "/text2.png") </Filename>
 </Image>

xml/page_thankyou.xml

@@ -69,6 +69,15 @@
 		Var DirImage = "ROOT/taobin_project/image/page_thankyou"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
+	EndIf
+
+
+
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
 	DEBUGVAR BottomText

xml/page_thankyouConti.xml

@@ -48,6 +48,13 @@
 		Var BottomText = PicturePath + "text_bottom_thai2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
+	EndIf
+
 	;DEBUGVAR StarwState
 	;DEBUGVAR LidState
 	DEBUGVAR BottomText
@@ -107,6 +114,10 @@
 	Else
 		Var DirImage2 = "ROOT/taobin_project/image/complete/"
 	EndIf
+
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
+	EndIf
 	
 	Var txtDrinkOKState = "Invisible"
 	Var buttonRemoveCup = "Invisible"
@@ -280,6 +291,9 @@
 		Else
 			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 		EndIf
+		If LanguageShow = "MYANMAR" Then 
+			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
+		EndIf
 	Else 
 		If CupChecking = "true" Then
 			If show_eng = "true" Then
@@ -287,12 +301,18 @@
 			Else
 				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 			EndIf 
+			If LanguageShow = "MYANMAR" Then 
+				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
+			EndIf
 		Else
 			If show_eng = "true" Then
 				Var MachineErrorDetailAll = " Press button for take a cup."
 			Else
 				Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
 			EndIf
+			If LanguageShow = "MYANMAR" Then 
+				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
+			EndIf
 		EndIf
 	EndIf
 	

xml/page_thankyouMore.xml

@@ -39,6 +39,13 @@
 		Var BottomText = PicturePath + "text_bottom_thai2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
+	EndIf
+
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
 	DEBUGVAR BottomText

xml/sometime/page_campaign_ads_lucky_draw.xml

@@ -24,6 +24,13 @@
 
         EndIf
 
+        If LanguageShow = "MYANMAR" Then 
+            Var Extension = "_mmr.png"
+
+            Var Text_X = 233
+            Var Text_Y = 1468
+        EndIf
+
     </EventOpen>
 
     <Timeout> 1000 </Timeout>
@@ -169,4 +176,3 @@
     </EventUnitTest4>
 
 </Popup>
-

xml/topview2.xml

@@ -204,17 +204,21 @@
 		DEBUGVAR BrewCommand
         Var BrewCommand = "-"
     	If EnableMultiInstance = "true" Then
-    		InstanceOverSetString "RefreshNow" 5
+			If CurrentPageShowError = 1 Then
-    		InstanceOverSetString "RefreshNow" 6
+				;do not thing
-    		InstanceOverSetString "RefreshNow" 7
+			Else
-    		InstanceOverSetString "RefreshNow" 8
+				InstanceOverSetString "RefreshNow" 5
-    		InstanceOverSetString "RefreshNow" 9
+				InstanceOverSetString "RefreshNow" 6
-    		InstanceOverSetString "RefreshNow" 10
+				InstanceOverSetString "RefreshNow" 7
-    		InstanceOverSetString "RefreshNow" 11
+				InstanceOverSetString "RefreshNow" 8
-    		; TODO
+				InstanceOverSetString "RefreshNow" 9
+				InstanceOverSetString "RefreshNow" 10
+				InstanceOverSetString "RefreshNow" 11
+				; TODO
 
-			; Trick Refresh First
+				; Trick Refresh First
-			Var SlientRefreshIndex = 2
+				Var SlientRefreshIndex = 2
+			EndIf
 
     	EndIf
     	If Not#CountDownForMulti = 99 Then