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

merged

Browse source
This commit is contained in:
kong 2021-02-05 14:11:05 +07:00
commit 36ceee08bc
160 changed files with 5829 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

119
xml/page_brewing3.xml
View file

@ -30,10 +30,20 @@
Var VendingTSIDTmp = VendingTSID
EndIf
Var waitAckPay = 0
Var VendingTSIDTmp = ""
If PayWithQR = 1 Then
Var VendingTSIDTmp = VendingTSID
EndIf
</EventOpen>
<EventActionOk>
If ActionOKCase = 1 Then
If CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":"
@ -71,6 +81,7 @@
Var ActionOKCase = 2
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
@ -86,6 +97,10 @@
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
<<<<<<< HEAD
=======
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
</EventActionOk>
<EventActionError>
@ -191,28 +206,45 @@
If ChangeOK = 2 Then
If ActionOKCase = 0 Then
Var TelephoneNumber = "0899999999"
If TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
Else
Var TelephoneNumber = TNumberTaobinCredit
Var PayO2 = CoffeePinNumber
EndIf
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;Open "ROOT/xml/page_closeMaintenance.xml"
Var ActionOKCase = 1
EndIf
EndIf
If ChangeTimeout > 30 Then
If ActionOKCase = 0 Then
If TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
Else
Var TelephoneNumber = TNumberTaobinCredit
Var PayO2 = CoffeePinNumber
EndIf
Var VendingDiscount = 0
Var VendingCampaign = 0
Var TelephoneNumber = "0899999999"
;Var TelephoneNumber = "0899999999"
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;Open "ROOT/xml/menu_closeMaintenance.xml"
Var ActionOKCase = 1
EndIf
EndIf
@ -263,9 +295,18 @@
Var waitAckPay = 1
Var Timeout = 0
Var ProcessText = ""
Var TelephoneNumber = "0899999999"
Var ProcessText = ""
If TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
Else
Var TelephoneNumber = TNumberTaobinCredit
Var PayO2 = CoffeePinNumber
EndIf
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
@ -307,6 +348,7 @@
Else
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
<<<<<<< HEAD
EndIf
@ -326,8 +368,45 @@
EndIf
EndIf
=======
EndIf
Else
If ChangeFlag2 = 1 Then
Var TelephoneNumber = "0899999999"
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If StoreCreditFlag = 1 Then
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
;no wait ack pay
Var waitAckPay = 0
EndIf
EndIf
EndIf
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
EndIf
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then
@ -346,7 +425,12 @@
If CodeChannel = 0 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Change ServiceAmount2
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else
@ -355,7 +439,12 @@
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
Change ServiceAmount2
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else
@ -382,7 +471,11 @@
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = CoinAmount
Change CoinAmount
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else
@ -399,7 +492,11 @@
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = CoinAmount
Change CoinAmount
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else