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

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
miggaze 2022-02-28 15:39:28 +07:00
commit 59505ac31d
4 changed files with 76 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_board.xml
View file

@ -536,7 +536,7 @@
DEBUGVAR CountUpReloadAll
If CountUpReloadAll > 60 Then
If CountUpReloadAll > 40 Then
Var StartUpExt = "-"
Var CountUpReloadAll = 0

7
xml/page_drinkfail2Multi.xml
View file

@ -134,9 +134,10 @@
Var ServiceType = "coffee"
Var ServiceCredit = CART2_PDCODE
Var SuggestID = ""
Var SessionID2 =
Var SessionID2 = ""
DEBUGVAR CART2_PRICE
DEBUGVAR ServiceAmountSum
Var ServiceAmount2 = CART2_PRICE
@ -178,9 +179,11 @@
Var ServiceType = "coffee"
Var ServiceCredit = CART3_PDCODE
Var SuggestID = ""
Var SessionID2 =
Var SessionID2 = ""
DEBUGVAR CART3_PRICE
DEBUGVAR ServiceAmountSum
Var ServiceAmount2 = CART3_PRICE

89
xml/page_payment.xml
View file

@ -12,7 +12,6 @@
Var QRCODETMP = ""
Var QRChannel = 0
Var HaveCup = "true"
;Var PriceDrink = 5
@ -84,20 +83,7 @@
EndIf
If Seeker = "curr" Then
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
If CupChecking = "true" Then
SAVELOG "CupChecking = true"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
Var MachineStage = "-"
@ -124,12 +110,45 @@
DEBUGVAR Seeker.thankStrawFlag
Var Seeker.PayWithQR = 0
If CupChecking = "true" Then
Var StageShowAlias = "Invisible"
Var StageShowLoading = "Enable"
Else
Var StageShowAlias = "Enable"
Var StageShowLoading = "Invisible"
EndIf
</EventOpen>
<Timeout> 900 </Timeout>
<EventTimeout>
DEBUGVAR Seeker
DEBUGVAR HaveCup
DEBUGVAR CupChecking
DEBUGVAR CountStepPackPayment
If Seeker = "curr" Then
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
If CupChecking = "true" Then
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
EndIf
If ReadyForBrew = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -141,12 +160,15 @@
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
If CupChecking = "false" Then
If HaveCup = "false" Then
Var CountStepPackPayment = CountStepPackPayment + 1
EndIf
EndIf
Var CountStepPackPayment = CountStepPackPayment + 1
If CountStepPackPayment = 1 Then
SAVELOG ExtendData
If GetPayInfoFlag = 0 Then
@ -221,17 +243,13 @@
EndIf
TimerReset
Refresh
</EventTimeout>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
@ -242,7 +260,9 @@
</Video>
<Image>
<State> StageShowAlias</State>
<X> 375 </X>
<Y> 623 </Y>
<Width> 331 </Width>
@ -251,6 +271,7 @@
</Image>
<Text>
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
@ -262,6 +283,7 @@
</Text>
<Text>
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 1022 </Y>
<Width> 1080</Width>
@ -273,10 +295,27 @@
</Text>
<Image>
<State> StageShowAlias</State>
<X> 144 </X>
<Y> 413 </Y>
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
</Image>
<GIF>
<X> 493 </X>
<Y> 968 </Y>
<State>StageShowLoading</State>
<Width> 94 </Width>
<Height> 94 </Height>
<Filename> Var( DirImage + "/loading.gif" )</Filename>
</GIF>
<Image>
<State>StageShowLoading</State>
<X> 267 </X>
<Y> 1065 </Y>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
</Popup>

6
xml/page_payment_cashMore.xml
View file

@ -575,6 +575,7 @@
If CancelFlag = 0 Then
SAVELOG "Timeout > 180 s."
Cart "DeleteMenuID" "ALL"
Var CART_COUNT=0
If ViewBill > 0 Then
@ -809,6 +810,7 @@
If CoinInOK = 0 Then
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
Var CART_COUNT=0
SAVELOG "VDCancle > Cancle Order."
CoinVending OFF
Var CancelFlag = 1
@ -1349,6 +1351,8 @@
If CoinInOK = 0 Then
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
Var CART_COUNT = 0
SAVELOG "ButtonCancleMain > Cancle All Order."
CoinVending OFF
Var CancelFlag = 1
@ -1616,6 +1620,8 @@ EndIf
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
Var CART_COUNT = 0
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"