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

AUS: Update remove cup drinkfail3 and payment

Browse source
This commit is contained in:
Kenta420 2025-01-14 15:33:05 +07:00
parent c6cb5b1b32
commit 4a191fc858
7 changed files with 243 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/aus/image/page_drink_fail/bn_door_open.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
inter/aus/image/page_drink_fail/bp_door_open.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
inter/aus/image/page_drink_fail/remove_cup.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 76 KiB

210
inter/aus/xml/page_drinkfail3.lxml Normal file
View file

@ -0,0 +1,210 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var DirImage = "ROOT/taobin_project/inter/aus/image/page_drink_fail"
Var Timeout = 0
Var Door_Open_State="Invisible"
Var Door_Open_flagBlink = 0
If HaveCup = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Var CheckCupStateDoorCupCloseCnt = 15
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
DEBUGVAR Timeout
DEBUGVAR MachineStage
DEBUGVAR NextOrder
DEBUGVAR HaveCup
If Door_Open_flagBlink = 0 Then
Var Door_Open_flagBlink = 1
Var Door_Open_State="Enable"
Else
Var Door_Open_flagBlink = 0
Var Door_Open_State="Invisible"
EndIf
If HaveCup = "true" Then
DEBUGVAR CheckCupStateDoorCupClose
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "reset" Then
If CheckCupStateDoorCupCloseCnt = 0 Then
Var CheckCupStateDoorCupClose = ""
Else
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
EndIf
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
If buttonRemoveCup = "Invisible" Then
Var Door_Open_State = "Invisible"
EndIf
DEBUGVAR buttonRemoveCup
DEBUGVAR Door_Open_State
If MachineStage = "remove-cup" Then
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Remove cup drink fail "
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
; must remove cup.
If HaveCup = "true" Then
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Have Cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 240 Then
If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 53 </X>
<Y> 473 </Y>
<Filename> Var( DirImage + "/remove_cup.png" )</Filename>
</Image>
<Button>
<X> 212 </X>
<Y> 1661 </Y>
<Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State>buttonRemoveCup</State>
<EventClick>
Machine RemoveCup
Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 15
</EventClick>
</Button>
<Button>
<X> 212 </X>
<Y> 1661 </Y>
<State> Door_Open_State </State>
<Filename> Var( DirImage + "/bp_door_open.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Machine RemoveCup
Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 15
</EventClick>
</Button>
</Popup>

4
inter/aus/xml/page_drinkfail_aus.lxml
View file

@ -137,7 +137,7 @@
If Timeout > 20 Then
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
@ -180,7 +180,7 @@
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"

35
xml/page_payment_cash-AUS.xml
View file

@ -301,9 +301,12 @@
EndIf
Var IsCardlessEnable = 0
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Coin CARD
Var IsCardlessEnable = 1
EndIf
EndIf
@ -332,10 +335,9 @@
EndIf
If SELLONLINE = 0 Then
;SAVELOG "Credit card only NetworkStatus down"
SAVELOG "NetworkStatus down"
SAVELOG "Credit card only NetworkStatus down"
Var PayWithCreditCardState = "Disable"
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
@ -1653,8 +1655,10 @@ EndIf
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
CashlessReq OFF
If IsCardlessEnable = 1 Then
CashlessReq OFF
Var IsCardlessEnable = 0
EndIf
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
@ -1684,7 +1688,11 @@ EndIf
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
CashlessReq OFF
If IsCardlessEnable = 1 Then
CashlessReq OFF
Var IsCardlessEnable = 0
EndIf
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
@ -1722,6 +1730,10 @@ EndIf
Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
If IsCardlessEnable = 1 Then
CashlessReq OFF
Var IsCardlessEnable = 0
EndIf
VendingQR ON
Var SessionID2 = SelectSlot + ":"
@ -1828,6 +1840,12 @@ EndIf
Var scanresult = ""
Var scanmsg = ""
Var EMAMemberID = ""
If IsCardlessEnable = 1 Then
CashlessReq OFF
Var IsCardlessEnable = 0
EndIf
INITSCANQR
Var CameraState = "Enable"
@ -2064,6 +2082,11 @@ EndIf
Var popup_cancel_button_y = 1345
If IsCardlessEnable = 0 Then
Coin CARD
Var IsCardlessEnable = 1
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "9.44"
Var XMLPageVersionInt = 944
Var XMLPageVersion = "9.45"
Var XMLPageVersionInt = 945
;Oreo
Var OreoGuarantee = 0