diff --git a/image/all.png b/image/all.png new file mode 100644 index 00000000..8794d098 Binary files /dev/null and b/image/all.png differ diff --git a/image/topping2/cb_dis_uncheck_new.png b/image/topping2/cb_dis_uncheck_new.png new file mode 100644 index 00000000..6b083f27 Binary files /dev/null and b/image/topping2/cb_dis_uncheck_new.png differ diff --git a/image/user_take_cup_en/bd_door_open_take_double_cup.png b/image/user_take_cup_en/bd_door_open_take_double_cup.png new file mode 100644 index 00000000..6122bb2a Binary files /dev/null and b/image/user_take_cup_en/bd_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_en/bn_door_open_take_double_cup.png b/image/user_take_cup_en/bn_door_open_take_double_cup.png new file mode 100644 index 00000000..b931a906 Binary files /dev/null and b/image/user_take_cup_en/bn_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_en/bp_door_open_take_double_cup.png b/image/user_take_cup_en/bp_door_open_take_double_cup.png new file mode 100644 index 00000000..39bce36f Binary files /dev/null and b/image/user_take_cup_en/bp_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_en/img_take_cup_for_next_brew.png b/image/user_take_cup_en/img_take_cup_for_next_brew.png new file mode 100644 index 00000000..09a10e9b Binary files /dev/null and b/image/user_take_cup_en/img_take_cup_for_next_brew.png differ diff --git a/image/user_take_cup_th/bd_door_open_take_double_cup.png b/image/user_take_cup_th/bd_door_open_take_double_cup.png new file mode 100644 index 00000000..4cdd17b5 Binary files /dev/null and b/image/user_take_cup_th/bd_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_th/bn_door_open_take_double_cup.png b/image/user_take_cup_th/bn_door_open_take_double_cup.png new file mode 100644 index 00000000..dbd57026 Binary files /dev/null and b/image/user_take_cup_th/bn_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_th/bp_door_open_take_double_cup.png b/image/user_take_cup_th/bp_door_open_take_double_cup.png new file mode 100644 index 00000000..e1755530 Binary files /dev/null and b/image/user_take_cup_th/bp_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_th/img_take_cup.png b/image/user_take_cup_th/img_take_cup.png new file mode 100644 index 00000000..c16bcb8f Binary files /dev/null and b/image/user_take_cup_th/img_take_cup.png differ diff --git a/image/user_take_cup_th/img_take_cup_for_next_brew.png b/image/user_take_cup_th/img_take_cup_for_next_brew.png new file mode 100644 index 00000000..d3a8e22d Binary files /dev/null and b/image/user_take_cup_th/img_take_cup_for_next_brew.png differ diff --git a/inc/select_drink_current.inc b/inc/select_drink_current.inc new file mode 100644 index 00000000..aab5e6e3 --- /dev/null +++ b/inc/select_drink_current.inc @@ -0,0 +1,14 @@ + Topping "Select" UserSelectProductCode + + ; Set option toppinng and pack + Topping "Select1-ID" topping1 + Topping "Select2-ID" topping2 + Topping "Select3-ID" topping3 + Topping "Select6-ID" topping6 + Topping "Select7-ID" topping7 + Topping "Select8-ID" topping8 + Topping "Select9-ID" topping9 + Topping "Select10-ID" topping10 + + ; Pack + Topping "Pack" ExtendDataCurr \ No newline at end of file diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 8ffec63c..faa11289 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1,4 +1,4 @@ - ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น OverlayTemplate ราคาร้อน ราคาเย็น ราคาปั่น + โ ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น OverlayTemplate ราคาร้อน ราคาเย็น ราคาปั่น Name=recommend,file=page_catalog_group_recommend.skt TAGESP @@ -571,17 +571,31 @@ Name=pepsi ซื้อคู่ถูกกว่า,file=page_catalog_group_p วันนี้ร้อนจนผิวจะ\nเกรียม Today is heat:\nSkin crisping เป๊ปซี่ น้ำเชื่อมชูกำลัง มะนาว และโซดา Pepsi Energy Syrup, Lime\nand Soda - 12-99-05-0057 - bn_iced_pepsi_energy_lime_second_cup_30.png - - - posi1 -Name=Lip It - พี่นัททุบ เต่าก็ทุบ salty caramel น้ำเชื่อมคาราเมล น้ำเชื่อมบ๊วย นมและน้ำแข็ง Caramel Syrup, Plum Syrup, Milk and Ice - - 12-03-03-0046 - แก้วนี้ของพี่นัท rose honey pudding น้ำเชื่อมคาราเมล น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำแข็ง Straw Syrup, Caramel Syrup, Milk and Ice - - 12-03-03-0047 - นิสาอินเต่าบิน botanic citrus น้ำเชื่อมยูซุ ชามะลิ เป๊ปซี่ และโซดา Pepsi, Jasmine Tea, Yuzu Syrup, Soda and Ice - 12-99-05-0063 - - สะบัดหลอด choco fondant น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมกล้วย โกโก้ นมและน้ำแข็ง Cocoa, Straw Syrup, Banana Syrup, Milk and Ice - 12-03-02-0040 - - โชว์แก้วอร่อย berry jam น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมยูซุ น้ำและน้ำแข็ง Strawberry Syrup, Yuzu Syrup, \nWater - - 12-05-03-0063 - ไหนดื่มสิ raspberry น้ำเชื่อมลิ้นจี่ น้ำเชื่อมสละ น้ำและน้ำแข็ง Lychee Syrup, Salak Syrup, \nWater - 12-05-02-0080 - - เรืองราวแก้วนี้ lychee rose น้ำเชื่อมลิ้ิ้นจี่ ชามะลิ น้ำและน้ำแข็ง Lychee Syrup, Jasmine Tea \nWater - - 12-02-03-0053 - เคาะค่ะ sum balm spf 15 pa++ น้ำเชื่อมคาราเมล น้ำเชื่อมมินต์ นมและน้ำแข็ง Mint Syrup, Caramel Syrup, Milk and Ice - 12-03-02-0041 - - ถ้าพี่นัทเป๊ะ เต่าก็เป๊ะ peach tea น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ ชาไทย และน้ำแข็ง Straw Syrup, lychee Syrup, thai Tea \nWater - 12-02-02-0056 - - เต่าบินเมคโอเวอร์ มั๊วะ! peach syrup น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ น้ำและน้ำแข็ง Straw Syrup, lychee Syrup, \nWater - - 12-05-03-0064 +Name=Lip_It,file=page_catalog_group_pro_lipit.skt + พี่นัททุบ เต่าก็ทุบ salty caramel น้ำเชื่อมคาราเมล น้ำเชื่อมบ๊วย นมและน้ำแข็ง Caramel Syrup, Plum Syrup, Milk and Ice - - 12-03-03-0046 bn_Caramel_Plum_Milk_Salty_caramel.png - - - posi1 + แก้วนี้ของพี่นัท rose honey pudding น้ำเชื่อมคาราเมล น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำแข็ง Straw Syrup, Caramel Syrup, Milk and Ice - - 12-03-03-0047 bn_Caramel_Straw_Milk_Rose_honey_puddingl.png - - - posi1 + นิสาอินเต่าบิน botanic citrus น้ำเชื่อมยูซุ ชามะลิ เป๊ปซี่ และโซดา Pepsi, Jasmine Tea, Yuzu Syrup, Soda and Ice - 12-99-05-0063 - bn_PEPSI_Jasmine_Yuzu_Botanic_citrus.png - - - posi1 + สะบัดหลอด choco fondant น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมกล้วย โกโก้ นมและน้ำแข็ง Cocoa, Straw Syrup, Banana Syrup, Milk and Ice - 12-03-02-0040 - bn_Cocoa_Straw_Milk_Banana_Choco_Fondant.png - - - posi1 + โชว์แก้วอร่อย berry jam น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมยูซุ น้ำและน้ำแข็ง Strawberry Syrup, Yuzu Syrup, \nWater - - 12-05-03-0063 bn_Straw_Yuzu_Berry_Yuzu.png - - - posi1 + ไหนดื่มสิ raspberry น้ำเชื่อมลิ้นจี่ น้ำเชื่อมสละ น้ำและน้ำแข็ง Lychee Syrup, Salak Syrup, \nWater - 12-05-02-0080 - bn_Lychee_SALAK_Rasberry.png - - - posi1 + เรืองราวแก้วนี้ lychee rose น้ำเชื่อมลิ้นจี่ ชามะลิ น้ำและน้ำแข็ง Lychee Syrup, Jasmine Tea \nWater - - 12-02-03-0053 bn_Lychee_Jasmine tea_Lychee_Rose.png - - - posi1 + เคาะค่ะ sum balm spf 15 pa++ น้ำเชื่อมคาราเมล น้ำเชื่อมมินต์ นมและน้ำแข็ง Mint Syrup, Caramel Syrup, Milk and Ice - 12-03-02-0041 - bn_Caramel_Mint_Milk_Sum_Balm_SPF_15.png - - - posi1 + ถ้าพี่นัทเป๊ะ เต่าก็เป๊ะ peach tea น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ ชาไทย และน้ำแข็ง Straw Syrup, lychee Syrup,\nthai Tea Water - 12-02-02-0056 - bn_Straw_Lychee_Thai Tea_Peach_tea.png - - - posi1 + เต่าบินเมคโอเวอร์\nมั๊วะ! peach syrup น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ น้ำและน้ำแข็ง Straw Syrup, lychee Syrup, \nWater - - 12-05-03-0064 bn_Lychee_Staw_Peach_Syrup.png - - - posi1 + +Name=Monday_Banana,file=page_catalog_group_pro_monday_banana.skt + ลาที่ดีคือลาออก A positive leave\nis RELIEVE โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar - 12-03-02-0024 12-03-03-0024 bn_ChocoBanana_milk_monday_banana.png - - - posi1 + แอพที่ดีคือแอพพรูฟ A perfect app\nis APPROVE น้ำเชื่อมกล้วย นม น้ำตาล Oreo Banana Syrup, Milk,\nSugar, Oreo - - 12-03-03-0029 bn_BananaOreo_smoothie_monday_banana.png - - - posi1 + โบที่ดีคือโบนัส\nสิบสองเดือน A favorable boost\nis a MONEY BOOST น้ำเชื่อมกล้วย นม และน้ำแข็ง Banana Syrup, milk and Ice - 12-03-02-0023 12-03-03-0023 bn_Banana_milk_monday_banana.png - - - posi1 + + +Name=Tea Time Festival + + + + + + diff --git a/ui/lang.tsv b/ui/lang.tsv index 7186214e..958b641c 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -808,7 +808,7 @@ 800756 Whipper Module ชุดหัวชง 800757 Clean bowl ถ้วยล้าง 800758 Arm module ชุดแขน -800759 Change Module เปลี่ยนเปลี่ยนอุปกรณ์ +800759 Change Module เปลี่ยนอุปกรณ์ 800760 Clean ทำความสะอาด 800761 Disc Powder ฐานจานผง 800762 Change/Clean เปลี่ยน/ทำตวามสะอาด @@ -824,9 +824,17 @@ 810000 810001 Start เริ่มทำงาน 810002 Stop หยุดทำงาน - - - +810003 Low ใกล้หมด +810004 Normal ปกติ +810005 +810006 ice cream level : ระดับไอศครีม +810007 Supply current for freeze กระแสไฟสำหรับแช่แข็ง +810008 Supply current for PAY กระแสไฟสำหรับการจ่าย +810009 Supply Current จ่ายกระแสไฟ +810010 Freeze : แช่แข็ง : +810011 Pay : จ่าย : +810012 not specified ไม่ได้กำหนด +810013 Wait รอ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index b12da785..f089722b 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -192,39 +192,24 @@ If BoxID = 172644 Then EndIf + +If BoxID = 174758 Then + Var ProBadValentineEnable = 0 + Var PepsiSecondCup30Enable = 0 + Var PepsiSecondCup30DiscountEnable = 0 + Var NewFlowPaymentCode = 0 +EndIf + + +If BoxID = 173973 Then + Var ProBadValentineEnable = 0 + Var PepsiSecondCup30Enable = 0 + Var PepsiSecondCup30DiscountEnable = 0 + Var NewFlowPaymentCode = 0 +EndIf + ; Exclusive Box -If BoxID = 174200 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - -If BoxID = 175038 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - -If BoxID = 174825 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - -If BoxID = 200443 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - -If BoxID = 173433 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - -If BoxID = 200435 Then - Var ProPeachEnable = 0 - Var ProBadValentineEnable = 1 -EndIf - - Var GameEnableFromTrickerEv = 1 diff --git a/xml/page_drinkfail.xml b/xml/page_drinkfail.xml index 6c2f4d26..d17e3a8c 100644 --- a/xml/page_drinkfail.xml +++ b/xml/page_drinkfail.xml @@ -33,11 +33,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_pickup_cup_from_error.xml b/xml/page_pickup_cup_from_error.xml index 7a8bb7d7..1fb6c5b9 100644 --- a/xml/page_pickup_cup_from_error.xml +++ b/xml/page_pickup_cup_from_error.xml @@ -4,29 +4,56 @@ 1920 "0xeae6e1" SoundVolume - "ROOT/sounds/Ding-dong.wav" Var Timeout = 0 + Var Timeout2 = 0 SAVELOG "page_pickup_cup_from_error.xml" DEBUGVAR EnableDoubleCupNoError DEBUGVAR HURR_FOREVER + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/" + + Else + Var DirImage = "ROOT/taobin_project/image/user_take_cup_th/" + EndIf + + DEBUGVAR Seeker.showname + DEBUGVAR UserSelectProductCode + DEBUGVAR topping1 + DEBUGVAR topping2 + DEBUGVAR topping3 + DEBUGVAR topping4 + DEBUGVAR topping5 + DEBUGVAR topping6 + DEBUGVAR topping7 + DEBUGVAR topping8 + DEBUGVAR topping9 + DEBUGVAR topping10 + + + + 1000 Var Timeout = Timeout + 1 + DEBUGVAR MachineStage + DEBUGVAR HaveCup DEBUGVAR CHECKCUP DEBUGVAR DoorCupPosition DEBUGVAR Timeout + DEBUGVAR Timeout2 If Timeout = 3 Then If DoorCupPosition = "bottom" Then @@ -34,9 +61,36 @@ EndIf EndIf - If Timeout > 120 Then - SAVELOG "Not pickup CUP" + If show_eng = "true" Then + Else + If HaveCup = "true" Then + If Timeout = 4 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + If Timeout = 54 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + If Timeout = 90 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + EndIf + EndIf + + If Timeout > 180 Then + If DoorCupPosition = "bottom" Then + + SAVELOG "Not pickup CUP" + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Machine DoorClose + + EndIf + EndIf + + If Timeout > 240 Then + SAVELOG "Timeout 240 from can not close door" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf @@ -46,12 +100,36 @@ ; Do not change ; If MachineStage = "show-menu" Then - + If HaveCup = "false" Then + If DoorCupPosition = "bottom" Then + Var Timeout2 = Timeout2 + 1 + EndIf + EndIf EndIf If DoorCupPosition = "bottom" Then Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" + Else + Var buttonRemoveCup = "Invisible" + EndIf + + If MachineStage = "close-maintenance" Then + Var buttonRemoveCup = "Disable" + EndIf + + If Timeout2 = 1 Then + ;include="ROOT/taobin_project/inc/select_drink_current.inc" + + EndIf + + If Timeout2 = 5 Then + + MakeDrinkV1 UserSelectProductCode SelectSugarID + Var HURR_FOREVER = "F:1115" + Var MachineState_Result = 0 + Var LastMakeDrinkResult = "-" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf @@ -71,31 +149,27 @@ - 757 - 424 - next_pic_bg + 335 + 1090 + "ROOT/taobin_project/image/user_take_cup_th/img_take_cup.png" 0 - 1418 - TextBottomShow - Var( DirImage + "text_bottom.png") + 609 + Var(DirImage + "/img_take_cup_for_next_brew.png") - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -; sugar5 - -;- END topping1 - - - +; removed ; @@ -3002,7 +2654,7 @@ ; ; ; -;- Begin topping new +;- Begin topping new no zero sugar 988 @@ -3068,7 +2720,6 @@ Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" Var UserSeletedSugar = 1 EndIf @@ -3139,15 +2790,8 @@ Var topping1 = toppingID1index1 EndIf - - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3215,14 +2859,8 @@ Var topping1 = toppingID1index2 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3304,14 +2942,8 @@ Var topping1 = toppingID1index2 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3393,14 +3025,8 @@ Var topping1 = toppingID1index3 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3482,14 +3108,8 @@ Var topping1 = toppingID1index4 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3578,7 +3198,9 @@ Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var UserSeletedSugar = 1 EndIf @@ -3627,14 +3249,9 @@ Var topping1 = toppingID1index2 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + ;Var UserSeletedSugar = 1 EndIf @@ -3675,14 +3292,9 @@ EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var topping1 = toppingID1index3 EndIf @@ -3725,14 +3337,9 @@ EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + Var topping1 = toppingID1index4 EndIf @@ -3824,8 +3431,10 @@ Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" - ;Var UserSeletedSugar = 1 + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" + + Var UserSeletedSugar = 1 EndIf @@ -3873,14 +3482,8 @@ Var topping1 = toppingID1index2 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" Var UserSeletedSugar = 1 EndIf @@ -3924,14 +3527,8 @@ Var topping1 = toppingID1index3 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" ;Var UserSeletedSugar = 1 EndIf @@ -3974,14 +3571,8 @@ Var topping1 = toppingID1index4 EndIf - If SugarZeroCalEnable = "true" Then - If MAT_ID_1215 = "Disable" Then - Else - Var SugarZeroCalCheck = "Enable" - Var SugarNormalCheck = "PressForever" - Var SugarZeroCalOption = "Enable" - EndIf - EndIf + Var SugarZeroCalCheck = "Enable" + Var SugarNormalCheck = "PressForever" ;Var UserSeletedSugar = 1 EndIf @@ -4053,8 +3644,13 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + Refresh Else - Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Enable" + EndIf If SugarNormalCheck = "PressForever" Then Else @@ -4064,7 +3660,6 @@ Function 2 EndIf - Refresh @@ -4075,6 +3670,8 @@ SugarZeroCalCheck "No" Var( DirImage + "/cb_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) Var( DirImage + "/cb_checked_new.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4084,6 +3681,8 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + + Refresh Else Var SugarNormalCheck = "Enable" @@ -4095,7 +3694,6 @@ Function 2 EndIf - Refresh @@ -4127,6 +3725,8 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + + Refresh Else If ShiftSugarStep = 1 Then @@ -4148,17 +3748,26 @@ Var topping1 = toppingID1index1 EndIf - - Var SugarZeroCalOption = "Invisible" + Var UserSeletedSugar = 1 + Var SugarNormalCheck = "PressForever" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + EndIf + DEBUGVAR SugarZeroCalCheck + + Function 2 EndIf DEBUGVAR topping1 - Function 2 - Refresh + ;Refresh @@ -4220,6 +3829,14 @@ Var topping1 = toppingID1index1 EndIf + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + + Var SugarZeroCalOption = "Enable" Var UserSeletedSugar = 1 EndIf @@ -4287,7 +3904,12 @@ Var topping1 = toppingID1index2 EndIf - Var SugarZeroCalOption = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -4369,7 +3991,13 @@ Var topping1 = toppingID1index2 EndIf - Var SugarZeroCalOption = "Enable" + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -4451,7 +4079,13 @@ Var topping1 = toppingID1index3 EndIf - Var SugarZeroCalOption = "Enable" + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -4533,7 +4167,12 @@ Var topping1 = toppingID1index4 EndIf - Var SugarZeroCalOption = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + Var UserSeletedSugar = 1 EndIf @@ -4589,8 +4228,15 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + Refresh Else - Var SugarZeroCalCheck = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf If SugarNormalCheck = "PressForever" Then Else @@ -4600,7 +4246,7 @@ Function 2 EndIf - Refresh + @@ -4611,6 +4257,8 @@ SugarZeroCalCheck "No" Var( DirImage + "/cb_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) Var( DirImage + "/cb_checked_new.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4620,6 +4268,7 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + Refresh Else Var SugarNormalCheck = "Enable" @@ -4631,7 +4280,6 @@ Function 2 EndIf - Refresh @@ -4662,6 +4310,7 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + Refresh Else If ShiftSugarStep = 1 Then @@ -4682,16 +4331,21 @@ Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf Var UserSeletedSugar = 1 - + Function 2 EndIf DEBUGVAR topping1 - Function 2 + - Refresh + @@ -4731,7 +4385,12 @@ Var topping1 = toppingID1index2 EndIf - Var SugarZeroCalOption = "Enable" + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + ;Var UserSeletedSugar = 1 EndIf @@ -4772,9 +4431,16 @@ EndIf - Var SugarZeroCalOption = "Enable" + Var topping1 = toppingID1index3 EndIf + + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -4815,10 +4481,14 @@ EndIf - Var SugarZeroCalOption = "Enable" Var topping1 = toppingID1index4 EndIf + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -4871,8 +4541,17 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + Refresh + Else - Var SugarZeroCalCheck = "Enable" + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf If SugarNormalCheck = "PressForever" Then Else @@ -4882,7 +4561,6 @@ Function 2 EndIf - Refresh @@ -4893,6 +4571,8 @@ SugarZeroCalCheck "No" Var( DirImage + "/cb_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) + Var( DirImage + "/cb_dis_uncheck_new.png" ) Var( DirImage + "/cb_checked_new.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4902,6 +4582,8 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + + Refresh Else Var SugarNormalCheck = "Enable" @@ -4913,7 +4595,7 @@ Function 2 EndIf - Refresh + @@ -4944,6 +4626,8 @@ If SelectDrinkType = 0 Then SAVELOG "drink type popup" Var high_light_drink_type = "Enable" + + Refresh Else If ShiftSugarStep = 1 Then @@ -4964,16 +4648,22 @@ Var topping1 = toppingID1index1 EndIf - Var SugarZeroCalOption = "Invisible" - ;Var UserSeletedSugar = 1 + Var SugarNormalCheck = "PressForever" + If SugarZeroCalCheck = "Disable2" Then + + Else + Var SugarZeroCalCheck = "Disable" + EndIf + Var UserSeletedSugar = 1 + Function 2 EndIf DEBUGVAR topping1 - Function 2 + - Refresh + @@ -5013,6 +4703,11 @@ Var topping1 = toppingID1index2 EndIf + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf Var UserSeletedSugar = 1 EndIf @@ -5055,7 +4750,13 @@ Var topping1 = toppingID1index3 EndIf - + + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf ;Var UserSeletedSugar = 1 EndIf @@ -5097,7 +4798,13 @@ Var topping1 = toppingID1index4 EndIf - + + If SugarZeroCalEnable = "true" Then + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + ;Var UserSeletedSugar = 1 EndIf @@ -5108,7 +4815,22 @@ - +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; ;-BEGIN milk choice OatMilkToppingEnable @@ -5141,7 +4863,7 @@ Function 2 - Refresh + @@ -5167,7 +4889,7 @@ Function 2 - Refresh + @@ -7030,20 +6752,10 @@ EndIf If Seeker = "curr" Then - Topping "Select" UserSelectProductCode + + ;include="ROOT/taobin_project/inc/select_drink_current.inc" - ; Set option toppinng and pack - Topping "Select1-ID" topping1 - Topping "Select2-ID" topping2 - Topping "Select3-ID" topping3 - Topping "Select6-ID" topping6 - Topping "Select7-ID" topping7 - Topping "Select8-ID" topping8 - Topping "Select9-ID" topping9 - Topping "Select10-ID" topping10 - - ; Pack - Topping "Pack" ExtendDataCurr + Else Topping "SetNextOrder" UserSelectProductCode @@ -7588,6 +7300,12 @@ EndIf EndIf + If SugarZeroCalCheck = "PressForever" Then + If SugarNormalCheck = "PressForever" Then + Var SugarZeroCalCheck = "Enable" + EndIf + EndIf + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname diff --git a/xml/page_topping_select7.xml.filterline.xml b/xml/page_topping_select7.xml.filterline.xml new file mode 100644 index 00000000..46bf769e --- /dev/null +++ b/xml/page_topping_select7.xml.filterline.xml @@ -0,0 +1,58 @@ + Var SugarZeroCalCheck = "Enable" + ;Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Disable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalChecked = "Disable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + SugarZeroCalCheck + SAVELOG " SugarZeroCalChecked " + If SugarZeroCalCheck = "PressForever" Then + Var SugarZeroCalCheck = "PressForever" + Var SugarZeroCalCheck = "Disable" + DEBUGVAR SugarZeroCalCheck + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + SugarZeroCalCheck + SAVELOG " SugarZeroCalChecked " + If SugarZeroCalCheck = "PressForever" Then + Var SugarZeroCalCheck = "PressForever" + Var SugarZeroCalCheck = "Disable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + Var SugarZeroCalCheck = "Enable" + SugarZeroCalCheck + SAVELOG " SugarZeroCalChecked " + If SugarZeroCalCheck = "PressForever" Then + Var SugarZeroCalCheck = "PressForever" + Var SugarZeroCalCheck = "Disable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "Disable" Then + Var SugarZeroCalCheck = "Enable" + If SugarZeroCalCheck = "PressForever" Then + If SugarZeroCalCheck = "PressForever" Then diff --git a/xml/vending_info.xml b/xml/vending_info.xml index b5cf3b50..af2536dd 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -84,7 +84,7 @@ Var IDCardState = "Invisible" Var Timeout = 0 - Var IDFullNameEng = "เสียบบัตร" + Var IDFullNameEng = "เสียบบัตร แล้วกดอ่าน " Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw Var Text2_6 = "ฝา : " + Lid1Status @@ -386,10 +386,7 @@ info_4Y "ROOT/taobin_project/image/tab_1.png" - ScreenRefresh - ;LED LedDoorCup Off 255 255 255 255 - ;LED LedDoorLid Off 255 255 255 255 - ;Var ShowPrice = "Enable" + READCARDID @@ -526,10 +523,9 @@ info2_text_startX info_text_4Y 30 - IDCardState fontType1 0x000000 - IDFullNameEng + IDFullNameEng @@ -889,6 +885,13 @@ Var IDCardState = "Enable" + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + DEBUGVAR IDFullNameEng + + SAVELOG IDFullNameEng diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 2ad1cb8b..675c3b9e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.23" - Var XMLPageVersionInt = 823 + Var XMLPageVersion = "8.24" + Var XMLPageVersionInt = 824 ;Oreo Var OreoGuarantee = 0