Merged

inter/tha/xml/multi/page_catalog.lxml

@@ -196,6 +196,7 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
 
+<<<<<<< HEAD
 	Var ButtonLanguageCurrentXPosition = 1005
     Var ButtonLanguageCurrentYPosition = 458 - 38
 
@@ -205,6 +206,16 @@
 	Var SelectedMenu = ""
 	Var MultiProcess = "Invisible"
 
+=======
+	;for test!!!!!!!!!!!!!!!
+	If InternationalEnable = 1 Then
+		If CountryName = "Thailand" Then
+			Var ShowButtonClick2 = "Enable"
+			Var ButtontoTopupMenu = "Enable"
+		EndIf
+	EndIf
+
+>>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -725,10 +736,21 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	Var CheckMemberPage = CountryRootPath + "xml/page_check_member.lxml"
+	Var CheckMemberPage = "ROOT/taobin_project/xml/page_before_check_member.xml"
 	Open CheckMemberPage
 	
 </EventClick>
+<<<<<<< HEAD
+=======
+<Language>
+	<ID> 002005 </ID>
+	<X> 20 </X>
+	<Y> 25 </Y>
+	<Width> 400 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+>>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
 
 <Button>
 <X> 696 </X>
@@ -915,13 +937,43 @@
 
 	Var Top2Timeout = 19
 	DEBUGVAR CountDownBrewing
-	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml"
+	;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml"
 </EventUnitTest2>
 ; Initial for jump to page_brewing3.xml
 <EventUnitTest3>
+<<<<<<< HEAD
 	
 </EventUnitTest3>
 
+=======
+	;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml"
+
+	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+</EventUnitTest3>
+
+<EventUnitTest5>
+
+
+	Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
+</EventUnitTest5>
+
+<EventUnitTest6>
+
+	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+</EventUnitTest6>
+
+<EventUnitTest7>
+
+
+	Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml"
+</EventUnitTest7>
+
+<EventUnitTest8>
+
+
+	Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
+</EventUnitTest8>
+>>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
 
 
 </Popup>