From 8b4dfb62d9622b5d7772451106eebba53793edaa Mon Sep 17 00:00:00 2001 From: wanlop run Date: Tue, 7 Jan 2025 19:36:31 +0700 Subject: [PATCH] do between order --- adv/sync_1.file | 4 +- animation01/play_list.tsv | 19 + image/page3/bg1.png | Bin 993 -> 3565 bytes inter/tha/.special/RoadShow.ev | 33 +- inter/tha/animation01/play_list.tsv | 19 + inter/tha/menu/lang.tsv | 4 +- inter/tha/xml/multi/menu_catalog_new.lxml | 2 +- menu/components/menu_catalog_new.xml | 2 +- menu/new-layout.tsv | 25 +- ui/lang.tsv | 4 +- xml/menu_catalog_new.xml | 2 +- xml/page_NewBrewing3Conti.xml | 11 + xml/page_NewCannotConti.xml | 56 +- xml/page_catalog_group_other_other.xml | 2543 ++++++++++++++++++--- xml/page_pickup_cup_between_order.xml | 215 ++ xml/page_thankyouConti.xml | 83 +- xml/page_topping_select7.xml | 19 +- 17 files changed, 2690 insertions(+), 351 deletions(-) create mode 100644 xml/page_pickup_cup_between_order.xml diff --git a/adv/sync_1.file b/adv/sync_1.file index 471a71e9..c4e06e2b 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 143068 --rw-rw---- 1 root sdcard_rw 0 2024-12-04 17:12 sync_1.file +total 143048 +-rw-rw---- 1 root sdcard_rw 0 2025-01-06 15:28 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4 -rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4 diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index a0f9227b..143ef5fa 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -1202,3 +1202,22 @@ Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 13 สตรอเบอร์รี่มินต์โซดา 12-05-03-0023 1 19 12 13 23 41 24 120 20:00 23 + +เต่าทรงพลังสตรอเบอรีโซดา 12-05-02-0136 1 19 34 13 23 24 100 6:40 32 +เต่าทรงพลังสตรอเบอรีโซดาปั่น 12-05-03-0136 1 19 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังบ๊วยโซดา 12-05-02-0137 1 33 34 13 23 24 100 6:40 32 +เต่าทรงพลังบ๊วยโซดาปั่น 12-05-03-0137 1 33 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังลิ้นจี่โซดา 12-05-02-0138 1 11 34 13 23 24 100 6:40 32 +เต่าทรงพลังลิ้นจี่โซดาปั่น 12-05-03-0138 1 11 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังมะนาวโซดา 12-05-02-0139 1 12 34 13 23 24 100 6:40 32 +เต่าทรงพลังมะนาวโซดาปั่น 12-05-03-0139 1 12 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังคาราเมลโซดา 12-05-02-0140 1 22 34 13 23 24 100 6:40 32 +เต่าทรงพลังคาราเมลโซดาปั่น 12-05-03-0140 1 22 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังสละโซดา 12-05-02-0141 1 21 34 13 23 24 100 6:40 32 +เต่าทรงพลังสละโซดาปั่น 12-05-03-0141 1 21 34 13 23 41 24 100 6:40 32 +เต่าทรงพลัง (เพิ่มปริมาณ) 12-05-02-0142 1 34 13 23 24 100 6:40 32 +เต่าทรงพลังปั่น (เพิ่มปริมาณ) 12-05-03-0142 1 34 13 23 41 24 100 6:40 32 +เต่าพลังโซดา (เพิ่มปริมาณ) 12-05-02-0143 1 34 13 23 24 100 6:40 32 +เต่าพลังโซดาปั่น (เพิ่มปริมาณ) 12-05-03-0143 1 34 13 23 41 24 100 6:40 32 + +PEPSI EXTRA 12-05-02-0133 1 23 14 24 49 0:49 23 diff --git a/image/page3/bg1.png b/image/page3/bg1.png index 48ff24f18e15a18ac98a4d1ed6c23ea188b60a10..c9e9b50612b8879bb187f829f4da0139b19ddc56 100644 GIT binary patch literal 3565 zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ3pm(-Lk;p|Ke&9z=d(HQ>z>~$es_<1!VaD2Y4=o_bfnhlKE3>C^YLd#j#!l( zti8ZndqG#bZ>rW*HAd;jhxXrk`(EMLz3bn$fB&EUdR>4!W5?ar8*401DLqPM_$PXF zQ)~l^=-yyM$+t)giU+Xd!_ zKDkrUv0g88^HG8SsXH?{KPofC?%vZ{#P!kcNOEZP9+?*PrOTx0TfQKe}_m_x9vdjPv);mwFm7S$^`{7`r2) zGkQ-t9Biq4BWjQ!>@q=tKeHw}VexVH}?-|{`|+VJtXVjiPtYK z8aOTcul(V{szdKHLY4RM)KzAzF1^5+R-k;v&{N-YQu7ZPrO8hWBo!AcOj17?oYIqW z(aMX@^!PNT;*`%jFJ7r+R1TVN-o2;$MY-d#f9WYR9&9;()N8)Ez>V`a&S#&RdOa`B zsx~jYd$(KI{N2}zUzVt(OJ(VnoVaymZqfPwhvJ`K-w^-YJc{QZdmVHA>)T=5O<$Xw z3FE5Wl^=b?{j;rKirrG((4550ix)+jhW%oaKh03Pvtl<#I$QLgC*M!nPs%>|eUiLd z{o{L2>>i#go?kS-@P5OI*avz=@kQ~4^2PJrv#wOWH_3jte(^@GXPMIj@630Kx}j^M zk{?sk6V;I?Io33b9Yy@y#2bYtj^o^*80X{#UFEQSd(hvYfS7!><<+*OWyC^ z7x?Dmm7#SE@hfh9voW!->NK1_8>460ruXnxJEpu@h-`43FPZ>5; z8(AF6_x$%){C4Hi)Z+PU7Jt;OzejDe%{`J@BiagbO3^!`_#{K{Ox2pCt^OgGyI~M$B{;yiWeKh&nXc5wwi8dS% zHz=@RK@(NbPk3-5Tmz;RW=6t;0%lZ08yw;e9GJL1fC0^b0|y?mq1fKQ(730eQ8|7g z1DXL1jfZ)Woe8q5l9AbcpA#dR0gTM;(n$URJL(e?TVG8p6S@IxeC7y`LtOual}F|$ z7c05}JTiGO-@$a8;FhrXB+3Qj!gNSj+(8eI3Ba&>qAh}MfI-0yjKCia(9r-zPClb4 v6g7X1X8F-F6uD*?EkjYOkkLwsKDB&I7Z=MNgQu6zgIZdiu6{1-oD!M&U>cv7h@-A}a#}bD5`$V@L(#+Z&9$3<^94HZ<3tFOc?* zlC;g|1*&$qAqylMEDkaPsVAI#KvKcK07x=aHZcRq6T&h;(qY~MAj$BFg&jyvPzSlH p!Ddv;@Cz|uYI-#q$y7+=wYQa7xfJC}4*;_YgQu&X%Q~loCIICLxEBBb diff --git a/inter/tha/.special/RoadShow.ev b/inter/tha/.special/RoadShow.ev index 8faea904..8cd8b2b3 100644 --- a/inter/tha/.special/RoadShow.ev +++ b/inter/tha/.special/RoadShow.ev @@ -1,5 +1,5 @@ -SAVELOG "RoadShow.ev 200435 201316 day 25-Dec 14.00 - 24.00" +SAVELOG "RoadShow.ev 200435 Jan 7 test" Var RoadShow = "false" @@ -8,37 +8,14 @@ DEBUGVAR SystemDateDayInt ;DEBUGVAR SystemTimeMinuteInt DEBUGVAR SystemTimeHourInt -If SystemDateYearInt = 2024 Then +If SystemDateYearInt = 2025 Then - If SystemDateMonthInt = 12 Then - - If BoxID = 200587 Then - If SystemDateDayInt = 24 Then - If SystemTimeHourInt > 9 Then - If SystemTimeHourInt < 18 Then - Var RoadShow = "true" - EndIf - EndIf - EndIf - EndIf + If SystemDateMonthInt = 1 Then If BoxID = 200435 Then - If SystemDateDayInt = 26 Then - If SystemTimeHourInt > 13 Then - If SystemTimeHourInt < 24 Then - Var RoadShow = "true" - EndIf - EndIf + If SystemDateDayInt = 7 Then + Var RoadShow = "true" EndIf EndIf - If BoxID = 201316 Then - If SystemDateDayInt = 26 Then - If SystemTimeHourInt > 13 Then - If SystemTimeHourInt < 24 Then - Var RoadShow = "true" - EndIf - EndIf - EndIf - EndIf EndIf diff --git a/inter/tha/animation01/play_list.tsv b/inter/tha/animation01/play_list.tsv index a0f9227b..143ef5fa 100644 --- a/inter/tha/animation01/play_list.tsv +++ b/inter/tha/animation01/play_list.tsv @@ -1202,3 +1202,22 @@ Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 13 สตรอเบอร์รี่มินต์โซดา 12-05-03-0023 1 19 12 13 23 41 24 120 20:00 23 + +เต่าทรงพลังสตรอเบอรีโซดา 12-05-02-0136 1 19 34 13 23 24 100 6:40 32 +เต่าทรงพลังสตรอเบอรีโซดาปั่น 12-05-03-0136 1 19 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังบ๊วยโซดา 12-05-02-0137 1 33 34 13 23 24 100 6:40 32 +เต่าทรงพลังบ๊วยโซดาปั่น 12-05-03-0137 1 33 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังลิ้นจี่โซดา 12-05-02-0138 1 11 34 13 23 24 100 6:40 32 +เต่าทรงพลังลิ้นจี่โซดาปั่น 12-05-03-0138 1 11 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังมะนาวโซดา 12-05-02-0139 1 12 34 13 23 24 100 6:40 32 +เต่าทรงพลังมะนาวโซดาปั่น 12-05-03-0139 1 12 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังคาราเมลโซดา 12-05-02-0140 1 22 34 13 23 24 100 6:40 32 +เต่าทรงพลังคาราเมลโซดาปั่น 12-05-03-0140 1 22 34 13 23 41 24 100 6:40 32 +เต่าทรงพลังสละโซดา 12-05-02-0141 1 21 34 13 23 24 100 6:40 32 +เต่าทรงพลังสละโซดาปั่น 12-05-03-0141 1 21 34 13 23 41 24 100 6:40 32 +เต่าทรงพลัง (เพิ่มปริมาณ) 12-05-02-0142 1 34 13 23 24 100 6:40 32 +เต่าทรงพลังปั่น (เพิ่มปริมาณ) 12-05-03-0142 1 34 13 23 41 24 100 6:40 32 +เต่าพลังโซดา (เพิ่มปริมาณ) 12-05-02-0143 1 34 13 23 24 100 6:40 32 +เต่าพลังโซดาปั่น (เพิ่มปริมาณ) 12-05-03-0143 1 34 13 23 41 24 100 6:40 32 + +PEPSI EXTRA 12-05-02-0133 1 23 14 24 49 0:49 23 diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index d9cad6ff..65505194 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -965,7 +965,7 @@ 810152 Day วันที่ 810153 Weight น้ำหนัก 810154 calibrate calibrate -810155 +810155 TV ทีวี 810156 810157 810199 @@ -1078,7 +1078,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/inter/tha/xml/multi/menu_catalog_new.lxml b/inter/tha/xml/multi/menu_catalog_new.lxml index c0547958..6a225d26 100644 --- a/inter/tha/xml/multi/menu_catalog_new.lxml +++ b/inter/tha/xml/multi/menu_catalog_new.lxml @@ -106,7 +106,7 @@ ; under line 0 - 358 + 380 "ROOT/taobin_project/image/page3/bg1.png" diff --git a/menu/components/menu_catalog_new.xml b/menu/components/menu_catalog_new.xml index 58de6ec0..7acfab00 100644 --- a/menu/components/menu_catalog_new.xml +++ b/menu/components/menu_catalog_new.xml @@ -122,7 +122,7 @@ ; under line 0 - 358 + 380 "ROOT/taobin_project/image/page3/bg1.png" diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index f13d383b..dc157370 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -442,7 +442,16 @@ Name=Other,file=page_catalog_group_other_other.skt เป๊ปซี่ (เพิ่มปริมาณ) PEPSI EXTRA เป๊ปซี่ โซดา และน้ำแข็ง PEPSI, SODA AND ICE - 12-05-02-0133 - bn_iced_pepsi_extra.png - - - posi1 2025/01/01T00:00:00 - - เป๊ปซี่น้ำแข็ง PEPSI เป๊ปซี่ Pepsi & Ice - 12-05-02-0094 12-05-03-0094 bn_iced_pepsi.png - - - posi1 - - - - #REF! #REF! #REF! #REF! เซเว่นอัพ 7UP เซเว่นอัพ 7UP & Ice - 12-05-02-0095 - bn_iced_7up.png - - - posi2 - - - - #REF! - #REF! #REF! - เต่าทรงพลังโซดา TAO POWER \nDRINK SODA เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน) Medicine drink, Soda & Ice - 12-05-02-0035 12-05-03-0035 bn_iced_energy_drink_soda.png - - - posi1 - - - - #REF! #REF! #REF! #REF! + เต่าทรงพลัง ENERGY DRINK เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง /n(มีคาเฟอีน) MEDICINE DRINK, WATER, ICE - 12-05-02-0034 12-05-03-0034 bn_iced_energy_drink.png - - - posi1 - - - - #REF! #REF! #REF! #REF! + เต่าทรงพลังโซดา ENERGY DRINK\nSODA เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน) MEDICINE DRINK, SODA, ICE - 12-05-02-0035 12-05-03-0035 bn_iced_energy_drink_soda.png - - - posi1 - - - - #REF! #REF! #REF! #REF! + เต่าทรงพลังสตรอเบอรีโซดา ENERGY DRINK\nSTRAWBERRY SODA เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมสตรอเบอรี่ และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, STRAWBERRY\nSYRUP, SODA - 12-05-02-0136 12-05-03-0136 bn_iced_energy_drink_Strawberry_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลังบ๊วยโซดา ENERGY DRINK\nUME SODA เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมบ๊วย และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, UME SYRUP,\nSODA - 12-05-02-0137 12-05-03-0137 bn_iced_energy_drink_plum_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลังลิ้นจี่โซดา ENERGY DRINK\nLYCHEE SODA เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมลิ้นจี่ และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, LYCHEE\nSYRUP, SODA - 12-05-02-0138 12-05-03-0138 bn_iced_energy_drink_Lychee_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลังมะนาวโซดา ENERGY DRINK\nLIME SODA เครื่องดื่มเต่าทรงพลัง มะนาว และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, LIME POWDER,\nSODA - 12-05-02-0139 12-05-03-0139 bn_iced_energy_drink_lime_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลังคาราเมลโซดา ENERGY DRINK\nCARAMEL SODA เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมคาราเมล และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, CARAMEL\nSYRUP, SODA - 12-05-02-0140 12-05-03-0140 bn_iced_energy_drink_caramel_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลังสละโซดา ENERGY DRINK\nSALAK SODA เครื่องดื่มเต่าทรงพลัง น้ำแดงกลิ่นสละ และโซดา /n(มีคาเฟอีน) MEDICINE DRINK, SALAK SYRUP,\nSODA - 12-05-02-0141 12-05-03-0141 bn_iced_energy_drink_salak_soda.png - - - posi1 2025/01/21T00:00:00 - - + เต่าทรงพลัง (เพิ่มปริมาณ) ENERGY DRINK\nEXTRA เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง /n(มีคาเฟอีน) MEDICINE DRINK, WATER,\nICE - 12-05-02-0142 12-05-03-0142 bn_iced_energy_drink_Extra.png - - - posi1 2025/01/21T00:00:00 - - + เต่าพลังโซดา (เพิ่มปริมาณ) ENERGY DRINK\nSODA EXTRA เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน) MEDICINE DRINK, SODA, ICE - 12-05-02-0143 12-05-03-0143 bn_iced_energy_drink_soda_Extra.png - - - posi1 2025/01/21T00:00:00 - - เมล่อนโซดา MELON SODA น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง Melon Syrup, Soda, Ice - 12-05-02-0044 - bn_iced_melon_soda.png - - - posi1 - - - - #REF! - #REF! #REF! ยูซุโซดา YUZU SODA น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง Yuzu Syrup, Soda, Ice - 12-05-02-0045 - bn_iced_yuzu_soda.png - - - posi1 - - - - #REF! - #REF! #REF! IGNORE BANANA SODA - - 12-05-02-0050 - - - - - posi1 - - - - #REF! - #REF! #REF! @@ -478,7 +487,7 @@ IGNORE สตอเบอร์รี่โซดา STRAWBERRY SODA น้ำ โซดา SODA โซดา Soda - 12-05-02-0014 - bn_soda.png - - - posi1 - - - - #REF! - #REF! #REF! โซดาน้ำแข็ง ICE & SODA โซดา Soda & Ice - 12-05-02-0015 - bn_iced_soda.png - - - posi1 - - - - #REF! - #REF! #REF! - เต่าทรงพลัง TAO POWER DRINK เครื่องดื่มเต่าทรงพลัง \n(มีคาเฟอีน) Medicine drink & Ice - 12-05-02-0034 12-05-03-0034 bn_iced_energy_drink.png - - - posi1 - - - - #REF! #REF! #REF! #REF! + น้ำแดงมะนาว LIME SALAK น้ำแดงกลิ่นสละ น้ำมะนาว \n Salak Syrup, Limenade,\nWater & Ice - 12-05-02-0003 12-05-03-0003 bn_sala_lime.png - - - posi1 - - - - #REF! #REF! #REF! #REF! น้ำลิ้นจี่ LYCHEE DRINK น้ำเชื่อมลิ้นจี่ น้ำ Lychee Syrup, Sugar,\nWater & Ice - 12-05-02-0004 12-05-03-0004 bn_iced_Lychee.png - - - posi1 - - - - #REF! #REF! #REF! #REF! น้ำแดง SALAK DRINK น้ำแดงกลิ่นสละ \n Salak Syrup & Ice - 12-05-02-0002 12-05-03-0002 bn_sala.png - - - posi1 - - - - #REF! #REF! #REF! #REF! @@ -1140,6 +1149,18 @@ Name=Strawberry,file=page_catalog_group_pro_strawberry_series.skt กาแฟสตรอเบอร์รี่ STRAWBERRY\nCAFE LATTE น้ำเชื่อมสตรอเบอร์รี่ นม กาแฟ\nและน้ำตาล STRAWBERRY SYRUP, MILLK,\nCOFFEE, SUGAR 12-01-01-0074 12-01-02-0074 12-01-03-0074 bn_hot_Strawberry_caramel_latte.png 12-21-01-0074 12-21-02-0074 12-21-03-0074 posi1 - - - สตรอเบอร์รี่โอริโอ้ปั่น STRAWBERRY MILK\nOREO SMOOTHIE น้ำเชื่อมสตรอเบอร์รี่ นม โอริโอ้\nและน้ำตาล STRAWBERRY SYRUP, MILLK,\nCOFFEE, SUGAR - - 12-03-03-0027 bn_Strawberr_milk_Oreo_smoothie.png - - - posi1 - - - +Name=Red string of fate เพราะเชื่อในรักแท้ + CHEMISTRY เพียงพบสบตารัก CHEMISTRY LOVE + SWEET ROMANCE วิวาห์หวาน SWEET ROMANCE + ENDLESS LOVE ดั่งรักนิรันด์ ENDLESS LOVE + + + + + + + + Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt diff --git a/ui/lang.tsv b/ui/lang.tsv index d9cad6ff..65505194 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -965,7 +965,7 @@ 810152 Day วันที่ 810153 Weight น้ำหนัก 810154 calibrate calibrate -810155 +810155 TV ทีวี 810156 810157 810199 @@ -1078,7 +1078,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 1196956d..734d15c3 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -125,7 +125,7 @@ ; under line 0 - 358 + 380 "ROOT/taobin_project/image/page3/bg1.png" diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index bb0e29b4..45727a74 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -673,6 +673,17 @@ Var ButtonGamePressToPlayState = "Invisible" Var Game01Enable = 0 EndIf + + + ; TODO + DEBUGVAR EnableDoubleCupNoError + DEBUGVAR HURR_FOREVER + DEBUGVAR RequestPickupCupAlert + If RequestPickupCupAlert = "true" Then + Open "ROOT/taobin_project/xml/page_pickup_cup_between_order.xml" + EndIf + + diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index 6fccd16f..374a6b53 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -3,10 +3,13 @@ 1080 1920 "0xeae6e1" - "ROOT/taobin_project/sounds/chaching.mp3" SoundVolume ; On open + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" + + Var CountDownThankyou = 4 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 @@ -25,7 +28,6 @@ Var ChangeAmountSum = 0 Var Tel_Confirm_Flag = 0 - Var LastMakeDrinkResult = "-" DEBUGVAR MachineStage DEBUGVAR NextOrderStatus @@ -149,8 +151,8 @@ DEBUGVAR VendingCampaign Var CreditCardVoid = 0 - - + __CMD "PayWasSent" Seeker.ORDER_ID "-" "-" + @@ -399,7 +401,9 @@ Var waitAckPay = 2 Var Timeout = 5 Var ActionOKCase = 1 + + __CMD "send-pay-detail-now" error_code_stop_now PayDetail "-" EndIf EndIf @@ -418,6 +422,8 @@ Var TelephoneNumber = Seeker.TNumberTaobinCredit Var PayO2 = Seeker.CoffeePinNumber EndIf + + SAVELOG " Cannot conti with new payment ChangeTimeout > 30 " Var ServiceType = "coffee-refund" Var ServiceCredit = SelectDrink @@ -439,6 +445,10 @@ EndIf EndIf + DEBUGVAR MachineState_Result + DEBUGVAR ChangeOK + + If ChangeOK = 3 Then If ActionOKCase = 0 Then @@ -451,32 +461,24 @@ EndIf - If NextOrderStatus = "Disable" Then - Var PayDetail="1/F:1221/0/" + DEBUGVAR error_code_stop_now + If error_code_stop_now > 0 Then + Var PayDetail="1/F:" + error_code_stop_now + Var PayDetail = PayDetail + "/0/" Var PayDetail = PayDetail + "/XML|" Var PayDetail = PayDetail + Seeker.OrderChanel - Else - DEBUGVAR error_code_stop_now - If error_code_stop_now > 0 Then - Var PayDetail="1/F:" + error_code_stop_now - Var PayDetail = PayDetail + "/0/" - Var PayDetail = PayDetail + "/XML|" - Var PayDetail = PayDetail + Seeker.OrderChanel - Else - - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + "" - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + "" - Var PayDetail = PayDetail + "/XML|" - Var PayDetail = PayDetail + Seeker.OrderChanel - - EndIf - EndIf + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + EndIf + Var DEE = PayDetail @@ -488,8 +490,8 @@ DEBUGVAR VendingTSIDTmp - - PAYEXT SVT ACC VendingTSIDTmp DEE + __CMD "send-pay-detail-now" error_code_stop_now PayDetail "-" + ;PAYEXT SVT ACC VendingTSIDTmp DEE Var ActionOKCase = 1 diff --git a/xml/page_catalog_group_other_other.xml b/xml/page_catalog_group_other_other.xml index e601baf6..eaa4238d 100644 --- a/xml/page_catalog_group_other_other.xml +++ b/xml/page_catalog_group_other_other.xml @@ -39,7 +39,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 54 +; menu_new_list 62 ; ==================> Len = 15 ; - 12-05-02-0023 12-05-03-0023 @@ -1554,6 +1554,257 @@ SODA" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 20 + ; - 12-05-02-0034 12-05-03-0034 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0034.Button,12-05-03-0034.Button,$Sum12050200341205030034) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลัง" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, WATER, ICE" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0034.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0034.Button + StringFmt( $12-05-02-0034.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0034.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0034.Button + StringFmt( $12-05-03-0034.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050200341205030034 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0034.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0034.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050200341205030034 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 20 @@ -1573,10 +1824,10 @@ SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAO POWER DRINK SODA" + Var NameDrink = "ENERGY DRINK SODA" Var NameDrinkTH = "เต่าทรงพลังโซดา" - Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา (มีคาเฟอีน)" - Var DrinkDescription = "Medicine drink, Soda & Ice" + Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน)" + Var DrinkDescription = "MEDICINE DRINK, SODA, ICE" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1657,8 +1908,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง โซดา -(มีคาเฟอีน)" + "เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน)" 16 @@ -1669,8 +1919,8 @@ SODA" KanitMediumTTF 0x322B26 showengText - "TAO POWER -DRINK SODA" + "ENERGY DRINK +SODA" 16 @@ -1680,7 +1930,7 @@ DRINK SODA" KanitMediumTTF 0x6F5F51 showengText - "Medicine drink, Soda & Ice" + "MEDICINE DRINK, SODA, ICE" 16 @@ -1807,6 +2057,2029 @@ DRINK SODA" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0136 12-05-03-0136 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0136.Button,12-05-03-0136.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201361205030136) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังสตรอเบอรีโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมสตรอเบอรี่ และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +STRAWBERRY SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, STRAWBERRY +SYRUP, SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0136.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0136.Button + StringFmt( $12-05-02-0136.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0136.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0136.Button + StringFmt( $12-05-03-0136.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201361205030136 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0136.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0136.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201361205030136 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0137 12-05-03-0137 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0137.Button,12-05-03-0137.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201371205030137) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังบ๊วยโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมบ๊วย และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +UME SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, UME SYRUP, +SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0137.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0137.Button + StringFmt( $12-05-02-0137.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0137.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0137.Button + StringFmt( $12-05-03-0137.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201371205030137 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0137.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0137.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201371205030137 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0138 12-05-03-0138 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0138.Button,12-05-03-0138.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201381205030138) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังลิ้นจี่โซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมลิ้นจี่ และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +LYCHEE SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, LYCHEE +SYRUP, SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0138.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0138.Button + StringFmt( $12-05-02-0138.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0138.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0138.Button + StringFmt( $12-05-03-0138.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201381205030138 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0138.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0138.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201381205030138 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0139 12-05-03-0139 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0139.Button,12-05-03-0139.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201391205030139) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังมะนาวโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง มะนาว และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +LIME SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, LIME POWDER, +SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0139.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0139.Button + StringFmt( $12-05-02-0139.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0139.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0139.Button + StringFmt( $12-05-03-0139.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201391205030139 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0139.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0139.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201391205030139 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0140 12-05-03-0140 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0140.Button,12-05-03-0140.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201401205030140) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังคาราเมลโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำเชื่อมคาราเมล และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +CARAMEL SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, CARAMEL +SYRUP, SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0140.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0140.Button + StringFmt( $12-05-02-0140.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0140.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0140.Button + StringFmt( $12-05-03-0140.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201401205030140 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0140.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0140.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201401205030140 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0141 12-05-03-0141 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0141.Button,12-05-03-0141.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201411205030141) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลังสละโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำแดงกลิ่นสละ และโซดา /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +SALAK SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, SALAK SYRUP, +SODA" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0141.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0141.Button + StringFmt( $12-05-02-0141.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0141.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0141.Button + StringFmt( $12-05-03-0141.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201411205030141 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0141.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0141.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201411205030141 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0142 12-05-03-0142 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0142.Button,12-05-03-0142.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201421205030142) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าทรงพลัง (เพิ่มปริมาณ)" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง น้ำและน้ำแข็ง /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +EXTRA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, WATER, +ICE" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0142.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0142.Button + StringFmt( $12-05-02-0142.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0142.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0142.Button + StringFmt( $12-05-03-0142.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201421205030142 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0142.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0142.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201421205030142 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 15 + ; - 12-05-02-0143 12-05-03-0143 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0143.Button,12-05-03-0143.Button,DateTimeStart="2025/01/21T00:00:00",$Sum12050201431205030143) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เต่าพลังโซดา (เพิ่มปริมาณ)" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เครื่องดื่มเต่าทรงพลัง โซดาและน้ำแข็ง /n(มีคาเฟอีน)" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ENERGY DRINK +SODA EXTRA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "MEDICINE DRINK, SODA, ICE" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0143.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0143.Button + StringFmt( $12-05-02-0143.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0143.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0143.Button + StringFmt( $12-05-03-0143.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050201431205030143 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0143.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0143.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050201431205030143 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 20 @@ -8604,258 +10877,6 @@ Lychee Soda" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 20 - ; - 12-05-02-0034 12-05-03-0034 - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0034.Button,12-05-03-0034.Button,$Sum12050200341205030034) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เต่าทรงพลัง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เครื่องดื่มเต่าทรงพลัง -(มีคาเฟอีน)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "TAO POWER DRINK" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Medicine drink & Ice" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0034.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0034.Button - StringFmt( $12-05-02-0034.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-05-03-0034.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-03-0034.Button - StringFmt( $12-05-03-0034.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12050200341205030034 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0034.TAG tag2_is_disable - STRCONTAIN "ERR" $12-05-03-0034.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12050200341205030034 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 20 diff --git a/xml/page_pickup_cup_between_order.xml b/xml/page_pickup_cup_between_order.xml new file mode 100644 index 00000000..b669714f --- /dev/null +++ b/xml/page_pickup_cup_between_order.xml @@ -0,0 +1,215 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + + Var Timeout = 0 + Var Timeout2 = 0 + SAVELOG "open page_pickup_cup_between_order.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 + + Var PayCredit = 1 + Var TimeoutForReCheckCup = 0 + + SAVELOG "version 0.9" + + Var MenuReadyForCup = "#" + Var MenuReOrder = "-" + Var RequestPickupCupAlert = "-" + + + 1000 + + + Var TimeoutForReCheckCup = TimeoutForReCheckCup + 1 + DEBUGVAR MachineStage + + DEBUGVAR HaveCup + DEBUGVAR CHECKCUP + DEBUGVAR DoorCupPosition + DEBUGVAR RequestPickupCupAlert + DEBUGVAR ProductCodeBrewing + DEBUGVAR MenuReadyForCup + DEBUGVAR TimeoutForReCheckCup + + If TimeoutForReCheckCup > 3 Then + Var TimeoutForReCheckCup = 0 + Var MenuReadyForCup = "#" + __CMD "check-cup" ProductCodeBrewing "-" "-" + EndIf + + If MenuReadyForCup = "YES" Then + __CMD "re-order" ProductCodeBrewing "-" "XML page_pickup_cup_between_order" + EndIf + + ; Set stage machine come back to between order + If MachineStage = "remove-cup" Then + __CMD "set-stage-to-between-cup" "-" "-" "-" + EndIf + + If MenuReOrder = "success" Then + + SAVELOG " MenuReOrder MenuReOrder success " + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + + EndIf + + ; any with timeout and arm cup ready. + If RequestPickupCupAlert = "brewing" Then + + SAVELOG " RequestPickupCupAlert is brewing3 " + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + + EndIf + + ; no take cup. forward to page_NewBrewing3Conti.xml + If RequestPickupCupAlert = "fail" Then + + SAVELOG " RequestPickupCupAlert is fail " + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + + EndIf + + + ; Do not change + ; + If MachineStage = "show-menu" Then + If HaveCup = "false" Then + If DoorCupPosition = "bottom" Then + Var Timeout2 = Timeout2 + 1 + EndIf + EndIf + EndIf + + If Timeout2 > 5 Then + SAVELOG " Timeout2 > 5 " + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + EndIf + + + + DEBUGVAR Timeout + DEBUGVAR Timeout2 + + + + If show_eng = "true" Then + + Else + If HaveCup = "true" Then + + If InternationalEnable = 1 Then + + Else + 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 + EndIf + + If Timeout > 240 Then + SAVELOG "Timeout 240 from can not close door" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + + + + ; move to remove_cup_step Timeout = Timeout + 1 + ;include=ROOT/taobin_project/inc/remove_cup_step.inc + + If Timeout = 3 Then + If DoorCupPosition = "bottom" Then + Machine RemoveCup + Var buttonRemoveCup = "Invisible" + ; override for buttonRemoveCup Invisible away + Var CheckCupStateDoorCupClose = "-" + Var DoorCupPosition = "-" + EndIf + EndIf + + TimerReset + Refresh + + + + + If ChangeStatus = "payout-end" Then + Var MultiGo = 1 + EndIf + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + 335 + 1090 + "ROOT/taobin_project/image/user_take_cup_th/img_take_cup.png" + + + + + + 0 + 609 + Var(DirImage + "/img_take_cup_for_next_brew.png") + + + + + + + Open CurrentXMLFileName2 + + + + diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index c1d1f0ba..b3476a24 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -59,15 +59,6 @@ ;DEBUGVAR LidState DEBUGVAR BottomText - ;I f StarwState = "Press" Then - ; Machine StrawWithDelay - ; LED LedDoorLid Blink 255 255 255 255 - ;EndIf - ;I f LidState = "Press" Then - ; Machine LidWithDelay - ; LED LedDoorLid Blink 255 255 255 255 - ;EndIf - DEBUGVAR Seeker.TNumberTaobinCredit DEBUGVAR TelephoneNumber @@ -132,13 +123,14 @@ ;include=ROOT/taobin_project/inc/remove_cup_event_open.inc - SAVELOG "Thank you conti version TCT3" + SAVELOG "Thank you conti version TCT5" ;PendingFlag InternationalEnable ;PendingFlag New_Payment ;PendingFlag - + Var CupErrorCodeForNextOrder = 0 + Var CountDownForShowMenuNextOrderToBrew = 4 1000 @@ -160,12 +152,14 @@ Var Timeout2 = Timeout2 + 1 ; Timeout2 10*60*2 + ; To be obsolete If Timeout2 > 900 Then SAVELOG "Timeout2 900" SAVELOG "Make next order by take-cup with close-maintenance 2" Var error_code_stop_now = 1221 + If DoorCupPosition = "bottom" Then @@ -174,13 +168,44 @@ __CMD "error-code-1296" 0 "-" "-" EndIf + Var LastMakeDrinkResult = "fail" + Open "ROOT/taobin_project/xml/page_cannotConti.xml " + + EndIf + + If Timeout2 > 898 Then + SAVELOG "Timeout2 898" + + SAVELOG "Make next order by take-cup with close-maintenance 3" + + Var error_code_stop_now = CupErrorCodeForNextOrder + + + If DoorCupPosition = "bottom" Then + + Else + Var error_code_stop_now = 1296 + __CMD "error-code-1296" 0 "-" "-" + + EndIf + + Var LastMakeDrinkResult = "fail" Open "ROOT/taobin_project/xml/page_cannotConti.xml" EndIf + ; setvarint Timeout2 888 + + If Timeout2 > 890 Then + + __CMD "cup-error-code" "-" "-" "-" + DEBUGVAR CupErrorCodeForNextOrder + EndIf + If MachineStage = "close-maintenance" Then If stop_now = "true" Then + Var LastMakeDrinkResult = "fail" Open "ROOT/taobin_project/xml/page_cannotConti.xml" EndIf EndIf @@ -189,11 +214,44 @@ SAVELOG "RejectOrder page_thankyouConti" Var error_code_stop_now = 1221 + Var LastMakeDrinkResult = "fail" Open "ROOT/taobin_project/xml/page_cannotConti.xml" EndIf + __CMD "check-cup" Seeker.selected_a_drink "-" "-" + DEBUGVAR MenuReadyForCup + + If MenuReadyForCup = "YES" Then + + + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + "1" + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + Var PictureFile = PicturePath + Var PictureFile = PictureFile + PictureBegin + Var PictureFile = PictureFile + "1" + Var PictureFile = PictureFile + PictureEnd + + DEBUGVAR CountDownForShowMenuNextOrderToBrew + DEBUGVAR Seeker.selected_a_drink + + If CountDownForShowMenuNextOrderToBrew = 0 Then + Var CountDownThankyou = 0 + Else + Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1 + + EndIf + + Else + + + EndIf + + ; old condition If HaveCup = "false" Then If MachineStage = "show-menu" Then @@ -371,7 +429,6 @@ 160 1673 buttonRemoveCup -; "0x00BDFF" 500 Var( DirImage2 + "/bn_open_door.png" ) Var( DirImage2 + "/bp_open_door.png" ) @@ -405,7 +462,7 @@ 1080 end 0xFF0000 - "TCT3 " + "TCT5 " diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index c13049ac..05013a46 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -755,6 +755,8 @@ DEBUGVAR MenuReason ; arm-not-ready ; brew-stg + ; door-cup-alert + ; stop-now-set If show_eng = "true" Then If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then @@ -806,6 +808,7 @@ EndIf + If MenuReason = "-" Then Else @@ -6550,14 +6553,6 @@ __CMD "statement" 0 StatementCheckMenu "-" - ;If HalfPrice = "true" Then - ; ; Discount 50 - ; DEBUGVAR HalfPrice - ; __CMD "invoke-discount-50" UserSelectProductCode "-" "-" - ; - ;Else - ; Var PriceDrink = PriceDrinkTmp - ;EndIf DEBUGVAR PriceDrinkTmp @@ -8215,11 +8210,13 @@ - 1 - 1900 + 0 + 1888 MenuReasonStage KanitTTF - 18 + 22 + 1078 + end 0xFF0000 MenuReasonString