diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml index 330ed21b..6b701a27 100644 --- a/xml/page_catalog_group_pro_pepween.xml +++ b/xml/page_catalog_group_pro_pepween.xml @@ -1,4 +1,3 @@ -<<<<<<< HEAD @@ -117,7 +116,17 @@ - + DEBUGVAR SystemTimeHourInt + If SystemTimeHourInt >= 19 Then + Var Haunted7price = 30 + Else + If SystemTimeHourInt < 5 Then + Var Haunted7price = 30 + Else + Var Haunted7price = $12-99-03-0066.Price + EndIf + EndIf + Var Timeout = 0 @@ -524,542 +533,6 @@ -======= - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - DEBUGVAR SystemTimeHourInt - If SystemTimeHourInt >= 19 Then - Var Haunted7price = 30 - Else - If SystemTimeHourInt < 5 Then - Var Haunted7price = 30 - Else - Var Haunted7price = $12-99-03-0066.Price - EndIf - EndIf - - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - - ; zone cup on arm - If CupOnArm = "true" Then - - If CheckCupStateDoorCupClose = "" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - - If CheckCupStateDoorCupClose = "done" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - Refresh - EndIf - EndIf - - - Var Timeout = Timeout + 1 - TimerReset - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a 10 497 @@ -1677,11 +1150,7 @@ KanitMediumTTF 0xFFFFFF showengText -<<<<<<< HEAD "Mysterious -======= - "Mysterious ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a music box" @@ -1909,11 +1378,7 @@ music box" KanitMediumTTF 0xFFFFFF showthaiText -<<<<<<< HEAD "หมอกควัน -======= - "หมอกควัน ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a แห่งความมืด" @@ -2183,11 +1648,7 @@ music box" KanitMediumTTF 0xFFFFFF showengText -<<<<<<< HEAD "The Haunting of -======= - "The Haunting of ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a the Past" @@ -2663,11 +2124,7 @@ the Past" KanitMediumTTF 0xFFFFFF showthaiText -<<<<<<< HEAD "ห้องเชือด -======= - "ห้องเชือด ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a หมายเลข 13" @@ -3433,11 +2890,7 @@ the Past" KanitMediumTTF 0xFFFFFF showengText -<<<<<<< HEAD "The Haunting -======= - "The Haunting ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a Hag of village" @@ -4083,45 +3536,9 @@ Hag of village" Flag( 12-99-03-0066.Button,$Sum1299030066) -<<<<<<< HEAD -======= - - - Var TelephoneNumber = "0809120280" - Var CurrentPointCheck = "" - Var val3 = "X" - - Var CurrentPointSlot = "1" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "2" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "3" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "4" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "5" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "6" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "7" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "8" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "9" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "10" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "11" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - Var CurrentPointSlot = "12" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - - - - ->>>>>>> a87683a2c9e84b7d033f1cb7be37bfaa4a2fa90a diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 3daa0a79..f2f25f07 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -300,12 +300,11 @@ Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" If MilkChoiceVeganEnable = 1 Then - Var CerealMilkToppingEnable = "Invisible" - Var CerealMilkToppingVegan = "Enable" + Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png" Else - Var CerealMilkToppingEnable = "Enable" - Var CerealMilkToppingVegan = "Invisible" + Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png" EndIf + Var CerealMilkToppingEnable = "Invisible" Var CerealMilkEnable = "Invisible" @@ -712,6 +711,8 @@ DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName2 + DEBUGVAR MenuCodeNameState1 + DEBUGVAR MenuCodeNameState2 DEBUGVAR SubMenuOnTop1 DEBUGVAR SubMenuOnTop2 DEBUGVAR SubMenuOnTop3 @@ -1493,7 +1494,9 @@ If MenuCodeName1 = "Cereal-Milk" Then Var CerealMilkToppingEnable = "Enable" Var CerealMilkPrice = SubMenuPrice1 - Var CerealMilkEnable = "Enable" + If MenuCodeNameState1 = "Enable" Then + Var CerealMilkEnable = "Enable" + EndIf EndIf @@ -2806,17 +2809,13 @@ ; ;-BEGIN milk choice - "Enable" + CerealMilkToppingEnable 986 157 20 CerealMilkToppingEnable - Var( DirImage + "/bg_milk_choice.png" ) - - - CerealMilkToppingVegan - Var( DirImage + "/bg_milk_choice_j.png" ) + CerealMilkToppingBg