diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml index ef2f5af6..43431e57 100644 --- a/inter/mys/xml/page_catalog_group_tea.lxml +++ b/inter/mys/xml/page_catalog_group_tea.lxml @@ -8331,7 +8331,7 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH PEACH" + Var aliasName[4] = "THAI TEH PEACH" Var aliasDesc[4] = "Teh Thai, Pic Sirap dan Air" Var aliasName[5] = "" Var aliasDesc[5] = "" @@ -8422,7 +8422,7 @@ ชาพีช PEACH TEA ชาพีช - TEH PEACH + THAI TEH PEACH ชาพีช @@ -8598,15 +8598,15 @@ Var PD_CODE3 = "##-##-##-####" ; begin lang Var aliasName[0] = "PEACH JASMINE TEA" - Var aliasDesc[0] = "Jasmine Tea, Peach Syrup &Milk" + Var aliasDesc[0] = "Jasmine Tea, Peach Syrup & Water" Var aliasName[1] = "ชามะลิพีช" Var aliasDesc[1] = "ชามะลิ และน้ำเชื่อมพีช" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH SUSU PEACH" - Var aliasDesc[4] = "Teh Jasmin, Pic Sirap dan Susu" + Var aliasName[4] = "JASMINE TEH PEACH" + Var aliasDesc[4] = "Teh Jasmin, Pic Sirap dan air" Var aliasName[5] = "" Var aliasDesc[5] = "" Var NameLang[0][0] = "" @@ -8627,11 +8627,11 @@ Var NameLang[1][3] = "" Var NameLang[1][4] = "Iced PEACH JASMINE TEA" Var NameLang[1][5] = "" - Var DescLang[1][0] = "Jasmine Tea, Peach Syrup &Milk" + Var DescLang[1][0] = "Jasmine Tea, Peach Syrup" Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" - Var DescLang[1][4] = "Jasmine Tea, Peach Syrup &Milk" + Var DescLang[1][4] = "Jasmine Tea, Peach Syrup" Var DescLang[1][5] = "" Var NameLang[2][0] = "" Var NameLang[2][1] = "" @@ -8696,7 +8696,7 @@ ชามะลิพีช PEACH JASMINE TEA ชามะลิพีช - TEH SUSU PEACH + JASMINE TEH PEACH ชามะลิพีช @@ -8708,11 +8708,11 @@ KanitMediumTTF 0x6F5F51 - Jasmine Tea, Peach Syrup &Milk + Jasmine Tea, Peach Syrup & Water ชามะลิ และน้ำเชื่อมพีช - Jasmine Tea, Peach Syrup &Milk + Jasmine Tea, Peach Syrup & Water ชามะลิ และน้ำเชื่อมพีช - Teh Jasmin, Pic Sirap dan Susu + Teh Jasmin, Pic Sirap dan air ชามะลิ และน้ำเชื่อมพีช diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index 047bf645..1de0956e 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -757,7 +757,7 @@ TextID Note English Thai 800660 Bucket กระบะ 800661 Shutter ชัตเตอร์ 800662 Motor แกนมอเตอร์ - +800663 Whipper clean water น้ำล้างหัวชง diff --git a/inter/whatthecup/common/video/video_main_wtc_new.mp4 b/inter/whatthecup/common/video/video_main_wtc_new.mp4 new file mode 100644 index 00000000..5655ec2b Binary files /dev/null and b/inter/whatthecup/common/video/video_main_wtc_new.mp4 differ diff --git a/inter/whatthecup/sgp/xml/page_catalog.lxml b/inter/whatthecup/sgp/xml/page_catalog.lxml index 3de2319a..dd408528 100644 --- a/inter/whatthecup/sgp/xml/page_catalog.lxml +++ b/inter/whatthecup/sgp/xml/page_catalog.lxml @@ -22,7 +22,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + TopView "show" ; On open @@ -41,16 +41,16 @@ Var web_telnumOK = "" Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" - - If CocktailShow = "true" Then - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + + If CocktailShow = "true" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" EndIf - + If TermTemOnline = "true" Then Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" EndIf - - If Seeker = "curr" Then + + If Seeker = "curr" Then Machine DoorLidClose EndIf @@ -59,11 +59,11 @@ CoinVending OFF - + ; Clear value Topping "clear" "-" - + Var DirImage = "ROOT/taobin_project/image/page2_inter/" If UsePepsiTheme = 1 Then @@ -71,7 +71,7 @@ Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName Var DirImage = DirImage + "/image/page2_en/" EndIf - + Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" @@ -100,7 +100,7 @@ ;GenHashWithTimeStamp QRCODE99x WEB "ENABLE" - + Else Var ShowNetworkProblem = "Enable" Var ShowButtonClick2 = "Invisible" @@ -116,9 +116,9 @@ Var ShowNetworkProblem = "Invisible" Var ShowNetworkProblemText = "" EndIf - + ; 1035 is Coke. - STRCONTAIN "1035" MaterialAvailable CokeUI + STRCONTAIN "1035" MaterialAvailable CokeUI Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" @@ -133,8 +133,8 @@ Var QRCODE99_Y = 1718 Var showCart = "Invisible" - If MultiPayEnable = "true" Then - + If MultiPayEnable = "true" Then + If CART_COUNT = 1 Then Var showCart = "Enable" Var cart_image_bn = DirImageCart + "/bn_cart1.png" @@ -143,7 +143,7 @@ Var QRCODE99_Y = 1580 EndIf - + If CART_COUNT = 2 Then Var showCart = "Enable" Var cart_image_bn = DirImageCart + "/bn_cart2.png" @@ -153,7 +153,7 @@ EndIf - + If CART_COUNT = 3 Then Open "ROOT/taobin_project/xml/page_payment_multi.xml" @@ -169,10 +169,10 @@ If XMLProfile = "taobin_notopup" Then Var ButtontoTopupMenu = "Disable" - + EndIf - + Var menu_name_eng_hot = "" Var menu_desc_eng_hot = "" Var menu_name_thai_hot = "" @@ -190,12 +190,12 @@ Var menu_desc_thai_blender = "" - - - If BoxID = 0 Then + + + If BoxID = 0 Then RebootWithCause "BoxID was zero" EndIf - + DEBUGVAR ShowButtonClick2 @@ -212,7 +212,7 @@ 1000 - + ;SAVELOG SoundPlaying @@ -221,15 +221,15 @@ EndIf If countDownRetrun = 0 Then - If Seeker = "next" Then + If Seeker = "next" Then RootLayoutVisible 3 "hide" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf EndIf - + ; zone cup on arm If CupOnArm = "true" Then @@ -250,10 +250,10 @@ Refresh TimerReset - + - ;If ChangeStatus = "payout-end" Then + ;If ChangeStatus = "payout-end" Then ; Var ChangeOK = 1 ;EndIf @@ -266,15 +266,15 @@ Cart "DeleteMenuID" "ALL" Var web_readyOK = web_ready Var web_telnumOK = web_telnum - - + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" EndIf - + Else EndIf - + @@ -295,12 +295,12 @@ If LanguageShow = "MALAY" Then Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" EndIf - + If LanguageShow = "THAI" Then Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" EndIf - - Play PlaySoundLag + + Play PlaySoundLag Var countDownRetrun = 300 Var LanguageButtonEnable = "Enable" @@ -323,10 +323,10 @@ "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - If Seeker = "next" Then + + If Seeker = "next" Then RootLayoutVisible 3 "hide" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf @@ -362,11 +362,11 @@ Var(DirImage + "/bp_diy.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - If CountryName = "Thailand" Then + If CountryName = "Thailand" Then TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" Else Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" @@ -390,19 +390,19 @@ Var(DirImage + "/bp_coffee.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" Else Open OpenFileXML EndIf @@ -425,17 +425,17 @@ Var(DirImage + "/bp_tea.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" Else Open OpenFileXML EndIf @@ -456,17 +456,17 @@ Var(DirImage + "/bp_cho_caramel.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" Else Open OpenFileXML EndIf @@ -489,17 +489,17 @@ Var(DirImage + "/bn_kidmenu.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -521,17 +521,17 @@ Var(DirImage + "/bp_appfast.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML EndIf @@ -554,17 +554,17 @@ bpSodaAndOther "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf @@ -595,12 +595,12 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML EndIf @@ -624,18 +624,18 @@ Var(DirImage + "/bp_HealthyOption.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var TextOnCatalogColor = ButtonTextPressedColor2 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" - - + + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -661,11 +661,11 @@ Var(DirImage + "/bp_main_page_member.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng Var CheckMemberPage = CountryRootPath + "xml/page_check_member.lxml" Open CheckMemberPage - + @@ -678,11 +678,11 @@ Var(DirImage + "/bp_main_page_topup.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; eng Var PayDetail="" - Open "ROOT/taobin_project/xml/page_back_to_topup.xml" - + Open "ROOT/taobin_project/xml/page_back_to_topup.xml" + @@ -693,10 +693,10 @@ "0xFF0000" 1080 60 - - + + Open "ROOT/taobin_project/xml/page_camera.xml" - + @@ -722,12 +722,12 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume 400 - + + - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - + + @@ -739,7 +739,7 @@ Var web_readyOK = web_ready Var web_telnumOK = web_telnum - + Var web_app_prepar = "true" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" @@ -747,7 +747,7 @@ EndIf Else EndIf - + @@ -761,7 +761,7 @@ 500 Var(RootPath + "image/main_page_inter/bn_remove_cup.png") Var(RootPath + "image/main_page_inter/bp_remove_cup.png") - + Machine RemoveCup Machine DoorLidOpen @@ -776,7 +776,7 @@ Var bg_lidProblem_ST = "Invisible" Var GetLidButtonState2 = "Enable" Var bg_lidProblem_ST2 ="Invisible" - + Var EnableGetMoreStrawFileName2 = "Enable" Var bg_strawProblem_ST2 ="Invisible" @@ -786,7 +786,7 @@ Var bg_lidProblem_ST = "Enable" Var GetLidButtonState2 = "Invisible" Var bg_lidProblem_ST2 ="Enable" - + Var XStraw = 376 Var EnableGetMoreStrawFileName2 = "Invisible" Var bg_strawProblem_ST2 ="Enable" @@ -800,7 +800,7 @@ Var CountDownBrewing = 122 Var MachineStage = "testing" Var BREW_CNT = 122 - + Var InternationalEnable = 1 DEBUGVAR InternationalEnable Var LanguageObjectShow = "Enable" @@ -813,7 +813,9 @@ ; Initial for jump to page_brewing3.xml - + Var buttonRemoveCup = "Enable" + DEBUGVAR buttonRemoveCup + diff --git a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml index 3efe6a6c..9f643d59 100644 --- a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml +++ b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml @@ -1536,6 +1536,8 @@ 374 382 + 361 + 466 OverlayMenuFilter diff --git a/xml/page_board.xml b/xml/page_board.xml index 5bdcc77e..d4c91ebb 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1102,7 +1102,7 @@ EndIf ; New mode - ; Inter + Multi-Instance available ./inter/tha/multi + ; Inter + Multi-Instance available ./inter/tha/multi ; Below. Pendding from XMLProfile DEBUGVAR MyanmarLangEnable @@ -1110,13 +1110,13 @@ ;Var MyanmarLangEnable = "true" Var MyanmarLangEnable = "false" ;Var MyanmarLangEnable = "" - + If MyanmarLangEnable = "" Then Else If EnableMultiInstance = "true" Then If CountryName = "Thailand" Then - + ; test payment Var New_Payment = 1 @@ -1143,7 +1143,7 @@ If MyanmarLangEnable = "true" Then EnableLanguage "MYANMAR" EndIf - + SetLanguage "THAI" LanguageControl "UpdateList" "-" Var show_eng = "false" @@ -1179,7 +1179,7 @@ Var MaxPhoneNumber = 10 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" - + EndIf EndIf @@ -1463,7 +1463,7 @@ Var MinPhoneNumber = 10 Var MaxPhoneNumber = 10 - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1483,7 +1483,7 @@ ;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png" Var img_press_main_page = "" - Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4" + Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc_new.mp4" Var ShowButtonClickFull = "Enable" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index fcb7e806..77546d3d 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -23,14 +23,7 @@ EndIf If CountryName = "Malaysia" Then - DEBUGVAR FromFruityRaya - DEBUGVAR FromProThaiTea - DEBUGVAR FromProYuzu - - Var FromFruityRaya = 0 - Var FromProThaiTea = 0 - Var FromProYuzu = 0 - Var FromProYuzu250 = 0 + Var ShowButtonClick2 = "Invisible" EndIf If UsePepsiTheme = 1 Then @@ -215,6 +208,11 @@ EndIf + If CountryName = "Malaysia" Then + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" + EndIf + DEBUGVAR ShowButtonClick2 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index e454033d..491a53f5 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -48,6 +48,7 @@ ;inter-xml-open If CountryName = "Australia" Then + DEBUGVAR CancelFlag Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml" EndIf @@ -3595,4 +3596,4 @@ eval( - \ No newline at end of file +