pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-07 16:11:35 +07:00
commit 5c238cd286
16 changed files with 1231 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

19
animation01/play_list.tsv
View file

@ -1363,3 +1363,22 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
ผลไม้ปั่น 12-01-07-0001 1 41 41 41 41 41 24 100 7:40 32
โอวัลตินกาแฟ 12-01-03-0092 1 51 17 2 3 4 5 23 41 24 100 7:40 32
โอวัลตินกาแฟ 12-21-03-0092 1 51 17 2 3 4 5 23 41 24 100 7:40 32
โอวัลตินชาไทยนม 12-02-03-0105 1 51 17 10 23 41 24 100 7:40 32
โอวัลตินมัทฉะลาเต้ 12-02-03-0106 1 51 17 8 9 23 41 24 100 7:40 32
โอวัลตินชานม 12-02-03-0107 1 51 17 10 23 41 24 100 7:40 32
โอวัลตินมะลิ 12-02-03-0108 1 51 17 10 23 41 24 100 7:40 32
โอวัลตินน้ำแดง 12-03-03-0108 1 51 17 21 23 41 24 100 7:40 32
โอวัลตินคาราเมล 12-03-03-0109 1 51 17 22 23 41 24 100 7:40 32
โอวัลตินมะพร้าว 12-03-03-0110 1 51 17 62 23 41 24 100 7:40 32
มะม่วงปั่น ( test) 12-00-07-0000 1 65 64 24 100 7:40 32
มะม่วงเต่าปั่น 12-06-03-0001 1 65 64 24 100 8:40 32
มะม่่วงลิ้นจี่เต่าปั่น 12-06-03-0002 1 11 65 24 100 9:40 32
มะม่วงสตรอเบอรีเต่าปั่น 12-06-03-0003 1 19 65 24 100 10:40 32
มะม่วงสละเต่าปั่น 12-06-03-0004 1 21 65 24 100 11:40 32
มะม่วงมัทฉะเต่าปั่น 12-06-03-0005 1 8 9 65 24 100 12:40 32
มะม่วงชาไต้หวันเต่าปั่น 12-06-03-0006 1 10 65 24 100 13:40 32

Can't render this file because it has a wrong number of fields in line 40.

4
inter/tha/menu/lang.tsv
View file

@ -1263,7 +1263,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. เลือกทิศทาง
@ -1276,7 +1276,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด

Can't render this file because it has a wrong number of fields in line 22.

6
inter/tha/xml/multi/tab_menu.lxml
View file

@ -38,7 +38,12 @@
If SpiralOnline = "true" Then
If Seeker = "curr" Then
If SpiralModeFrozenFruit = 1 Then
If Menu0Selected = "PressForever" Then
Else
Var Menu0Selected = "Enable"
EndIf
Var MenuVSelected2 = "Invisible"
EndIf
@ -276,4 +281,3 @@
</ListView1>
</Popup>

10
inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
View file

@ -147,7 +147,7 @@
; ==================> Len = 3
; - 12-02-02-0099 -
<Menu>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pure_Matcha_X3.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </DisableImage>
@ -374,7 +374,7 @@
; ==================> Len = 3
; - - 12-03-03-0103
<Menu>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Smoothie.png" </DisableImage>
@ -602,7 +602,7 @@
; ==================> Len = 3
; - - 12-03-03-0106
<Menu>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Matcha_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Matcha_Smoothie.png" </DisableImage>
@ -830,7 +830,7 @@
; ==================> Len = 3
; - 12-01-02-0090 -
<Menu>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>
@ -1057,7 +1057,7 @@
; ==================> Len = 3
; - 12-21-02-0090 -
<Menu>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>

1133
inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
View file

File diff suppressed because it is too large Load diff

2
inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt
View file

@ -19,7 +19,7 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu0Selected = "PressForever"
SAVELOG " Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected"
Var Timeout = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"

6
inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
View file

