diff --git a/image/home/home/qr_bg.png b/image/home/home/qr_bg.png index 8e1ec786..96f87fb5 100644 Binary files a/image/home/home/qr_bg.png and b/image/home/home/qr_bg.png differ diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index e5ea13bc..0565e16f 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -28,6 +28,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_board.xml b/xml/page_board.xml index d6a1eb39..04493235 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -13,6 +13,8 @@ DEBUGVAR SoundVolume + + Var NextOrder = "false" @@ -554,6 +556,23 @@ Else Var buttonRemoveCup = "Invisible" EndIf + + + + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf + EndIf + + Refresh TimerReset diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 224662bc..6f593c1e 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -100,6 +100,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index bf994b28..9a4149da 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -167,6 +167,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml index d1429e12..6888b950 100644 --- a/xml/page_catalog_choose_drink11.xml +++ b/xml/page_catalog_choose_drink11.xml @@ -155,6 +155,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 61ad6dbf..c93f159b 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -143,6 +143,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 89c6469d..57b0acf3 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -142,6 +142,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index eb915768..cdf757ba 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -140,6 +140,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index 44e0d060..b81e526a 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -133,6 +133,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 2bbf6f14..8f0783f4 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -139,6 +139,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index 42e61904..1b3ffd42 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -155,6 +155,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 17f6105c..8373c2e0 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -135,6 +135,19 @@ 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 + + Var Timeout = Timeout + 1 TimerReset diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 9a8cfe0d..2e0602aa 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -32,6 +32,8 @@ Var QRCODE8 = "" Var CountStepPackPayment = 0 + Var CountStepForCupFlagDelay = 1 + Var Seeker.TaobinErrorNetwork = 0 @@ -126,29 +128,34 @@ 900 - DEBUGVAR Seeker - DEBUGVAR HaveCup - DEBUGVAR CupChecking - DEBUGVAR CountStepPackPayment If Seeker = "curr" Then + If web_ready = "false" Then + + If MachineStage = "remove-cup" Then + SAVELOG "MachineStage = remove-cup" + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf - If MachineStage = "remove-cup" Then - SAVELOG "MachineStage = remove-cup" - If HaveCup = "true" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" EndIf - - EndIf - - If CupChecking = "true" Then - If HaveCup = "true" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + + If CupChecking = "true" Then + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf EndIf EndIf EndIf + + If CupChecking = "true" Then + Var CountStepForCupFlagDelay = 3 + EndIf + If HaveCup = "true" Then + Var CountStepForCupFlagDelay = 3 + EndIf If ReadyForBrew = "false" Then Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -162,12 +169,18 @@ EndIf If CupChecking = "false" Then - If HaveCup = "false" Then Var CountStepPackPayment = CountStepPackPayment + 1 - EndIf EndIf - If CountStepPackPayment = 1 Then + DEBUGVAR Seeker + DEBUGVAR HaveCup + DEBUGVAR CupChecking + DEBUGVAR CountStepPackPayment + DEBUGVAR CountStepForCupFlagDelay + + + + If CountStepPackPayment = CountStepForCupFlagDelay Then SAVELOG ExtendData diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index a2d12d39..f025044e 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -16,6 +16,15 @@ Var show_error_normal = "Invisible" Var show_error_sp1 = "Enable" + + If EmergencyStop = "true" Then + Var stop_now = "true" + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/vending_error_en/" + Else + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + EndIf If MachineStage = "mcu-upgrade" Then If show_eng = "true" Then @@ -97,46 +106,61 @@ Var RandomImage = RandomImage + ".png" EndIf - + DEBUGVAR Seeker + DEBUGVAR DoorCupPosition + DEBUGVAR DoorLidPosition + DEBUGVAR EmergencyStop 5000 - ;SAVELOG MachineErrorDetail - Var MachineErrorDetailAll = MachineErrorDetail + " / " - Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng + SAVELOG EmergencyStop + If EmergencyStop = "true" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var MachineErrorDetailAll = "Emergency stop!" - DEBUGVAR MachineStage - If MachineStage = "show-menu" Then + EndIf + Else + + Var MachineErrorDetailAll = MachineErrorDetail + " / " + Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng + + DEBUGVAR MachineStage + If MachineStage = "show-menu" Then + + Var LEDSet = "false" + Open "ROOT/taobin_project/xml/page_board.xml" + + EndIf + If MachineStage = "remove-cup" Then - Var LEDSet = "false" - Open "ROOT/taobin_project/xml/page_board.xml" + Var LEDSet = "false" + Open "ROOT/taobin_project/xml/page_remove_cup.xml" - EndIf - If MachineStage = "remove-cup" Then - - Var LEDSet = "false" - Open "ROOT/taobin_project/xml/page_remove_cup.xml" + EndIf - EndIf - - If MachineStage = "drink-failed" Then - Var FirstOpen = 1 - Var LEDSet = "true" - Open "ROOT/taobin_project/xml/page_show_error.xml" - - EndIf - - If FirstOpen = 1 Then - Var FirstOpen = 0 - If MachineStage = "close-maintenance" Then - + If MachineStage = "drink-failed" Then + Var FirstOpen = 1 Var LEDSet = "true" Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf + + If FirstOpen = 1 Then + Var FirstOpen = 0 + If MachineStage = "close-maintenance" Then + + Var LEDSet = "true" + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf + EndIf EndIf + Refresh TimerReset diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 995b5e9f..b2c0c307 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -190,6 +190,18 @@ EndIf 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 + Refresh TimerReset diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml new file mode 100644 index 00000000..b2c0c307 --- /dev/null +++ b/xml/page_topping_select5.xml @@ -0,0 +1,1801 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + Var y_topping_bg = 912 + + DEBUGVAR Seeker + + DEBUGVAR video_menu_0 + + DEBUGVAR SelectDrink + DEBUGVAR PictureDrink + + If SelectDrinkLen = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + If PriceDrink = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + Var SaveProductCodeSelect = SelectDrink + Var UserSelectProductCode = SelectDrink + + Var showText4 = "Invisible" + Var showText7 = "Invisible" + + DEBUGVAR UserSelectProductCode + + Var blendedState = "Enable" + Var DisableUsingCode = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowCollagenOnly = "Invisible" + + Var blendedStateShow = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowStrawOnly = "Invisible" + Var ShowLidOnly = "Invisible" + + ; On open + Var lidAndStrawOldPageIgnore = "true" + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + + Var AddShotEnable = "Invisible" + + Var BGSugar = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Enable" + Var ShotCoffeePremium = "Invisible" + + + ; On open + Var LidState = Lid1Status + + ;SAVELOG PreviseXMLFileName2 + + + Var topping1 = "1" + Var topping2 = "31" + Var topping3 = "31" + + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping2_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + + + Else + + Var DirImage = "ROOT/taobin_project/image/topping2" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + + + EndIf + + Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_straw_only = DirImage + "/bg_straw_only.png" + Var bg_lid_only = DirImage + "/bg_lid_only.png" + + + + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" + + + + ;Var blendedState = "Enable" + ;Var ShotCoffeeBG = "Enable" + ;Var showShotEnable = "Enable" + ;Var ShowLidStraw = "Enable" + ;Var ShowStrawOnly = "Enable" + ;Var ShowLidOnly = "Enable" + + Var ShiftSugarStep = 1 + + + CRLFToSpace showname + CRLFToSpace showdesc + + ;- Begin + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + SAVELOG PriceDrinkTmp + ;- End + + If RoadShow = "true" Then + Var PriceDrinkTmp = "Free" + EndIf + + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + + Var StateImgKeto = "Invisible" + + + Var ToppingGotoPayment = "true" + + DEBUGVAR backGroundAddExtra + DEBUGVAR backGroundAddShotPremium + + DEBUGVAR MultiPayEnable + DEBUGVAR CART_COUNT + Var btnAddCart = "Invisible" + If MultiPayEnable = "true" Then + Var btnAddCart = "Enable" + If CART_COUNT = 3 Then + Var btnAddCart = "Invisible" + EndIf + EndIf + + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + + Machine DoorClose + Machine DoorLidClose + + Var ButtonNext = "false" + + Var NEW_MULTI = "Invisible" + + + 1000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout > 40 Then + Var Timeout = 0 + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If MultiPayEnable = "true" Then + If NEW_MULTI = "Invisible" Then + Var NEW_MULTI = "Enable" + Else + Var NEW_MULTI = "Invisible" + EndIf + 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 + + Refresh + TimerReset + + + + + + + +; back + + + + DEBUGVAR MAT_ID_9701 + DEBUGVAR MAT_ID_9601 + + + DEBUGVAR SubMenuProductCode1 + DEBUGVAR SubMenuName11 + DEBUGVAR SubMenuPrice1 + + DEBUGVAR SubMenuProductCode2 + DEBUGVAR SubMenuName12 + + DEBUGVAR TOPPING1 + DEBUGVAR TOPPING1_EXT_2 + DEBUGVAR TOPPING2 + DEBUGVAR TOPPING3 + DEBUGVAR TOPPING4 + DEBUGVAR toppingID1index1 + DEBUGVAR toppingID1index2 + DEBUGVAR toppingID1index3 + DEBUGVAR toppingID1index4 + DEBUGVAR toppingID1index5 + DEBUGVAR toppingID1index6 + DEBUGVAR toppingID1index7 + DEBUGVAR toppingID1index8 + DEBUGVAR toppingID1index9 + + DEBUGVAR toppingID2index1 + DEBUGVAR toppingID2index2 + DEBUGVAR toppingID2index3 + DEBUGVAR toppingID2index4 + DEBUGVAR toppingID2index5 + + If toppingID1index5 > 0 Then + SAVELOG "toppingID1index5 not set" + EndIf + + + + + DEBUGVAR MenuCodeName + DEBUGVAR toppingID1Default + DEBUGVAR toppingID2Default + DEBUGVAR toppingID3Default + + + DEBUGVAR toppingID2price2 + DEBUGVAR toppingID3price2 + + DEBUGVAR BrewParam + If BugFlag = 1 Then + + Else + + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + + + + STRCONTAIN "9701" BrewParam IgnoreLidStraw + + DEBUGVAR BrewParam + DEBUGVAR IgnoreLidStraw + + Var h_block_of_sugar = 210 + + + ;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie + STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie + If HaveSmoothie = "true" Then + Var blendedState = "Enable" + Var blendedStateShow = "Enable" + + Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop + + DEBUGVAR IsSmoRet + + If IsSmoRet = "true" Then + Var blendedState = "ForceSet" + Var blendedStateTxt = "Enable" + Topping "LoadSubMenu" SubMenuProductCode1 + Function 1 + Else + Var blendedStateTxt = "Invisible" + + EndIf + + EndIf + + If IgnoreLidStraw = "true" Then + Var IgnoreLidStraw = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" + + + Else + Var ShowLidStraw = "Enable" + + If MAT_ID_9701 = "Enable" Then + Var StrawState = MAT_ID_9701 + Else + Var StrawState = MAT_ID_9701 + EndIf + + If MAT_ID_9601 = "Enable" Then + Var LidState = MAT_ID_9601 + Else + Var LidState = MAT_ID_9601 + EndIf + + EndIf + + ; Override all + If Service_LidStraw = "Disable" Then + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" + ;Var ShowStawOnly = "Invisible" + + + Var StrawState = "Disable" + Var LidState = "Disable" + + EndIf + + If StrawState = "Enable" Then + Var StrawDeactiveButton = "Invisible" + Else + Var StrawDeactiveButton = "Enable" + EndIf + + + If LidState = "Enable" Then + Var LidDeactiveButton = "Invisible" + Else + Var LidDeactiveButton = "Enable" + EndIf + + + + + ;PressForever + If TOPPING1 = "Sugar" Then + + If sugarKeto = "true" Then + Var StateImgKeto = "Enable" + Var BGSugar = "Invisible" + Else + Var BGSugar = "Enable" + Endif + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar" Then + + If sugarKeto = "true" Then + Var StateImgKeto = "Enable" + Var BGSugar = "Enable" + Var h_block_of_sugar = 262 + Else + Var BGSugar = "Enable" + EndIf + ;Var BGSugar = "Enable" + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + + If TOPPING1 = "Sugar Premix 25" Then + Var BGSugar = "Enable" + Var ShiftSugarStep = 2 + Var SugarState1 = "Disable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar Premix 50" Then + Var BGSugar = "Enable" + Var ShiftSugarStep = 3 + Var SugarState1 = "Disable" + Var SugarState2 = "Disable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar Premix 25" Then + Var BGSugar = "Enable" + Var ShiftSugarStep = 2 + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + EndIf + + EndIf + + + + Var ShowCollagenOnly = "Enable" + + Var BugFlag = 1 + + Var topping1 = toppingID1Default + + Var ToppingGotoPayment = "false" + + If BGSugar = "Enable" Then + If show_eng = "true" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf + EndIf + Refresh + + Var collagenShow = "true" +;-BEGIN shot layout + + Var topping3 = toppingID3Default + Var shot_h_layout = 218 + + If TOPPING2 = "shot coffee" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + + + Refresh + EndIf + + + If TOPPING2 = "shot coffee termtem" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "shot coffee 1003" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1007" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1009" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "add-show-1101" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1102" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1103" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + +;-END + If TOPPING3 = "Collagen" Then + Var CollagenState = "Enable" + Else + Var CollagenState = "Invisible" + Var ShowCollagenOnly = "Invisible" + EndIf + + + + SAVELOG ToppingGotoPayment + If ToppingGotoPayment = "true" Then + Topping "Select" SelectDrink + ; Pack + Topping "Pack" ExtendData + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + ;Var BugFlag = 1 + If CartUpdate = "true" Then + Var CartUpdate = "-" + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + If ButtonNext = "true" Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + EndIf + + + +; same + + 374 + 382 + 331 + 436 + PictureDrink + + + + + 374 + 399 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + +; same + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + +; same + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + +; +; 0 +; 880 +; BGSugar +; 1080 +; Center +; 18 +; KanitTTF +; 0xEE8C62 +; "*ห้ามดื่มเกินวันละ 2 แก้ว เพราะหัวใจสั่น นอนไม่หลับ เด็กและสตรีมีครรภ์ไม่ควรดื่ม ผู้ป่วยควรปรึกษาแพทย์ก่อน" +; + + + + + + +; +; +; +; +; +; +; +; +; +; +; +; +;- FRAME SCORELLL + + 52 + 881 + 1080 + "auto-all" + "Vertical" + 1 + + + + + 986 + 160 + 20 + blendedStateShow + + + Var( DirImage + "/bg_blended.png" ) + + + + + + + + showText7 + 602 + 64 + Var( DirImage + "/text7.png" ) + + + + blendedStateTxt + 602 + 64 + Var( DirImage + "/text5.png" ) + + + + +;- Begin topping1 + + + 988 + 156 + 20 + BGSugar +; sugar layout + + BGSugar + Var( DirImage + "/bg_sugar.png" ) + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + +;- END topping1 + +; +; +; +; +; +; +; +; +; + +;-END +; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + 986 + 164 + 20 + ShotCoffeePremium + + backGroundAddShotPremium + + +; + + +; + + + + +;-END +; +; +; +; +; +; +;; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + 986 + 157 + 20 + ShotCoffeeBG + + backGroundAddExtra + + +; + + +; + + + + showText4 + 602 + 64 + Var( DirImage + "/text4.png" ) + + +;-END +; +; +; +; +; +; +; +; +; +; +;-BEGIN Collagen +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + + + +; LID left + + + + + + StrawDeactiveButton + 602 + 64 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 602 + 150 + Var( DirImage + "/text21.png" ) + + + + + +; +; +; +; +; +; +; +; +; + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + +; back + + + + + + +; add cart + + + + +; next + + + + + SAVELOG "FUNCTION1" + Var TOPPING_PRICE = 0 + DEBUGVAR PriceDrinkNoTop + DEBUGVAR PriceDiff + + DEBUGVAR showShotEnable + DEBUGVAR blendedState + + If blendedState = "ForceSet" Then + Var TOPPING_PRICE = PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + If blendedState = "Press" Then + Var TOPPING_PRICE = PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + Var UserSelectProductCode = SaveProductCodeSelect + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" + EndIf + EndIf + + DEBUGVAR UserSelectProductCode + + + If showShotEnable = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + + Var TOPPING_PRICE = 0 + + ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select add normal shot" + Else + If blendedState = "Disable" Then + Var blendedState = "Enable" + EndIf + + + Var PriceDrinkTmp = PriceDrinkNoTop + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + + Var showText7 = "Invisible" + + EndIf + + DEBUGVAR showShotEnable + DEBUGVAR blendedState + + Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + SAVELOG PriceDrinkTmp + + + Var Timeout = 0 + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index da60ffd0..dc7ba630 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.07" - Var XMLPageVersionInt = 607 + Var XMLPageVersion = "6.09" + Var XMLPageVersionInt = 609