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

fix bug reftx1

Browse source
This commit is contained in:
pichet 2022-10-03 14:20:29 +07:00
parent bf927fe265
commit d96f545308
7 changed files with 167 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_brewing3.xml
View file

@ -582,7 +582,7 @@
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq CANCEL
CashlessReq FAIL
EndIf
@ -665,7 +665,7 @@
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq CANCEL
CashlessReq FAIL
EndIf
@ -740,7 +740,7 @@
EndIf
If MachineState_Result = 1 Then
;Var MachineState_Result = 2
EndIf
If MachineState_Result = 1 Then

4
xml/page_brewing3Conti.xml
View file

@ -433,7 +433,7 @@
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq CANCEL
CashlessReq FAIL
EndIf
@ -507,7 +507,7 @@
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq CANCEL
CashlessReq FAIL
EndIf

46
xml/page_cannotConti.xml
View file

@ -199,6 +199,8 @@
Var CreditReference = Seeker.CreditReferenceTmp
Var VendingDiscount = Seeker.VendingDiscount
Var VendingCampaign = Seeker.VendingCampaign
Var TxReference = Seeker.TxRef1
DEBUGVAR TxReference
If show_eng = "true" Then
@ -461,6 +463,28 @@
Var SuggestID = ""
Var SessionID2 = ""
If Seeker.CreditCard = 1 Then
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + ""
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "CC01"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq FAIL
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
@ -527,6 +551,28 @@
Var SuggestID = ""
Var SessionID2 = ""
If Seeker.CreditCard = 1 Then
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + ""
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "CC01"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.CreditCardRef
Var SessionID2 = SessionID2 + "/"
CashlessReq FAIL
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then

2
xml/page_drinkfail2-2.xml
View file

@ -41,7 +41,7 @@
Var Timeout = Timeout + 1
If Timeout > 60 Then
If Timeout > 5 Then
StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then

2
xml/page_drinkfail2.xml
View file

@ -155,7 +155,7 @@
Var Timeout = Timeout + 1
If Timeout > 60 Then
If Timeout > 15 Then
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"

2
xml/page_drinkfail4.xml
View file

@ -95,7 +95,7 @@
EndIf
Else
If Timeout > 60 Then
If Timeout > 5 Then
StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then

114
xml/page_payment_cash.xml
View file

@ -16,7 +16,7 @@
;EndIf
Var CashlessPayFlag = 0
Var RemainAmountStrENG = ""
Var AdultState = "Invisible"
Var AdultState1 = "Invisible"
@ -357,6 +357,8 @@
Var ShowNetworkProblemText = ""
EndIf
DEBUGVAR NOCashFlag
If NOCashFlag = 1 Then
Var PayState1 = "Disable"
EndIf
@ -760,6 +762,29 @@
Var PayInfoCFlag = 1
EndIf
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
VendingQR OFF
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
</EventActionOk>
<EventActionError>
@ -797,10 +822,41 @@
Var PayInfoCFlag = 1
EndIf
If VendingCashless = "ERROR" Then
Var QRErrorFlag = 1
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
EndIf
EndIf
Refresh
</EventActionError>
<EventCashlessCard>
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
If VendingCashless = "READY" Then
Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
CashlessPay PriceDrink CreditCardRef
Var CashlessPayFlag = 1
EndIf
Refresh
</EventCashlessCard>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -960,6 +1016,11 @@
Var CancelFlag = 1
Var cancelState = "Enable"
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
Var CancelCounter = 0
If CoinAmount = 0 Then
@ -1366,6 +1427,8 @@
</EventVDCancle>
<Image>
<X> 91 </X>
<Y> 1180 </Y>
@ -1416,6 +1479,11 @@
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
@ -1682,6 +1750,38 @@
</EventClick>
</Button>
<Button>
<X> 432 </X>
<Y> 1503 </Y>
<State> PayState5</State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Coin CARD
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
Refresh
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button>
<X> 418 </X>
<Y> 1503 </Y>
@ -1908,6 +2008,11 @@
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
@ -2001,6 +2106,13 @@
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
Refresh
</EventClick>
</Button>