@ -1038,7 +1038,7 @@
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_Milk_Oreo_Volcano.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Yuzu Milk Oreo Volcano</LanguageSlot1>
<LanguageSlot1>Yuzu Milk\nOreo Volcano</LanguageSlot1>
<LanguageSlot2>ยูซุโอริโอ้โวคาโน่</LanguageSlot2>
<LanguageSlot3>-</LanguageSlot3>
<LanguageSlot4>-</LanguageSlot4>
@ -1137,7 +1137,7 @@
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "12-03-03-0087"
; begin lang
Var aliasName[0] = "Yuzu Milk Oreo Volcano"
Var aliasName[0] = "Yuzu Milk\nOreo Volcano"
Var aliasDesc[0] = "Yuzu Milk Oreo"
Var aliasName[1] = "ยูซุโอริโอ้โวคาโน่"
Var aliasDesc[1] = "ยูซุ นม โอริโอ้"
@ -1173,7 +1173,7 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Yuzu Milk Oreo Volcano SMOOTHIE"
Var NameLang[2][0] = "Yuzu Milk\nOreo Volcano SMOOTHIE"
Var NameLang[2][1] = "ยูซุโอริโอ้โวคาโน่"
Var NameLang[2][2] = "-"
Var NameLang[2][3] = "-"

2
inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_11.lxml
View file

@ -3623,7 +3623,7 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Yuzu Milk Oreo Volcano SMOOTHIE"
Var NameLang[2][0] = "Yuzu Milk\nOreo Volcano SMOOTHIE"
Var NameLang[2][1] = "ยูซุโอริโอ้โวคาโน่"
Var NameLang[2][2] = "-"
Var NameLang[2][3] = "-"

6
inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml
View file

@ -2126,7 +2126,7 @@
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Yuzu_Milk_Oreo_Volcano.png" </DisableImage>
<Name>
<LanguageGroup>
<LanguageSlot1>Yuzu Milk Oreo Volcano</LanguageSlot1>
<LanguageSlot1>Yuzu Milk\nOreo Volcano</LanguageSlot1>
<LanguageSlot2>ยูซุโอริโอ้โวคาโน่</LanguageSlot2>
<LanguageSlot3>-</LanguageSlot3>
<LanguageSlot4>-</LanguageSlot4>
@ -2225,7 +2225,7 @@
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "12-03-03-0087"
; begin lang
Var aliasName[0] = "Yuzu Milk Oreo Volcano"
Var aliasName[0] = "Yuzu Milk\nOreo Volcano"
Var aliasDesc[0] = "Yuzu , Milk,\nSugar, Oreo"
Var aliasName[1] = "ยูซุโอริโอ้โวคาโน่"
Var aliasDesc[1] = "ยูซุ นม น้ำตาล \nโอรีโอ"
@ -2261,7 +2261,7 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Yuzu Milk Oreo Volcano SMOOTHIE"
Var NameLang[2][0] = "Yuzu Milk\nOreo Volcano SMOOTHIE"
Var NameLang[2][1] = "ยูซุโอริโอ้โวคาโน่"
Var NameLang[2][2] = "-"
Var NameLang[2][3] = "-"

10
inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
View file

@ -115,7 +115,7 @@
; ==================> Len = 3
; - 12-02-02-0099 -
<Menu>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pure_Matcha_X3.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </DisableImage>
@ -342,7 +342,7 @@
; ==================> Len = 3
; - - 12-03-03-0103
<Menu>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Smoothie.png" </DisableImage>
@ -570,7 +570,7 @@
; ==================> Len = 3
; - - 12-03-03-0106
<Menu>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Matcha_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Matcha_Smoothie.png" </DisableImage>
@ -798,7 +798,7 @@
; ==================> Len = 3
; - 12-01-02-0090 -
<Menu>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>
@ -1025,7 +1025,7 @@
; ==================> Len = 3
; - 12-21-02-0090 -
<Menu>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>

10
inter/tha/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml
View file

@ -77,7 +77,7 @@
; ==================> Len = 3
; - 12-02-02-0099 -
<Menu>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State>
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pure_Matcha_X3.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </DisableImage>
@ -304,7 +304,7 @@
; ==================> Len = 3
; - - 12-03-03-0103
<Menu>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State>
<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Smoothie.png" </DisableImage>
@ -532,7 +532,7 @@
; ==================> Len = 3
; - - 12-03-03-0106
<Menu>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State>
<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Coconut_Milk_Matcha_Smoothie.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Coconut_Milk_Matcha_Smoothie.png" </DisableImage>
@ -760,7 +760,7 @@
; ==================> Len = 3
; - 12-01-02-0090 -
<Menu>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State>
<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>
@ -987,7 +987,7 @@
; ==================> Len = 3
; - 12-21-02-0090 -
<Menu>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State>
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State>
<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>

