diff --git a/inter/gbr/image/page_disable_n2/bn_Pepsi_Caramel.png b/inter/gbr/image/page_disable_n2/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..327d6ae3 Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_Pepsi_Caramel.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_Pepsi_Coconut.png b/inter/gbr/image/page_disable_n2/bn_Pepsi_Coconut.png new file mode 100644 index 00000000..a7ac7f57 Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_Pepsi_Coconut.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_Pepsi_Lime.png b/inter/gbr/image/page_disable_n2/bn_Pepsi_Lime.png new file mode 100644 index 00000000..39caff1b Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_Pepsi_Lime.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_Pepsi_Strawberry.png b/inter/gbr/image/page_disable_n2/bn_Pepsi_Strawberry.png new file mode 100644 index 00000000..870db2e1 Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_Pepsi_Strawberry.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_Pepsi_Tropical.png b/inter/gbr/image/page_disable_n2/bn_Pepsi_Tropical.png new file mode 100644 index 00000000..3bb4e11f Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_Pepsi_Tropical.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_iced_pepsi_extra.png b/inter/gbr/image/page_disable_n2/bn_iced_pepsi_extra.png new file mode 100644 index 00000000..c9df8b2c Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_iced_pepsi_extra.png differ diff --git a/inter/gbr/image/page_disable_n2/bn_peach_pepsi.png b/inter/gbr/image/page_disable_n2/bn_peach_pepsi.png new file mode 100644 index 00000000..08ed7c1c Binary files /dev/null and b/inter/gbr/image/page_disable_n2/bn_peach_pepsi.png differ diff --git a/inter/gbr/image/page_drink_n/bn_Pepsi_Caramel.png b/inter/gbr/image/page_drink_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..baf78d2f Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_Pepsi_Caramel.png differ diff --git a/inter/gbr/image/page_drink_n/bn_Pepsi_Coconut.png b/inter/gbr/image/page_drink_n/bn_Pepsi_Coconut.png new file mode 100644 index 00000000..d3e21b56 Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_Pepsi_Coconut.png differ diff --git a/inter/gbr/image/page_drink_n/bn_Pepsi_Lime.png b/inter/gbr/image/page_drink_n/bn_Pepsi_Lime.png new file mode 100644 index 00000000..2ee74f61 Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_Pepsi_Lime.png differ diff --git a/inter/gbr/image/page_drink_n/bn_Pepsi_Strawberry.png b/inter/gbr/image/page_drink_n/bn_Pepsi_Strawberry.png new file mode 100644 index 00000000..755c7b1b Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_Pepsi_Strawberry.png differ diff --git a/inter/gbr/image/page_drink_n/bn_Pepsi_Tropical.png b/inter/gbr/image/page_drink_n/bn_Pepsi_Tropical.png new file mode 100644 index 00000000..3e00d5b8 Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_Pepsi_Tropical.png differ diff --git a/inter/gbr/image/page_drink_n/bn_iced_pepsi_extra.png b/inter/gbr/image/page_drink_n/bn_iced_pepsi_extra.png new file mode 100644 index 00000000..fe0e40af Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_iced_pepsi_extra.png differ diff --git a/inter/gbr/image/page_drink_n/bn_peach_pepsi.png b/inter/gbr/image/page_drink_n/bn_peach_pepsi.png new file mode 100644 index 00000000..8b23ab6e Binary files /dev/null and b/inter/gbr/image/page_drink_n/bn_peach_pepsi.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Caramel.png b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..a37db971 Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Caramel.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Coconut.png b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Coconut.png new file mode 100644 index 00000000..d8266442 Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Coconut.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Lime.png b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Lime.png new file mode 100644 index 00000000..aa4ee2b0 Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Lime.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png new file mode 100644 index 00000000..23ebe748 Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Strawberry.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Tropical.png b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Tropical.png new file mode 100644 index 00000000..27c926ba Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_Pepsi_Tropical.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_iced_pepsi_extra.png b/inter/gbr/image/page_drink_picture2_n/bn_iced_pepsi_extra.png new file mode 100644 index 00000000..f46222e3 Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_iced_pepsi_extra.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_peach_pepsi.png b/inter/gbr/image/page_drink_picture2_n/bn_peach_pepsi.png new file mode 100644 index 00000000..1216e56b Binary files /dev/null and b/inter/gbr/image/page_drink_picture2_n/bn_peach_pepsi.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_Pepsi_Caramel.png b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Caramel.png new file mode 100644 index 00000000..9689d755 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Caramel.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_Pepsi_Coconut.png b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Coconut.png new file mode 100644 index 00000000..aabb11f2 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Coconut.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_Pepsi_Lime.png b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Lime.png new file mode 100644 index 00000000..019ebcc2 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Lime.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_Pepsi_Strawberry.png b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Strawberry.png new file mode 100644 index 00000000..33998223 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Strawberry.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_Pepsi_Tropical.png b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Tropical.png new file mode 100644 index 00000000..91540f43 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_Pepsi_Tropical.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_iced_pepsi_extra.png b/inter/gbr/image/page_drink_press_n/bn_iced_pepsi_extra.png new file mode 100644 index 00000000..d4d4d4d2 Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_iced_pepsi_extra.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_peach_pepsi.png b/inter/gbr/image/page_drink_press_n/bn_peach_pepsi.png new file mode 100644 index 00000000..5f536f0c Binary files /dev/null and b/inter/gbr/image/page_drink_press_n/bn_peach_pepsi.png differ diff --git a/inter/gbr/menu/lang.tsv b/inter/gbr/menu/lang.tsv index b3beacdb..ea2c2a60 100644 --- a/inter/gbr/menu/lang.tsv +++ b/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 diff --git a/inter/gbr/xml/menu_catalog_default_init.lxml b/inter/gbr/xml/menu_catalog_default_init.lxml index 42cb594b..dcec1269 100644 --- a/inter/gbr/xml/menu_catalog_default_init.lxml +++ b/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_en/" - 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 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 + 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 " If ICE_PROCESS_STATUS = 2 Then diff --git a/inter/gbr/xml/menu_catalog_new.lxml b/inter/gbr/xml/menu_catalog_new.lxml index 47e00e6b..ab864459 100644 --- a/inter/gbr/xml/menu_catalog_new.lxml +++ b/inter/gbr/xml/menu_catalog_new.lxml @@ -99,48 +99,6 @@ TimerReset - - 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" - - - - ; under line diff --git a/inter/gbr/xml/page_catalog_group_other.lxml b/inter/gbr/xml/page_catalog_group_other.lxml index 1e323080..d58642a0 100644 --- a/inter/gbr/xml/page_catalog_group_other.lxml +++ b/inter/gbr/xml/page_catalog_group_other.lxml @@ -2748,13 +2748,13 @@ Flag( 55-05-02-0114.Button,$Sum5505020114)