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

WTC+SGP: fix drinkfail 3 not in theme & popup not enough change in payment case

Browse source
This commit is contained in:
Pakin 2024-09-25 15:33:17 +07:00
parent be7e1adb60
commit 7eb2025801
5 changed files with 241 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inter/sgp/xml/page_brewing3_blue.lxml
View file

@ -1940,6 +1940,9 @@
<EventUnitTest3>
; test drinkfail
Var MachineStage = "remove-cup"
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest3>

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

@ -46,9 +46,13 @@
Var StepX = 1
Var Ext1a = ""
Var DrinkFail3Page = "ROOT/taobin_project/xml/page_drinkfail3.xml"
If UsePepsiTheme = 1 Then
Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing/"
Var DrinkFail3Page = "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml"
EndIf
</EventOpen>
@ -94,7 +98,7 @@
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Open DrinkFail3Page
Else
If NextOrder = "true" Then
Var NextOrder = "false"
@ -236,9 +240,9 @@ EndIf
DEBUGVAR MachineStage
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Open DrinkFail3Page
Else
If NextOrder = "true" Then

215
inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml Normal file
View file

@ -0,0 +1,215 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf
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"
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 + "/img_popup12.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>

26
inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
View file

@ -2154,9 +2154,7 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3 </State>
<Filename> eval(
Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png"
) </Filename>
<Filename> Var( DirImage + "/img_popup12_NotEnoughCoin.png" )</Filename>
</Image>
<Button>
@ -2182,11 +2180,11 @@ EndIf
</Button>
<Button>
<X> 327 </X>
<X> 397 </X>
<Y> 1335 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2265,15 +2263,15 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
<Filename> Var( DirImage + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<X> 397 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2484,8 +2482,6 @@ Var SELLONLINE = 1
Var EnoughChange = "yes"
Var PayState1 = "Enable"
Var CoinAmount = 300
</EventUnitTest2>
<EventUnitTest3>
@ -2500,6 +2496,12 @@ Var PayState2 = "Enable"
</EventUnitTest4>
<EventUnitTest5>
Var alphaState3 = "Enable"
</EventUnitTest5>
</Popup>

2
xml/page_payment_cash-SGP.xml
View file

@ -489,6 +489,8 @@
Var CancelContinue = 0
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
Var NotEnoughCoinPopup = DirImage2 + "/img_popup12_NotEnoughCoin.png"
</EventOpen>
<EventActionOk>