41
inter/tha/xml/page_smoothie_suggest_and_process.xml
View file

@ -87,6 +87,21 @@
Var SmoothieProcessState = "idle"
Var CountDownCertainConfuse = 5
Var ArmIDForMakeOrder = 0
If CH9992_Status = "READY" Then
Var ArmIDForMakeOrder = 2
EndIf
If CH9994_Status = "READY" Then
;Var ArmIDForMakeOrder = 4
EndIf
DEBUGVAR ArmIDForMakeOrder
__CMD "ui-load-playlist" 0 SelectDrink "-"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -169,8 +184,19 @@
DEBUGVAR SmoothieProcessState
DEBUGVAR AnyArmConfuse
DEBUGVAR SensorDoorCupStatus
DEBUGVAR ArmIDForMakeOrder
If ArmIDForMakeOrder = 2 Then
Var ChannelArmForProccessStatus = CH9992_Status
EndIf
If ArmIDForMakeOrder = 4 Then
Var ChannelArmForProccessStatus = CH9994_Status
EndIf
DEBUGVAR ChannelArmForProccessStatus
If ChannelArmForProccessStatus = "READY" Then
@ -187,6 +213,9 @@
EndIf
Else
If DoorCupPosition = "top" Then
Var TextDoorButtonID = 001204
If SmoothieProcessState = "press" Then
Var SmoothieProcessState = "insert"
@ -228,19 +257,21 @@
Var SelectDrink = Seeker.selected_a_drink
Var SelectSugarID = ""
Machine StrawOrder
Topping "Select" SelectDrink
Var SmoothieProcessState = "blending"
EndIf
If SmoothieProcessState = "blending" Then
Menu "set-name" "Smoothie "
Menu "set-image" Seeker.PictureDrink
Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml"
EndIf
@ -254,6 +285,8 @@
;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 0 </X>
<Y> 380 </Y>

5
inter/tha/xml/page_topping_frozen_fruit_select.lxml
View file

@ -139,6 +139,10 @@
CRLFToSpace showname
CRLFToSpace showdesc
Var Seeker.PictureDrink = PictureDrink
Var Seeker.showname = showname
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -705,6 +709,7 @@
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
Machine StrawOrder
Var Seeker.PictureDrink = PictureDrink
Var Seeker.showname = showname

2
xml/page_spiral_sell.xml
View file

@ -52,7 +52,7 @@
Var SpiralPayDetail = SpiralPayDetail + SessionID4
DEBUGVAR SpiralPayDetail
Seeker.sprial_pay_detail = SpiralPayDetail
Var Seeker.sprial_pay_detail = SpiralPayDetail
If Seeker = "next" Then
Var NextOrder = "true"

7
xml/process/payext_setup.ev
View file

@ -15,7 +15,7 @@ If Seeker.PayWithQR = 0 Then
Var PayO2 = Seeker.CoffeePinNumber
EndIf
EndIf
DEBUGVAR Seeker
DEBUGVAR TelephoneNumber
Var TelephoneNumberExt = TelephoneNumber
If TelephoneNumberExt = "" Then
@ -25,8 +25,9 @@ __CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
Var payOrderChannel = "/XML|" + Seeker.OrderChanel
__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""
DEBUGVAR Seeker.SmoothieToPayment
If Seeker.SmoothieToPayment = 1 Then
SAVELOG "[FROZEN-FRUIT] Set spiral pay detail"
Var SpiralPayDetail = Seeker.sprial_pay_detail
__CMD "SprialPayDetail" SpiralPayDetail "-" "-"
__CMD "SprialPayDetail" Seeker.sprial_pay_detail "-" "-"
EndIf

6
xml/vending_info.xml
View file

@ -8,6 +8,12 @@
; On open
Machine AndroidTemperatureUpdateNow
DEBUGVAR CH9991_Status
DEBUGVAR CH9992_Status
DEBUGVAR CH9993_Status
DEBUGVAR CH9994_Status
Var info_startX = 11
Var info_1Y = 250
Var info_2Y = 320