diff --git a/animation01/sync_0.file b/animation01/sync_0.file new file mode 100644 index 00000000..15de7a0d --- /dev/null +++ b/animation01/sync_0.file @@ -0,0 +1,43 @@ +total 253480 +-rw-r--r--@ 1 wanloprungsiyangkul staff 20682 Sep 30 15:05 Menu Description - Sheet1.tsv +-rw-r--r--@ 1 wanloprungsiyangkul staff 15623 Sep 22 20:35 Menu Description - Sheet1_.tsv +-rw-r--r--@ 1 wanloprungsiyangkul staff 948282 Nov 15 2020 TaoBin2_draft02_art1.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3603060 Nov 15 2020 TaoBin2_draft02_art10.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3166935 Nov 15 2020 TaoBin2_draft02_art11.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2523981 Nov 15 2020 TaoBin2_draft02_art12.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3033922 Nov 15 2020 TaoBin2_draft02_art13.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art14.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3485911 Nov 15 2020 TaoBin2_draft02_art15.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3116323 Nov 15 2020 TaoBin2_draft02_art16.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3221745 Nov 15 2020 TaoBin2_draft02_art17.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art18.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1478218 Nov 15 2020 TaoBin2_draft02_art19.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 4333281 Nov 15 2020 TaoBin2_draft02_art2.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1416127 Nov 15 2020 TaoBin2_draft02_art20.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1495680 Nov 15 2020 TaoBin2_draft02_art21.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1469930 Nov 15 2020 TaoBin2_draft02_art22.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1920522 Nov 15 2020 TaoBin2_draft02_art23.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1425647 Nov 15 2020 TaoBin2_draft02_art24.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2879806 Dec 5 2020 TaoBin2_draft02_art25.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3161811 Dec 5 2020 TaoBin2_draft02_art26.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 5410752 Dec 15 2020 TaoBin2_draft02_art27.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 6889815 Dec 15 2020 TaoBin2_draft02_art28.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1966646 Nov 15 2020 TaoBin2_draft02_art3.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1876379 Apr 21 21:02 TaoBin2_draft02_art31.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1796407 Apr 21 21:02 TaoBin2_draft02_art32.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1840993 Apr 21 21:02 TaoBin2_draft02_art33.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 4730836 Apr 21 21:02 TaoBin2_draft02_art34.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art35.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 10750801 Aug 25 10:14 TaoBin2_draft02_art36.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art37.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 1595611 Nov 15 2020 TaoBin2_draft02_art4.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3055256 Sep 24 18:44 TaoBin2_draft02_art40.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3605634 Sep 24 18:44 TaoBin2_draft02_art41.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 9350285 Sep 24 18:44 TaoBin2_draft02_art42.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 9643046 Sep 24 18:44 TaoBin2_draft02_art43.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 2041924 Nov 16 2020 TaoBin2_draft02_art5.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3843048 Nov 15 2020 TaoBin2_draft02_art6.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3740266 Nov 15 2020 TaoBin2_draft02_art7.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3998856 Nov 15 2020 TaoBin2_draft02_art8.mp4 +-rw-r--r--@ 1 wanloprungsiyangkul staff 3616423 Nov 15 2020 TaoBin2_draft02_art9.mp4 +-rw-r--r-- 1 wanloprungsiyangkul staff 0 Oct 11 00:29 sync_0.file diff --git a/image/topping2/bd_add_shot.png b/image/topping2/bd_add_shot.png new file mode 100644 index 00000000..457f7583 Binary files /dev/null and b/image/topping2/bd_add_shot.png differ diff --git a/image/topping2/bd_add_shot2.png b/image/topping2/bd_add_shot2.png new file mode 100644 index 00000000..5dc067fb Binary files /dev/null and b/image/topping2/bd_add_shot2.png differ diff --git a/image/topping2/bd_blended.png b/image/topping2/bd_blended.png new file mode 100644 index 00000000..bb71dcb0 Binary files /dev/null and b/image/topping2/bd_blended.png differ diff --git a/image/vending_error/img1.png b/image/vending_error/img1.png index b156287c..ceb099da 100644 Binary files a/image/vending_error/img1.png and b/image/vending_error/img1.png differ diff --git a/image/vending_error_en/img1.png b/image/vending_error_en/img1.png index fbdc8842..c5114d1a 100644 Binary files a/image/vending_error_en/img1.png and b/image/vending_error_en/img1.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 47dbfb03..cc1f015a 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -11,6 +11,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" Var FileNumber = 1 + DEBUGVAR SoundVolume Var GetFreeFromError = 0 Var taobin_version = "1.53" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 7adfdab0..7541ffb0 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -249,10 +249,19 @@ Var Timeout = Timeout + 1 - If CountDownBrewing > 0 Then - Var CountDownBrewing = CountDownBrewing - 1 + If MOVE_CUP_TO_DOOR = "true" Then + Var MOVE_CUP_TO_DOOR = "false" EndIf + If BREW_COUNT_DOWN_FROM_APP = "on" Then + Var CountDownBrewing = BREW_CNT + Else + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + Endif + If Simulation = "true" Then If CountDownBrewing = 0 Then ;Open "ROOT/taobin_project/xml/page_drinkok.xml" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index db84b8a8..e2a31f88 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -18,7 +18,7 @@ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" EndIf - Machine DoorLidClose + ;Machine DoorLidClose Var GetPayInfoFlag = 0 Var countDownRetrun = 30 @@ -51,7 +51,6 @@ Var StrawAutoRelease1 = "false" Var StrawAutoRelease2 = "false" - Machine DoorClose If NetworkStatus = "ACTIVATE" Then Var ShowButtonClick2 = "Enable" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index cb75395e..cdce893d 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -305,6 +305,8 @@ EndIf EndIf + Machine DoorClose + diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 1c094aa9..30c31261 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -7,6 +7,9 @@ Var y_topping_bg = 912 + If JXMLVersionInt > 355 Then + Open "ROOT/taobin_project/xml/page_topping_select3.xml" + EndIf If ConfigNumer > 360 Then SAVELOG "Recipe have smoothies" Open "ROOT/taobin_project/xml/page_topping_select2.xml" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index 07167955..fd2e16d9 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -7,6 +7,10 @@ Var y_topping_bg = 912 + + ;Machine DoorClose + Machine DoorLidClose + DEBUGVAR video_menu_0 DEBUGVAR SelectDrink @@ -94,8 +98,6 @@ Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" - ; Move to catalog. - ;Machine DoorClose ;Var blendedState = "Enable" @@ -145,6 +147,8 @@ Var btnAddCart = "Invisible" EndIf EndIf + + 2000 @@ -557,14 +561,6 @@ 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 diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml new file mode 100644 index 00000000..333dbf60 --- /dev/null +++ b/xml/page_topping_select3.xml @@ -0,0 +1,1558 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + Var y_topping_bg = 912 + + DEBUGVAR video_menu_0 + + DEBUGVAR SelectDrink + DEBUGVAR PictureDrink + + Var SaveProductCodeSelect = SelectDrink + Var UserSelectProductCode = SelectDrink + + DEBUGVAR UserSelectProductCode + + Var blendedState = "Invisible" + 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 = "Invisible" + Var ShotCoffeePremium = "Invisible" + + + Var StarwState = "Enable" + + ; 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 + + + Machine DoorClose + + 2000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout > 20 Then + Var Timeout = 0 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + TimerReset + + + + + + + +; back + + + + + + DEBUGVAR SubMenuProductCode1 + DEBUGVAR SubMenuName11 + DEBUGVAR SubMenuPrice1 + + DEBUGVAR SubMenuProductCode2 + DEBUGVAR SubMenuName12 + + DEBUGVAR TOPPING1 + 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 + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + + If BugFlag = 1 Then + + Else + 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 + + + EndIf + + If IgnoreLidStraw = "true" Then + Var IgnoreLidStraw = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" + + Else + If LidState = "Enable" Then + Var ShowLidStraw = "Enable" + Var ShowLidOnly = "Invisible" + Else + Var ShowLidStraw = "Invisible" + Var ShowStrawOnly = "Enable" + EndIf + EndIf + + If Service_LidStraw = "Disable" Then + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStawOnly = "Invisible" + + 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 + +;-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 + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + + + +; same + + 374 + 382 + 331 + 436 + PictureDrink + +; 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" ) + + + + + + + + +;- 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 + + +; + + +; + + + +;-END +; +; +; +; +; +; +; +; +; +; +;-BEGIN Collagen + +;- END +; +; +; +;-BEGIN Lid only + + 987 + 188 + 20 + ShowLidOnly + + "Enable" + bg_lid_only + + +; lid left + + + + + +;- END +; +; +; +; +; +; +; +; +; +;-BEGIN Straw only + + 987 + 188 + 20 + ShowStrawOnly + + "Enable" + bg_straw_only + + + +; straw left + + + + + +;- END +; +; +; +; +; +; +; +; +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + +; LID left + + + + +; +; +; +; +; +; +; +; +; + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + +; back + + +; add cart + +; next + + + + + + DEBUGVAR PriceDrinkNoTop + + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkTmp - PriceDiff + Var blendedState = "Enable" + Var UserSelectProductCode = SaveProductCodeSelect + Else + Var blendedState = "Press" + Var PriceDrinkTmp = PriceDrinkTmp + PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + EndIf + + DEBUGVAR UserSelectProductCode + Var PriceDrinkNoTop = PriceDrinkTmp + + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + SAVELOG PriceDrinkTmp + + + If showShotEnable = "Press" Then + Var showShotEnable = "Enable" + Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + Else + Var showShotEnable = "Press" + Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var topping2 = toppingID2index2 + Var DisableUsingCode = "true" + SAVELOG "Select add normal shot" + EndIf + + Var PriceDrinkNoTop = PriceDrinkTmp + + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + SAVELOG PriceDrinkTmp + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 069b4c6b..ad085903 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,7 +95,7 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.64" + Var XMLPageVersion = "5.65"