GBR: Update missing drink images

inter/gbr/menu/lang.tsv

@@ -100,10 +100,10 @@ TextID	Note	English	Thai
 000065		Sweetness level	ระดับความหวาน
 000066		Straw and Lid	หลอด และ ฝา
 000067		Drink Type	ประเภทเครื่องดื่ม
-
-
 000103		Vegan substitution	นมทางเลือก
 
+
+
 		Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
 000105		Sugar	น้ำตาล
 		Font=Kanit,Type=Regular,Size=23,Color=0x513C2F

inter/gbr/xml/menu_catalog_default_init.lxml

@@ -7,36 +7,11 @@
     DEBUGVAR LanguageShow
     DEBUGVAR CountryName
 
-    If LanguageShow = "ENG" Then
+    Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+    Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+    Var DirImageAlterMilk = "ROOT/taobin_project/inter/gbr/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+    Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+    Var ice_tab_text =  "Ice will be ready at "
-
-    EndIf
-    If LanguageShow = "THAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var DirImage = "ROOT/taobin_project/image/page3"
-    EndIf
-
-    ;inter-image
-    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
-
-
-    ;inter-image
-    If CountryName = "United kingdom" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        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
 
 
     If ICE_PROCESS_STATUS = 2 Then

inter/gbr/xml/menu_catalog_new.lxml

@@ -99,48 +99,6 @@
     TimerReset
 </EventTimeout>
 
-<EventLanguageOnChange>
-    DEBUGVAR LanguageShow
-    If LanguageShow = "ENG" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
-    EndIf
-    If LanguageShow = "THAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
-    ;inter-image
-   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
-    ;inter-image
-   If CountryName = "United kingdom" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/gbr/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
-
-    SAVELOG "EventLanguageOnChange menu -list"
-
-    Refresh
-
-    Var LanguageButtonEnable = "Enable"
-    Var ButtonLanguageCurrentXPosition = 990
-    Var ButtonLanguageCurrentYPosition = 438 - 38
-
-    Var ButtonLanguageListXPosition = 970
-    Var ButtonLanguageListYPosition = 430 - 38
-    OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-
-
-</EventLanguageOnChange>
-
 
 ; under line
 <Image>

inter/gbr/xml/page_catalog_group_other.lxml

@@ -2748,13 +2748,13 @@
 	<State> Flag( 55-05-02-0114.Button,$Sum5505020114) </State> 
 	<Button>
 	<State> $Sum5505020114 </State> 
-	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_iced_pepsi_coconut.png" </Filename>
+	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_Pepsi_Coconut.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_Pepsi_Coconut.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_Pepsi_Coconut.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_Pepsi_Coconut.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $55-05-02-0114.Price
@@ -3558,13 +3558,13 @@
 	<State> Flag( 55-05-02-0150.Button,55-05-03-0150.Button,$Sum55050201505505030150) </State> 
 	<Button>
 	<State> $Sum55050201505505030150 </State> 
-	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_Pepsi Caramel.png" </Filename>
+	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_Pepsi_Caramel.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_Pepsi Caramel.png" </FilenamePress>
+	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_Pepsi_Caramel.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </FilenameDisable>
+	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $55-05-02-0150.Price