add image

inter/tha/menu/lang.tsv

@@ -218,15 +218,19 @@
 							
 							
 							
-	Page_before_check_member						
-		Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72	Font=Kanit,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72	Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center,LineHeight=86
-002001		Please enter your mobile number\nto topup Tao bin credit.	กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต				Tao bin ခရက်ဒစ်ငွေဖြည့်ရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
-002002		Please enter your mobile number\nto check reward point.	กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ				ဆုလာဘ်အမှတ်ကို စစ်ဆေးရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
-002003		Please enter your mobile number\nto change password.	กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน				စကားဝှက်ပြောင်းရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်ပါ။
-	Topup						
-		Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72	Font=Kanit,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72	Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center,LineHeight=86
-002004		Top up phone	เติมเงินมือถือ				ဖုန်းငွေဖြည့်ပါ။
-002005		Reward Points / Top up credit	เติมเงินเข้าเครดิต / เช็คคูปองสะสม				ဆုအမှတ်များ / ငွေဖြည့်ခရက်ဒစ်
+							
+							
+							
+							
+							
+							
+							
+							
+							
+							
+							
+							
+							
 							
 							
 							

inter/tha/xml/multi/event/script_common_for_open_promotion_xml.ev

@@ -22,6 +22,7 @@ EndIf
 If OpenFromPageBoard = 1 Then
 	If EnableMultiInstance = "true" Then
 		OpenInst 2 RecommendPageMulti
+		OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 	Else
 		OpenInst 2 RecommendPage
 	EndIf

inter/tha/xml/multi/menu_catalog_default_init.lxml

@@ -75,9 +75,23 @@
         Var Menu21Selected2 = "Invisible"
 
         Var MenuVSelected2 = "Invisible"
+
+        If InternationalEnable = 1 Then
+            If CountryName = "Thailand" Then
+
+            EndIf
+        Else
+
+        EndIf
         If SpiralOnline = "true" Then 
             If Seeker =  "curr" Then
-                Var MenuVSelected2 = "Enable"
+                If InternationalEnable = 1 Then
+                    If CountryName = "Thailand" Then
+                        ;do not thing
+                    EndIf
+                Else
+                    Var MenuVSelected2 = "Enable"
+                EndIf
             EndIf
         EndIf 
         

inter/tha/xml/multi/page_catalog.lxml

@@ -192,11 +192,6 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
 
-    Var ButtonLanguageCurrentXPosition = 1005
-    Var ButtonLanguageCurrentYPosition = 458 - 38
-
-    Var ButtonLanguageListXPosition = 970  
-    Var ButtonLanguageListYPosition = 450 - 38
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -602,10 +597,17 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	Var CheckMemberPage = "ROOT/taobin_project/xml/page_check_member.xml"
+	Var CheckMemberPage = "ROOT/taobin_project/xml/page_before_check_member.xml"
 	Open CheckMemberPage
 	
 </EventClick>
+<Language>
+	<ID> 002005 </ID>
+	<X> 20 </X>
+	<Y> 25 </Y>
+	<Width> 400 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
@@ -623,6 +625,13 @@
 	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
 	
 </EventClick>
+<Language>
+	<ID> 002004 </ID>
+	<X> 70 </X>
+	<Y> 25 </Y>
+	<Width> 200 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
@@ -789,7 +798,7 @@
 
 <EventUnitTest6>
 
-	Open "ROOT/taobin_project/xml/page_topup_credit3-TopupQR.xml"
+	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
 </EventUnitTest6>
 
 <EventUnitTest7>

inter/tha/xml/multi/page_catalog_group_recommend.lxml

@@ -39,7 +39,6 @@
     EndIf
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
-	RootLayoutVisible 3 "show"
      RootLayoutVisible 13 "show"
     
     

inter/tha/xml/multi/page_catalog_group_recommend.skt

@@ -41,7 +41,8 @@
     EndIf
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
-     RootLayoutVisible 13 "show"
+    RootLayoutVisible 13 "show"
+    RootLayoutVisible 3 "show"
     
     
     SetInstanceIgnoreTouch

inter/tha/xml/multi/tab_menu.lxml

@@ -68,7 +68,7 @@
             RootLayoutVisible 3 "hide"
             RootLayoutVisible 13 "hide"
     
-            TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
         </EventClick>
         </Button>
 

