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

Release 6.41

Browse source
This commit is contained in:
kong 2022-05-02 22:14:11 +07:00
parent dbb7254a47
commit f169781442
11 changed files with 104 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/menu_catalog.xml
View file

@ -5,7 +5,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

12
xml/menu_catalog_default_init.xml
View file

@ -11,7 +11,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -21,9 +21,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"

14
xml/page_catalog_group_coffee.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -138,7 +146,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

14
xml/page_catalog_group_milk.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -138,7 +146,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

14
xml/page_catalog_group_other.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -136,7 +144,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

14
xml/page_catalog_group_recommend.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -138,7 +146,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

14
xml/page_catalog_group_tea.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -138,7 +146,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

14
xml/page_catalog_group_whey.xml
View file

@ -21,7 +21,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var ice_tab_text = "Ice will be ready at"
Var ice_tab_text = "Ice will be ready at "
Else
Var showengText = "Invisible"
@ -31,9 +31,17 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@ -151,7 +159,7 @@
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf

17
xml/page_drinkok.xml
View file

@ -196,6 +196,23 @@
Var Timeout = Timeout + 1
; Timeout 10*60*2
If Timeout > 1200 Then
SAVELOG "Timeout 1200"
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 30 Then
Var MultiGo = 1
EndIf

16
xml/page_show_error.xml
View file

@ -17,14 +17,14 @@
Var show_error_normal = "Invisible"
Var show_error_sp1 = "Enable"
If EmergencyStop = "true" Then
Var stop_now = "true"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
Else
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
EndIf
;If EmergencyStop = "true" Then
; Var stop_now = "true"
; If show_eng = "true" Then
; Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
; Else
; Var DirImage = "ROOT/taobin_project/image/vending_error"
; EndIf
;EndIf
If MachineStage = "mcu-upgrade" Then
If show_eng = "true" Then

4
xml_main/startup.xml_new_layout
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "6.40"
Var XMLPageVersionInt = 640
Var XMLPageVersion = "6.41"
Var XMLPageVersionInt = 641
</EventOpen>
<Text>