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

SGP+WTC: Add menu ready check & change drink fail wordings

Browse source
This commit is contained in:
Pakin 2025-05-19 09:32:50 +07:00
parent 51168cf8a5
commit 880568c83f
4 changed files with 154 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/sgp/xml/page_drinkfail_sg.lxml
View file

@ -188,7 +188,7 @@ EndIf
<Image>
<X> 329 </X>
<Y> 1301 </Y>
<Y> 1351 </Y>
<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>

BIN
inter/whatthecup/sgp/image/collectiing/text_11.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 83 KiB

Before After
Before After

153
inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
View file

@ -91,6 +91,7 @@
;SAVELOG PreviseXMLFileName2
Var MenuReady = "-"
Var topping1 = "1"
Var topping2 = "31"
@ -385,6 +386,120 @@
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf
If SelectDrinkType = 1 Then
If MenuReady = "YES" Then
DEBUGVAR ToppingDetail
; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
DEBUGVAR menu_blend_free
DEBUGVAR blend_button_state
DEBUGVAR DoorCupPosition
DEBUGVAR show_eng
If menu_blend_free = "true" Then
If blend_button_state = "PressForever" Then
Var PriceDrinkNoTop = 0
Var PriceDrink = 0
Var PriceDrinkTmpShow = "Free"
EndIf
EndIf
If Seeker = "next" Then
If CupRemain > 0 Then
If Only18 = "true" Then
DEBUGVAR SelectDrink
MenuProfile SelectDrink "IsMenuInProfile"
; disable old verification
Var AdultState1 = "Invisible"
DEBUGVAR IsMenuInProfile
If IsMenuInProfile = "true" Then
; Check profile
If EnableLiveness = "true" Then
DEBUGVAR EnableLiveness
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; full
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Only IDCard
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
Else
If DoorCupPosition = "bottom" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If FromEnergyDrink1BathPro = 1 Then
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
EndIf
If Only18 = "true" Then
DEBUGVAR SelectDrink
MenuProfile SelectDrink "IsMenuInProfile"
; disable old verification
Var AdultState1 = "Invisible"
DEBUGVAR IsMenuInProfile
If IsMenuInProfile = "true" Then
; Check profile
If EnableLiveness = "true" Then
DEBUGVAR EnableLiveness
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; full
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Only IDCard
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
EndIf
EndIf
If MenuReady = "YES" Then
EndIf
EndIf
Var Timeout = Timeout + 1
If Timeout > 40 Then
@ -3485,7 +3600,25 @@
<Volume> SoundVolume </Volume>
<EventClick>
;Var Seeker = "curr"
Var Timeout = 0
Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
__CMD "statement" 0 StatementCheckMenu "-"
DEBUGVAR StatementCheckMenu
DEBUGVAR PriceDrinkTmp
;Var Seeker.PriceDrink = PriceDrinkTmp
Var PriceDrink = PriceDrinkTmp
Var PromotionPriceDrink = PriceDrink
DEBUGVAR PriceDrink
SAVELOG "USER press next ( topping ) - new"
DEBUGVAR topping1
DEBUGVAR topping2
@ -3505,6 +3638,13 @@
If LidState = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
Var bg_lidProblem_ST = "Enable"
Else
If LidState = "Disable" Then
Var bg_lidProblem_ST = "Disable"
Else
Var bg_lidProblem_ST = "Invisible"
EndIf
EndIf
Var StrawState = "Enable"
@ -3566,6 +3706,12 @@
;Var Seeker = "curr"
Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
__CMD "statement" 0 StatementCheckMenu "-"
DEBUGVAR StatementCheckMenu
DEBUGVAR PriceDrinkTmp
@ -3674,9 +3820,13 @@
Machine LidOrder
Var LedLidBlink = "true"
Var bg_lidProblem_ST = "Enable"
Else
If LidState = "Disable" Then
Var bg_lidProblem_ST = "Disable"
Else
Var bg_lidProblem_ST = "Invisible"
EndIf
EndIf
If SelectDrinkType = 0 Then
@ -3755,7 +3905,8 @@
Else
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
;Open "ROOT/taobin_project/xml/page_payment.xml"
DEBUGVAR "WaitCheckMenu"
EndIf
EndIf

6
xml/page_board.xml
View file

@ -1021,12 +1021,6 @@
; Singapore disable point
Var SettingIgnoreCollectPoint = 1
If BoxID = 210604 Then
Var SettingIgnoreCollectPoint = 0
EndIf
;If BoxID = 210699 Then
;Var SettingIgnoreCollectPoint = 0
;EndIf
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg