diff --git a/image/page2_inter/bn_cocktail.png b/image/page2_inter/bn_cocktail.png new file mode 100644 index 00000000..95febe95 Binary files /dev/null and b/image/page2_inter/bn_cocktail.png differ diff --git a/image/page2_inter/bp_Cocktail.png b/image/page2_inter/bp_Cocktail.png new file mode 100644 index 00000000..dce72f1e Binary files /dev/null and b/image/page2_inter/bp_Cocktail.png differ diff --git a/image/page_doing/bn_get_lid.png b/image/page_doing/bn_get_lid.png index 2670b5a3..d982b37c 100644 Binary files a/image/page_doing/bn_get_lid.png and b/image/page_doing/bn_get_lid.png differ diff --git a/image/page_doing/bn_get_more_straw.png b/image/page_doing/bn_get_more_straw.png index 1795984c..ae0f200d 100644 Binary files a/image/page_doing/bn_get_more_straw.png and b/image/page_doing/bn_get_more_straw.png differ diff --git a/image/page_doing/bp_get_lid.png b/image/page_doing/bp_get_lid.png index 501c5224..98ed36ea 100644 Binary files a/image/page_doing/bp_get_lid.png and b/image/page_doing/bp_get_lid.png differ diff --git a/image/page_doing/bp_get_more_straw.png b/image/page_doing/bp_get_more_straw.png index ad4ccf83..01ea7291 100644 Binary files a/image/page_doing/bp_get_more_straw.png and b/image/page_doing/bp_get_more_straw.png differ diff --git a/image/page_payment/bn_topup_credit.png b/image/page_payment/bn_topup_credit.png index d65dc018..cd4f691b 100644 Binary files a/image/page_payment/bn_topup_credit.png and b/image/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment/bp_topup_credit.png b/image/page_payment/bp_topup_credit.png index 43f07a84..6a4760b2 100644 Binary files a/image/page_payment/bp_topup_credit.png and b/image/page_payment/bp_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bn_topup_credit.png b/image/page_payment_en/page_payment/bn_topup_credit.png index db94981b..916e6d91 100644 Binary files a/image/page_payment_en/page_payment/bn_topup_credit.png and b/image/page_payment_en/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bp_topup_credit.png b/image/page_payment_en/page_payment/bp_topup_credit.png index 7f35e388..61dcf749 100644 Binary files a/image/page_payment_en/page_payment/bp_topup_credit.png and b/image/page_payment_en/page_payment/bp_topup_credit.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Combination.png b/inter/aus/image/page_drink_disable_n2/bn_Combination.png new file mode 100644 index 00000000..634c9456 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Combination.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Gin_Collins.png b/inter/aus/image/page_drink_disable_n2/bn_Gin_Collins.png new file mode 100644 index 00000000..e8bb7370 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Gin_Collins.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Like_Sex_on_The_Beach.png b/inter/aus/image/page_drink_disable_n2/bn_Like_Sex_on_The_Beach.png new file mode 100644 index 00000000..056a44bc Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Like_Sex_on_The_Beach.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Melon_Fizz.png b/inter/aus/image/page_drink_disable_n2/bn_Melon_Fizz.png new file mode 100644 index 00000000..e35a128c Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Melon_Fizz.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Peach_Smash.png b/inter/aus/image/page_drink_disable_n2/bn_Peach_Smash.png new file mode 100644 index 00000000..97c2225c Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Peach_Smash.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Plum_Highball.png b/inter/aus/image/page_drink_disable_n2/bn_Plum_Highball.png new file mode 100644 index 00000000..77e3beeb Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Plum_Highball.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_The_Floral.png b/inter/aus/image/page_drink_disable_n2/bn_The_Floral.png new file mode 100644 index 00000000..1b234f16 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_The_Floral.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Ume_Ume.png b/inter/aus/image/page_drink_disable_n2/bn_Ume_Ume.png new file mode 100644 index 00000000..21fb2afb Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Ume_Ume.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_Collins.png b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_Collins.png new file mode 100644 index 00000000..8fda4665 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_Collins.png differ diff --git a/inter/aus/image/page_drink_n/bn_Combination.png b/inter/aus/image/page_drink_n/bn_Combination.png new file mode 100644 index 00000000..36ccd131 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Combination.png differ diff --git a/inter/aus/image/page_drink_n/bn_Gin_Collins.png b/inter/aus/image/page_drink_n/bn_Gin_Collins.png new file mode 100644 index 00000000..4ef455db Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Gin_Collins.png differ diff --git a/inter/aus/image/page_drink_n/bn_Like_Sex_on_The_Beach.png b/inter/aus/image/page_drink_n/bn_Like_Sex_on_The_Beach.png new file mode 100644 index 00000000..9c7bc71c Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Like_Sex_on_The_Beach.png differ diff --git a/inter/aus/image/page_drink_n/bn_Melon_Fizz.png b/inter/aus/image/page_drink_n/bn_Melon_Fizz.png new file mode 100644 index 00000000..5b1f0d06 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Melon_Fizz.png differ diff --git a/inter/aus/image/page_drink_n/bn_Peach_Smash.png b/inter/aus/image/page_drink_n/bn_Peach_Smash.png new file mode 100644 index 00000000..1cc559af Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Peach_Smash.png differ diff --git a/inter/aus/image/page_drink_n/bn_Plum_Highball.png b/inter/aus/image/page_drink_n/bn_Plum_Highball.png new file mode 100644 index 00000000..5c75fb55 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Plum_Highball.png differ diff --git a/inter/aus/image/page_drink_n/bn_The_Floral.png b/inter/aus/image/page_drink_n/bn_The_Floral.png new file mode 100644 index 00000000..d6307d7c Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_The_Floral.png differ diff --git a/inter/aus/image/page_drink_n/bn_Ume_Ume.png b/inter/aus/image/page_drink_n/bn_Ume_Ume.png new file mode 100644 index 00000000..f75aea8e Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Ume_Ume.png differ diff --git a/inter/aus/image/page_drink_n/bn_Yuzu_Collins.png b/inter/aus/image/page_drink_n/bn_Yuzu_Collins.png new file mode 100644 index 00000000..d542cba9 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Yuzu_Collins.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Combination.png b/inter/aus/image/page_drink_picture2_n/bn_Combination.png new file mode 100644 index 00000000..16e570c5 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Combination.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Gin_Collins.png b/inter/aus/image/page_drink_picture2_n/bn_Gin_Collins.png new file mode 100644 index 00000000..e00e755c Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Gin_Collins.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Like_Sex_on_The_Beach.png b/inter/aus/image/page_drink_picture2_n/bn_Like_Sex_on_The_Beach.png new file mode 100644 index 00000000..d00d1950 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Like_Sex_on_The_Beach.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Melon_Fizz.png b/inter/aus/image/page_drink_picture2_n/bn_Melon_Fizz.png new file mode 100644 index 00000000..e1fec389 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Melon_Fizz.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Peach_Smash.png b/inter/aus/image/page_drink_picture2_n/bn_Peach_Smash.png new file mode 100644 index 00000000..fdec5dcf Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Peach_Smash.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Plum_Highball.png b/inter/aus/image/page_drink_picture2_n/bn_Plum_Highball.png new file mode 100644 index 00000000..6b48a475 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Plum_Highball.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_The_Floral.png b/inter/aus/image/page_drink_picture2_n/bn_The_Floral.png new file mode 100644 index 00000000..f354eb2e Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_The_Floral.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Ume_Ume.png b/inter/aus/image/page_drink_picture2_n/bn_Ume_Ume.png new file mode 100644 index 00000000..4cdb32d8 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Ume_Ume.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Yuzu_Collins.png b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_Collins.png new file mode 100644 index 00000000..4c7edc38 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_Collins.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Combination.png b/inter/aus/image/page_drink_press_n/bn_Combination.png new file mode 100644 index 00000000..3970b7ad Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Combination.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Gin_Collins.png b/inter/aus/image/page_drink_press_n/bn_Gin_Collins.png new file mode 100644 index 00000000..1311ed7e Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Gin_Collins.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Like_Sex_on_The_Beach.png b/inter/aus/image/page_drink_press_n/bn_Like_Sex_on_The_Beach.png new file mode 100644 index 00000000..780c2c9c Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Like_Sex_on_The_Beach.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Melon_Fizz.png b/inter/aus/image/page_drink_press_n/bn_Melon_Fizz.png new file mode 100644 index 00000000..0c18d2a6 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Melon_Fizz.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Peach_Smash.png b/inter/aus/image/page_drink_press_n/bn_Peach_Smash.png new file mode 100644 index 00000000..1c8512ab Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Peach_Smash.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Plum_Highball.png b/inter/aus/image/page_drink_press_n/bn_Plum_Highball.png new file mode 100644 index 00000000..c2c92c9d Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Plum_Highball.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_The_Floral.png b/inter/aus/image/page_drink_press_n/bn_The_Floral.png new file mode 100644 index 00000000..e47e2a91 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_The_Floral.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Ume_Ume.png b/inter/aus/image/page_drink_press_n/bn_Ume_Ume.png new file mode 100644 index 00000000..2f16555a Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Ume_Ume.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Yuzu_Collins.png b/inter/aus/image/page_drink_press_n/bn_Yuzu_Collins.png new file mode 100644 index 00000000..c500c885 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_Yuzu_Collins.png differ diff --git a/inter/aus/xml/open_page_catalog.ev b/inter/aus/xml/open_page_catalog.ev new file mode 100644 index 00000000..bc1a4515 --- /dev/null +++ b/inter/aus/xml/open_page_catalog.ev @@ -0,0 +1,8 @@ +If WinterWarmersCatalogFlag = 1 Then + Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml" +Else + Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml" +EndIf + + +Open catalogFile \ No newline at end of file diff --git a/inter/aus/xml/page_catalog_cocktail.lxml b/inter/aus/xml/page_catalog_cocktail.lxml new file mode 100644 index 00000000..fe90fabe --- /dev/null +++ b/inter/aus/xml/page_catalog_cocktail.lxml @@ -0,0 +1,749 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + 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 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/" + + + 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 + + + + + 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 + "0xeae6e1" + + + + 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/inter/aus/xml/page_catalog_group_health.lxml b/inter/aus/xml/page_catalog_group_health.lxml index a24d2dc5..20f4f18c 100644 --- a/inter/aus/xml/page_catalog_group_health.lxml +++ b/inter/aus/xml/page_catalog_group_health.lxml @@ -1,30 +1,29 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" - Var Menu22Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" - - - - -;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" + Var Menu22Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" + + + + +;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" + 10 497 @@ -7171,8 +7170,8 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - + + + + + diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 7134ca75..1fe36a1a 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -496,6 +496,12 @@ Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 + + Var custom_coffee_level_medium_text_x = 540 + Var custom_coffee_level_medium_price_x = 600 + + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 785 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -510,6 +516,12 @@ Var topping_shot_price_x = 600 Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 + + Var custom_coffee_level_medium_text_x = 560 + Var custom_coffee_level_medium_price_x = 600 + + Var custom_coffee_level_darker_text_x = 880 + Var custom_coffee_level_dark_text_x = 790 EndIf @@ -1838,6 +1850,11 @@ DEBUGVAR toppingID2price1 DEBUGVAR toppingID2price2 DEBUGVAR toppingID2price3 + + DEBUGVAR toppingID9price1 + DEBUGVAR toppingID9price2 + DEBUGVAR toppingID9price3 + DEBUGVAR toppingID9price4 Function 2 EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 3d2af218..922319ce 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -55,8 +55,8 @@ Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" - Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png" - Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png" + Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png" + Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png" Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" @@ -65,13 +65,15 @@ Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" - Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" - Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + ;Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" + ;Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png" - Var XStraw = 274 + Var XStraw = 142 Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" @@ -108,7 +110,7 @@ Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png" - Var XStraw = 274 + Var XStraw = 142 EndIf Var waitAckPay = 0 @@ -364,15 +366,18 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Else Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" EndIf If GetFreeFromError = 1 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -404,21 +409,25 @@ If Seeker.CreditCard = 1 Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedUpgrade = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedReboot = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SELLSTATUS = "DEACTIVE" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf DEBUGVAR NeedUpgrade @@ -1443,6 +1452,7 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf ; Close next button. @@ -1450,12 +1460,14 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable2 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -1923,8 +1935,8 @@