release 7.19

xml/menu_catalog_default_init.lxml

@@ -5,6 +5,8 @@
 
 
     DEBUGVAR LanguageShow
+    DEBUGVAR CountryName
+    
     If LanguageShow = "ENG" Then 
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"

xml/menu_catalog_new.lxml

@@ -94,6 +94,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_board.xml

@@ -645,15 +645,11 @@
 
 		Var InternationalEnable = 0
 		Var InternationalEnableStr = "false"
-		READ_FILE "/mnt/sdcard/coffeevending/InternationalEnable" InternationalEnableStr
-
-		If InternationalEnableStr = "true" Then
-			Var InternationalEnable = 1
-		EndIf
-
-
 		
 
+		If CountryName = "Malaysia" Then
+			Var InternationalEnable = 1
+		EndIf
 		DEBUGVAR InternationalEnable
 
 
@@ -810,8 +806,12 @@
 
 
 				Var OpenFromPageBoard = 1
-				TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+
-        
+				If InternationalEnable = 1 Then
+					OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.lxml"
+				Else
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+        		EndIf
 	    	
 				Machine DoorClose
 
@@ -989,17 +989,13 @@
 
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
 		Else
-
+			If InternationalEnable = 1 Then
-			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
-			
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+			EndIf
 		
 		EndIf
-		
-		
-
-		If TermTemOnline = "true" Then
-			OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"
-		EndIf
 
 	EndIf
 
@@ -1060,12 +1056,14 @@
 	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"
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+	Else
+		If InternationalEnable = 1 Then
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
 		Else
-
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
-		
 		EndIf
+	EndIf
 	If TermTemOnline = "true" Then
 		OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"
 	EndIf

xml/page_catalog_group_appfast.lxml

@@ -242,6 +242,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_appfast.skt

@@ -40,7 +40,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_cocktail.lxml

@@ -234,6 +234,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_cocktail.skt

@@ -31,7 +31,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_coffee.lxml

@@ -234,6 +234,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_coffee.skt

@@ -31,7 +31,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_forkid.lxml

@@ -243,6 +243,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_forkid.skt

@@ -41,7 +41,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_health.lxml

@@ -234,6 +234,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_health.skt

@@ -32,7 +32,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_milk.lxml

@@ -15,6 +15,8 @@
 
 
     DEBUGVAR LanguageShow
+    DEBUGVAR CountryName
+    
     If LanguageShow = "ENG" Then 
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
@@ -224,6 +226,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_milk.skt

@@ -29,7 +29,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_oreo.skt

@@ -27,7 +27,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_other.lxml

@@ -233,6 +233,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_other.skt

@@ -31,7 +31,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_recommend.lxml

@@ -251,6 +251,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_recommend.skt

@@ -48,7 +48,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_songkran.skt

@@ -27,7 +27,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_tea.lxml

@@ -234,6 +234,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_tea.skt

@@ -32,7 +32,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/page_catalog_group_whey.lxml

@@ -239,6 +239,13 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
+   If CountryName = "Malaysia" Then
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var ice_tab_text =  "Ice will be ready at "
+    EndIf
+
     RefreshAll
 </EventLanguageOnChange>
 

xml/page_catalog_group_whey.skt

@@ -37,7 +37,7 @@
 
 
 <?hurr 
-    #include=menu_catalog_inc.py
+    #include=menu_catalog_new.py
 ?>
 
 

xml/topview2.xml

@@ -5,9 +5,18 @@
 <EventOpen>
 	Var Top2Timeout = 0
 
+	Var lang_icon_file_name[0] = "bn_eng_lang.png"
+	Var lang_icon_file_name[1] = "bn_thai_lang.png"
+	Var lang_icon_file_name[2] = "bn_japan_lang.png"
+	Var lang_icon_file_name[3] = "bn_china_lang.png"
 
-	Var LanguageButtonEnable = "Invisible"
+
+	Var LanguageButtonEnable = "Enable"
 	Var LanguageButtonListEnable = "Invisible"
+	
+	Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+	Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -27,6 +36,8 @@
 		Refresh
 	EndIf
 
+	DEBUGVAR langfn
+
 	TimerReset
 
 </EventTimeout>
@@ -47,7 +58,7 @@
 <Y> 438 </Y>
 <State> LanguageButtonEnable </State>
 <Name> "LangIcon" </Name>
-<Filename> "ROOT/taobin_project/image/lang/world.png" </Filename>
+<Filename> langfn </Filename>
 <EventClick>
 	Var LanguageButtonListEnable = "Enable"
 	DEBUGVAR LanguageButtonListEnable
@@ -89,8 +100,10 @@
 	<State> "Enable" </State>
 	<Filename> "ROOT/taobin_project/image/lang/bn_thai_lang.png" </Filename>
 	<EventClick>
-		SetLanguage "THAI"
 		Var LanguageButtonListEnable = "Invisible"	
+		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
+		SetLanguage "THAI"
 		Refresh
 	</EventClick>
 	</Button>
@@ -112,6 +125,8 @@
 	<EventClick>
 		SetLanguage "ENG"
 		Var LanguageButtonListEnable = "Invisible"	
+		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
 		Refresh
 	</EventClick>
 	</Button>
@@ -134,6 +149,8 @@
 	<EventClick>
 		SetLanguage "JAPAN"
 		Var LanguageButtonListEnable = "Invisible"	
+		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
 		Refresh
 	</EventClick>
 	</Button>
@@ -156,6 +173,9 @@
 	<EventClick>
 		SetLanguage "CHINA"
 		Var LanguageButtonListEnable = "Invisible"	
+
+		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
 		Refresh
 	</EventClick>
 	</Button>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.18"
+	Var XMLPageVersion = "7.19"
-	Var XMLPageVersionInt = 718
+	Var XMLPageVersionInt = 719
 </EventOpen>
 
 <Text>