diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv index 7688f5ac..114ca9d0 100644 --- a/inter/sgp/menu/lang.tsv +++ b/inter/sgp/menu/lang.tsv @@ -1,13 +1,14 @@ TextID Note English Thai - Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center + Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center 000001 Page catalog head Welcome ยินดีต้อนรับ - Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center + Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center 000002 Please Select Drink Type กรุณาเลือกประเภทเครื่องดื่ม - - Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 -000003 Page catalog body Best Sellers เมนูแนะนำ + Page catalog body + Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 + Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 +000003 Best Sellers เมนูแนะนำ 000004 Vending\nMachine ตู้สินค้า 000005 Coffee กาแฟ 000006 Tea ชา diff --git a/inter/sgp/video/video_main_wtc.mp4 b/inter/sgp/video/video_main_wtc.mp4 new file mode 100644 index 00000000..1378f579 Binary files /dev/null and b/inter/sgp/video/video_main_wtc.mp4 differ diff --git a/inter/whatthecup/color_settings.ev b/inter/whatthecup/color_settings.ev new file mode 100644 index 00000000..476f6269 --- /dev/null +++ b/inter/whatthecup/color_settings.ev @@ -0,0 +1,47 @@ +; +Var WTCWhiteColor = "0xFFFFFF" +Var WTCLightBlueColor = "0xD5D9F5" +Var WTCSemiLightBlueColor = "0x8092FF" +Var WTCSemiMediumBlueColor = "0x3D59FF" +Var WTCBlueColor = "0x0025FF" + +; case-1-bg-white +Var HeadlineColor1 = WTCBlueColor +Var SubHeadlineColor1 = WTCBlueColor +Var BodyTextColor1 = WTCSemiMediumBlueColor +Var ButtonPressedColor1 = WTCBlueColor +Var ButtonTextPressedColor1 = WTCWhiteColor +Var ButtonColor1 = WTCWhiteColor +Var ButtonTextColor1 = WTCBlueColor +Var ButtonDisabledColor1 = WTCLightBlueColor + +; case-2-bg-light-blue +Var HeadlineColor2 = WTCBlueColor +Var SubHeadlineColor2 = WTCBlueColor +Var BodyTextColor2 = WTCSemiMediumBlueColor +Var ButtonPressedColor2 = WTCBlueColor +Var ButtonTextPressedColor2 = WTCWhiteColor +Var ButtonColor2 = WTCWhiteColor +Var ButtonTextColor2 = WTCBlueColor +Var ButtonDisabledColor2 = WTCSemiLightBlueColor + +; case-3-bg-medium-white +Var HeadlineColor3 = WTCWhiteColor +Var SubHeadlineColor3 = WTCWhiteColor +Var BodyTextColor3 = WTCSemiLightBlueColor +Var ButtonPressedColor3 = WTCBlueColor +Var ButtonTextPressedColor3 = WTCWhiteColor +Var ButtonColor3 = WTCWhiteColor +Var ButtonTextColor3 = WTCBlueColor +Var ButtonDisabledColor3 = WTCSemiLightBlueColor + +; case-4-bg-blue +Var HeadlineColor4 = WTCWhiteColor +Var SubHeadlineColor4 = WTCWhiteColor +Var BodyTextColor4 = WTCSemiLightBlueColor +Var ButtonPressedColor4 = WTCBlueColor +Var ButtonTextPressedColor4 = WTCWhiteColor +Var ButtonColor4 = WTCWhiteColor +Var ButtonTextColor4 = WTCBlueColor +Var ButtonDisabledColor4 = WTCSemiLightBlueColor + diff --git a/inter/whatthecup/sgp/image/main_page/bn_main_page_start.png b/inter/whatthecup/sgp/image/main_page/bn_main_page_start.png new file mode 100644 index 00000000..df651582 Binary files /dev/null and b/inter/whatthecup/sgp/image/main_page/bn_main_page_start.png differ diff --git a/inter/whatthecup/sgp/image/main_page/bp_main_page_start.png b/inter/whatthecup/sgp/image/main_page/bp_main_page_start.png new file mode 100644 index 00000000..012bacdd Binary files /dev/null and b/inter/whatthecup/sgp/image/main_page/bp_main_page_start.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_HealthyOption.png b/inter/whatthecup/sgp/image/page2_en/bn_HealthyOption.png new file mode 100644 index 00000000..4a82766a Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_HealthyOption.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_cho_caramel.png b/inter/whatthecup/sgp/image/page2_en/bn_cho_caramel.png new file mode 100644 index 00000000..bf2af828 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_cho_caramel.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_coffee.png b/inter/whatthecup/sgp/image/page2_en/bn_coffee.png new file mode 100644 index 00000000..a7ae79d6 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_coffee.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_diy.png b/inter/whatthecup/sgp/image/page2_en/bn_diy.png new file mode 100644 index 00000000..508f9334 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_diy.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_protein.png b/inter/whatthecup/sgp/image/page2_en/bn_protein.png new file mode 100644 index 00000000..5e59d598 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_protein.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_soda_coke.png b/inter/whatthecup/sgp/image/page2_en/bn_soda_coke.png new file mode 100644 index 00000000..9dbf0555 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_soda_coke.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bn_tea.png b/inter/whatthecup/sgp/image/page2_en/bn_tea.png new file mode 100644 index 00000000..1d628e9b Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bn_tea.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_HealthyOption.png b/inter/whatthecup/sgp/image/page2_en/bp_HealthyOption.png new file mode 100644 index 00000000..dcada156 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_HealthyOption.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_cho_caramel.png b/inter/whatthecup/sgp/image/page2_en/bp_cho_caramel.png new file mode 100644 index 00000000..c9c7349a Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_cho_caramel.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_coffee.png b/inter/whatthecup/sgp/image/page2_en/bp_coffee.png new file mode 100644 index 00000000..acf9bc7d Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_coffee.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_diy.png b/inter/whatthecup/sgp/image/page2_en/bp_diy.png new file mode 100644 index 00000000..ed99ae13 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_diy.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_protein.png b/inter/whatthecup/sgp/image/page2_en/bp_protein.png new file mode 100644 index 00000000..3b83f4ac Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_protein.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_soda_coke.png b/inter/whatthecup/sgp/image/page2_en/bp_soda_coke.png new file mode 100644 index 00000000..41f03f95 Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_soda_coke.png differ diff --git a/inter/whatthecup/sgp/image/page2_en/bp_tea.png b/inter/whatthecup/sgp/image/page2_en/bp_tea.png new file mode 100644 index 00000000..d2e926ed Binary files /dev/null and b/inter/whatthecup/sgp/image/page2_en/bp_tea.png differ diff --git a/inter/whatthecup/sgp/xml/page_catalog.lxml b/inter/whatthecup/sgp/xml/page_catalog.lxml new file mode 100644 index 00000000..fbbd1307 --- /dev/null +++ b/inter/whatthecup/sgp/xml/page_catalog.lxml @@ -0,0 +1,756 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + If CountryName = "Australia" Then + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev" + EndIf + + If CountryName = "Malaysia" Then + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + + Var FromFruityRaya = 0 + Var FromProThaiTea = 0 + Var FromProYuzu = 0 + EndIf + + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + TopView "show" + ; On open + + Machine WakeUp + + DEBUGVAR ToppingNewShow + + Var NextPage = "-" + + Var Seeker.thankLidFlag = 0 + Var Seeker.thankStrawFlag = 0 + + WEB "DISABLE" + + Var web_readyOK = "false" + 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" + EndIf + + If TermTemOnline = "true" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" + EndIf + + If Seeker = "curr" Then + Machine DoorLidClose + EndIf + + Var GetPayInfoFlag = 0 + Var countDownRetrun = 300 + + CoinVending OFF + + + ; Clear value + Topping "clear" "-" + + + Var DirImage = "ROOT/taobin_project/image/page2_inter/" + + If UsePepsiTheme = 1 Then + + Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var DirImage = DirImage + "/image/page2_en/" + EndIf + + + Var StrawAutoRelease1 = "false" + Var StrawAutoRelease2 = "false" + + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + + + If SELLONLINE = 1 Then + Var ShowButtonClick2 = "Enable" + Else + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" + EndIf + + If SELLONLINE = 1 Then + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + + ;GenHashWithTimeStamp QRCODE99x + WEB "ENABLE" + + Else + Var ShowNetworkProblem = "Enable" + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" + ;Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" + + Var QRCODE99 = "" + WEB "DISABLE" + + EndIf + + If RoadShow = "true" Then + Var ShowNetworkProblem = "Invisible" + Var ShowNetworkProblemText = "" + EndIf + + ; 1035 is Coke. + STRCONTAIN "1035" MaterialAvailable CokeUI + + Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" + Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" + + + Var countClick = 0 + + + DEBUGVAR CART_COUNT + + + Var QRCODE99_Y = 1718 + + Var showCart = "Invisible" + If MultiPayEnable = "true" Then + + If CART_COUNT = 1 Then + Var showCart = "Enable" + Var cart_image_bn = DirImageCart + "/bn_cart1.png" + Var cart_image_bp = DirImageCart + "/bp_cart1.png" + + Var QRCODE99_Y = 1580 + + EndIf + + If CART_COUNT = 2 Then + Var showCart = "Enable" + Var cart_image_bn = DirImageCart + "/bn_cart2.png" + Var cart_image_bp = DirImageCart + "/bp_cart2.png" + + Var QRCODE99_Y = 1580 + + EndIf + + + + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + EndIf + + EndIf + + If Seeker = "next" Then + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" + EndIf + + + If XMLProfile = "taobin_notopup" Then + Var ButtontoTopupMenu = "Disable" + + EndIf + + + Var menu_name_eng_hot = "" + Var menu_desc_eng_hot = "" + Var menu_name_thai_hot = "" + Var menu_desc_thai_hot = "" + + Var menu_name_eng_cold = "" + Var menu_desc_eng_cold = "" + Var menu_name_thai_cold = "" + Var menu_desc_thai_cold = "" + + + Var menu_name_eng_blender = "" + Var menu_desc_eng_blender = "" + Var menu_name_thai_blender = "" + Var menu_desc_thai_blender = "" + + + + + If BoxID = 0 Then + RebootWithCause "BoxID was zero" + EndIf + + + + DEBUGVAR ShowButtonClick2 + + DEBUGVAR MenuKidButtonState + + Machine OrderCheck + + + DEBUGVAR $51-03-01-0035.Price + Var PromotionIDCurrentOrder = 0 + RootLayoutVisible 3 "show" + + + + 1000 + + + ;SAVELOG SoundPlaying + + If countDownRetrun > 0 Then + Var countDownRetrun = countDownRetrun - 1 + EndIf + + If countDownRetrun = 0 Then + If Seeker = "next" Then + RootLayoutVisible 3 "hide" + 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 + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + + Refresh + TimerReset + + + + ;If ChangeStatus = "payout-end" Then + ; Var ChangeOK = 1 + ;EndIf + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99 Then + 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 + + + + + 0 + 380 + 1080 + 1540 + WTCLightBlueColor + + + + DEBUGVAR LanguageShow + + If LanguageShow = "ENG" Then + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" + EndIf + + 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 + Var countDownRetrun = 300 + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + + RefreshAll + + + +; back + + + + + 70 + 591 + 940 + 85 + + 000001 + + + + + 70 + 679 + 940 + 85 + + 000002 + + + +; menu row 1 + + + + +; menu row 2 + + + + + + + + + + + + +;############################################################### + + + + + + + + + +;############################################################### + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + +; Cart + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + 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" + + EndIf + Else + EndIf + + + + + + + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Invisible" + Var GetLidButtonState2 = "Enable" + Var bg_lidProblem_ST2 ="Invisible" + + Var EnableGetMoreStrawFileName2 = "Enable" + Var bg_strawProblem_ST2 ="Invisible" + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var GetLidButtonState2 = "Invisible" + Var bg_lidProblem_ST2 ="Enable" + + Var XStraw = 376 + Var EnableGetMoreStrawFileName2 = "Invisible" + Var bg_strawProblem_ST2 ="Enable" + + + + + Var MachineState_Result = 0 + Var waitAckPay = 1 + Var BREW_COUNT_DOWN_FROM_APP = "on" + Var CountDownBrewing = 122 + Var MachineStage = "testing" + Var BREW_CNT = 122 + + Var InternationalEnable = 1 + DEBUGVAR InternationalEnable + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + + + Var Top2Timeout = 19 + DEBUGVAR CountDownBrewing + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" + +; Initial for jump to page_brewing3.xml + + + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 7f055473..1df14272 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -624,6 +624,8 @@ DEBUGVAR CountDownShowButton DEBUGVAR EventTurnOn + Var UsePepsiTheme = 0 + ;inter-page-board If CountryName = "Malaysia" Then @@ -826,6 +828,8 @@ Var show_eng = "true" Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4" + Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/sgp/" @@ -881,6 +885,8 @@ DEBUGVAR ShowButtonClick2 + Var UsePepsiTheme = 1 + EndIf @@ -941,6 +947,8 @@ Var MinPhoneNumber = 9 Var MaxPhoneNumber = 9 + Var UsePepsiTheme = 1 + EndIf @@ -1123,6 +1131,19 @@ Var RoadShow = "false" TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev" + If UsePepsiTheme = 1 Then + If InternationalEnable = 1 Then + ; enable-color + TRY "ROOT/taobin_project/inter/whatthecup/color_settings.ev" + + Var MainStartPepsiThemeDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/" + + ;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png" + Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png" + EndIf + EndIf + XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1325,7 +1346,7 @@ - Var XMLProfile = "$Discount90Per" + Var XMLProfile = "Discount90Per" CacheVarStr "put" XMLProfile PRICE "Reset" "-" PRICE "Load" "-" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 693dbc15..afb9f056 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -20,6 +20,13 @@ Var FromProYuzu = 0 EndIf + If UsePepsiTheme = 1 Then + + Var WTCCatalogDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName + Var WTCCatalogDir = WTCCatalogDir + "/xml/page_catalog.lxml" + + Open WTCCatalogDir + EndIf OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"