Merge

inter/tha/xml/page_topping_select6.lxml

@@ -895,6 +895,7 @@
 		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
@@ -918,6 +919,7 @@
 		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
@@ -942,6 +944,7 @@
 		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
@@ -954,8 +957,10 @@
 		EndIf
 	EndIf
 
-	;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
+	Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
-	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	DEBUGVAR StringToppingOatMilkWithPrice
+	Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	DEBUGVAR StringToppingOatMilkWithPrice
 
 	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
 	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
@@ -2813,7 +2818,7 @@
 
 	Var high_light_drink_type = "Invisible"
 
-
+	Var IndexDrinktType = 0
 
 
 </EventClick>
@@ -2871,7 +2876,7 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
-
+	Var IndexDrinktType = 1
 
 </EventClick>
 <Language>
@@ -2929,7 +2934,7 @@
 	Topping "Load" PD_CODE3
 
 
-
+	Var IndexDrinktType = 2
 
 </EventClick>
 <Language>
@@ -6071,9 +6076,20 @@
 <Height> 65 </Height>
 <Language>
 	<ID> 000113 </ID>
+	<SubValue> OatMilkPrice </SubValue>
 </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>
 ;
 ;
@@ -8436,12 +8452,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_board.xml

@@ -1117,6 +1117,9 @@
 		If EnableMultiInstance = "true" Then
 			If CountryName = "Thailand" Then
 				
+				; test payment
+				Var New_Payment = 1
+
 				Var InternationalEnable = 1
 				DEBUGVAR InternationalEnable
 
@@ -1135,7 +1138,7 @@
 				Var ENABLE_UAE_DUBAI = "Invisible"
 				EnableLanguage "ENG"
 				EnableLanguage "THAI"
-				EnableLanguage "MYANMAR"
+				;EnableLanguage "MYANMAR"
 
 				If MyanmarLangEnable = "true" Then
 					EnableLanguage "MYANMAR"
@@ -1154,6 +1157,7 @@
 
 				Var ShowButtonClick2 = "Invisible"
 				Var ButtontoTopupMenu = "Enable"
+				Var CurrentPageShowError = 0
 
 
 				Var PriceUnitText = ""

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_payment_cash.xml

@@ -1233,10 +1233,11 @@
 		Var PayState2 = "Disable"
 	EndIf
 
-	Var PayState2 = "Enable"
+	;for test
-	Var PayState3 = "Enable"
+	;Var PayState2 = "Enable"
-	Var PayState4 = "Enable"
+	;Var PayState3 = "Enable"
-	Var PayState5 = "Enable"
+	;Var PayState4 = "Enable"
+	;Var PayState5 = "Enable"
 </EventOpen>
 
 <EventActionOk>

xml/page_show_error.lxml

@@ -18,6 +18,11 @@
 	Var countClick = 0
 	Var countClick2 = 0
 
+	If InternationalEnable = 1 Then
+		If CountryName = "Thailand" Then
+			Var CurrentPageShowError = 1
+		EndIf
+	EndIf
 
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
@@ -198,7 +203,7 @@
 
 	Function 2
 
-	Refresh
+	RefreshAll
 </EventLanguageOnChange>
 
 <Function2>

xml/page_thankyou.xml

@@ -69,6 +69,13 @@
 		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_en"
+	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
@@ -108,6 +115,10 @@
 		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"
 
@@ -282,12 +293,25 @@
 		Else
 			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 		EndIf
+<<<<<<< HEAD
 	Else
+=======
+		If LanguageShow = "MYANMAR" Then 
+			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
+		EndIf
+	Else 
+>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
 		If CupChecking = "true" Then
 			If show_eng = "true" Then
 				Var MachineErrorDetailAll = " Please take a cup."
 			Else
 				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
+<<<<<<< HEAD
+=======
+			EndIf 
+			If LanguageShow = "MYANMAR" Then 
+				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
+>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
 			EndIf
 		Else
 			If show_eng = "true" Then
@@ -295,6 +319,9 @@
 			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/topview2.xml

@@ -219,17 +219,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