xml/page_before_check_member.xml

@@ -44,6 +44,7 @@
             SetLanguage "THAI"
         EndIf
 
+        RootLayoutVisible 3 "show"
 
 
 
@@ -140,9 +141,9 @@
 
 
     <Text>
-        <X> 199 </X>
+        <X> 100 </X>
         <Y> 560 </Y>
-        <Width> 680 </Width>
+        <Width> 900 </Width>
         <Height> 80 </Height>
         <Font> KanitRegularTTF </Font>
         <Size> 51 </Size>

xml/page_board.xml

@@ -1115,7 +1115,85 @@
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 	EndIf
 
+	; New mode
+	; Inter + Multi-Instance  available ./inter/tha/multi  
 
+	; Below. Pendding from XMLProfile
+	DEBUGVAR MyanmarLangEnable
+	DEBUGVAR EnableMultiInstance
+	;Var MyanmarLangEnable = "true"
+	Var MyanmarLangEnable = "false"
+	;Var MyanmarLangEnable = ""
+	
+	If MyanmarLangEnable = "" Then
+
+	Else
+		If EnableMultiInstance = "true" Then
+			If CountryName = "Thailand" Then
+				
+				Var InternationalEnable = 1
+				DEBUGVAR InternationalEnable
+
+				;TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/video/script_video.ev"
+
+				TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
+
+				;specified to unittest4
+				Var CountryRootPath = "ROOT/taobin_project/inter/tha/"
+				Var CountryShortName = "tha"
+				Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
+				DEBUGVAR OpenFileXML
+				TRY OpenFileXML
+
+				Var WebAppShow = "Invisible"
+				Var ENABLE_UAE_DUBAI = "Invisible"
+				EnableLanguage "ENG"
+				EnableLanguage "THAI"
+				EnableLanguage "MYANMAR"
+
+				If MyanmarLangEnable = "true" Then
+					EnableLanguage "MYANMAR"
+				EndIf
+				
+				SetLanguage "THAI"
+				LanguageControl "UpdateList" "-"
+				Var show_eng = "false"
+
+				;Var ShowNetworkProblemText = "Network error. Payment Cash only."
+
+				Var TextPriceMenuSize = 12
+				Var TextPriceMenuY = 266
+				Var TextPriceMenuBlendX = 180
+				Var TextPriceMenuHotX = 48
+
+				Var ShowButtonClick2 = "Invisible"
+				Var ButtontoTopupMenu = "Enable"
+
+
+				Var PriceUnitText = ""
+
+
+				Var show_eng_button_stage = "Invisible"
+
+
+				Var XButtonMember = 384
+				Var YButtonMember = 1695
+
+				If Not#LanguageLoaded = "" Then
+					LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/tha/menu/lang.tsv"
+				EndIf
+
+				Var cups_sold_text = "Cups Sold Worldwide"
+
+				Var MinPhoneNumber = 10
+				Var MaxPhoneNumber = 10
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+			
+
+			EndIf
+		EndIf
+	EndIf
 
 	DEBUGVAR InternationalEnable
 	DEBUGVAR CountryRootPath
@@ -1324,8 +1402,8 @@
 	; Below. Pendding from XMLProfile
 	DEBUGVAR MyanmarLangEnable
 	DEBUGVAR EnableMultiInstance
-	Var MyanmarLangEnable = "true"
-	;Var MyanmarLangEnable = "false"
+	;Var MyanmarLangEnable = "true"
+	Var MyanmarLangEnable = "false"
 	;Var MyanmarLangEnable = ""
 	
 	If MyanmarLangEnable = "" Then
@@ -1349,7 +1427,7 @@
 				Var WebAppShow = "Invisible"
 				EnableLanguage "ENG"
 				EnableLanguage "THAI"
-				EnableLanguage "MYANMAR"
+				;EnableLanguage "MYANMAR"
 
 				If MyanmarLangEnable = "true" Then
 					EnableLanguage "MYANMAR"
@@ -1885,7 +1963,7 @@ PRICE "Reset" "-"
 				If InternationalEnable = 1 Then
 					If CountryName = "Thailand" Then
 						SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
-						TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
+						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
 					Else
 						; show language icon
 						OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@@ -2141,8 +2219,14 @@ PRICE "Reset" "-"
 	Else
 
 		If SpiralOnline = "true" Then
-
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+			If InternationalEnable = 1 Then
+			If CountryName = "Thailand" Then
+					OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+					OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
+				EndIf
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+			EndIf
 		Else
 			If InternationalEnable = 1 Then
 				OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@@ -2233,8 +2317,14 @@ PRICE "Reset" "-"
 	Var NextPage = "-"
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	If SpiralOnline = "true" Then
-
-		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+		If InternationalEnable = 1 Then
+			If CountryName = "Thailand" Then
+				OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
+			EndIf
+		Else
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+		EndIf
 	Else
 		If InternationalEnable = 1 Then
 			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@@ -2334,7 +2424,7 @@ PRICE "Reset" "-"
 
 		If CountryName = "Thailand" Then
 			SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
-			TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
+			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
 		Else		; show language icon
 			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 			RootLayoutVisible 3 "show"

xml/page_check_member.xml

@@ -42,6 +42,7 @@
 		SetLanguage "THAI"
 	EndIf
 
+	RootLayoutVisible 3 "show"
 	
 	Var luckyDrawTicket = 0
 	Var luckyDrawAlredyGotReward = 0

xml/page_check_member1.xml

@@ -55,6 +55,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
 	EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var Ext1a = ""
     Var GetAccFlag = 0
 

xml/page_check_member2.xml

@@ -32,6 +32,8 @@
 	Else
 		SetLanguage "THAI"
 	EndIf
+
+    RootLayoutVisible 3 "show"
 	
     Var CoffeePointRank = CoffeePointRankTmp
 	;Var PointDiff = 150 - CoffeePointRank
@@ -220,6 +222,8 @@
 <EventLanguageOnChange>
 	DEBUGVAR LanguageShow
 
+    Var text5Img = "/text5.png"
+
 	If LanguageShow = "ENG" Then 
         Var DirImage = "ROOT/taobin_project/image/display_point_en"
         Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
@@ -970,6 +974,7 @@
 
         Var CouponText = "คูปองสะสม (" + CouponNum
         Var CouponText = CouponText + ")"
+
 	EndIf
 
     If LanguageShow = "MYANMAR" Then 

xml/page_check_member_point.xml

@@ -40,6 +40,8 @@
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_mmr"
 	EndIf
+
+	RootLayoutVisible 3 "hide"
 	
 	Var CoffeePointTmp = CoffeePoint
 
@@ -785,6 +787,10 @@
 		Var yPointEndDate = 1563
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var xPointEndDate = 520
+		Var yPointEndDate = 1568
+	EndIf
 
  
 </EventOpen>

xml/page_check_newmember1.xml

@@ -51,6 +51,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
     EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var Ext1a = ""
     Var GetAccFlag = 0
 

xml/page_check_newmember2.xml

@@ -51,6 +51,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
     EndIf
 
+    RootLayoutVisible 3 "hide"
+
 	Var Ext1a = "ok"
     Var GetAccFlag = 0
 

xml/page_member_topup3.xml

@@ -25,6 +25,7 @@
 		SetLanguage "THAI"
 	EndIf
 
+	RootLayoutVisible 3 "show"
 
     Var PayState1 = "Enable"
     Var PayState3 = "Enable"

xml/page_member_topupAmount.xml

@@ -32,6 +32,8 @@
 		SetLanguage "THAI"
 	EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var Ext1a = ""
 
 	Var GetAccFlag = 0

xml/page_member_topupCash.xml

@@ -25,6 +25,7 @@
 	Else
 		SetLanguage "THAI"
 	EndIf
+	RootLayoutVisible 3 "hide"
 
     Var PayState1 = "Enable"
     Var PayState3 = "Enable"

xml/page_member_topupCode.xml

@@ -40,6 +40,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
     EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var CouponNumber = ""
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml/page_payment_changePin1.xml

@@ -53,6 +53,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
     EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var Ext1a = ""
     Var GetAccFlag = 0
 	

xml/page_payment_changePin2.xml

@@ -54,6 +54,8 @@
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
     EndIf
 
+	RootLayoutVisible 3 "hide"
+
 	Var Ext1a = ""
     Var TextWaiting = ""
 	

xml/page_topup_credit3_cash_warning.xml

@@ -17,6 +17,8 @@
             Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
         EndIf
 
+        RootLayoutVisible 3 "hide"
+
 	    Var ReqPayWithCash = 0
 
     </EventOpen>