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

Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2021-07-13 14:04:13 +07:00
commit e29fc53f7a
5 changed files with 55 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xml/page_brewing3.xml
View file

@ -24,6 +24,7 @@
Var waitAckPay = 0 Var waitAckPay = 0
Var VendingTSIDTmp = "" Var VendingTSIDTmp = ""
Var VendingTSIDProblem = ""
@ -286,7 +287,7 @@
EndIf EndIf
If waitAckPay = 2 Then If waitAckPay = 2 Then
If Timeout > 60 Then If Timeout > 10 Then
If CodeChannel = 1 Then If CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
@ -365,10 +366,10 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
If CodeChannel = 0 Then ;If CodeChannel = 0 Then
SAVELOG "back_to_main from line > 315." ; SAVELOG "back_to_main from line > 315."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf ;EndIf
Var waitAckPay = 2 Var waitAckPay = 2
Var Timeout = 5 Var Timeout = 5
@ -409,10 +410,10 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
If CodeChannel = 0 Then ;If CodeChannel = 0 Then
SAVELOG "back_to_main from line > 357." ; SAVELOG "back_to_main from line > 357."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf ;EndIf
Var waitAckPay = 2 Var waitAckPay = 2
Var Timeout = 5 Var Timeout = 5
@ -562,7 +563,6 @@
Var ServiceSuccess = "yes" Var ServiceSuccess = "yes"
If waitAckPay = 0 Then If waitAckPay = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf

20
xml/page_drinkfail2-2.xml
View file

@ -46,8 +46,16 @@
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
If PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
Else
Var VendingTSIDProblem = VendingTSID
EndIf
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems" Var ChooseProblem = "taobin purchasing problems"
PROBLEM TelephoneNumberProblem ChooseProblem PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf EndIf
@ -95,8 +103,16 @@
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
If PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
Else
Var VendingTSIDProblem = VendingTSID
EndIf
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems" Var ChooseProblem = "taobin purchasing problems"
PROBLEM TelephoneNumberProblem ChooseProblem PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf EndIf

40
xml/page_drinkfail2.xml
View file

@ -8,7 +8,8 @@
<EventOpen> <EventOpen>
; On open ; On open
Var TNumberTaobinMember = ""
If TelephoneNumberProblem = "" Then If TelephoneNumberProblem = "" Then
Else Else
@ -30,32 +31,7 @@
Var Timeout = 0 Var Timeout = 0
Var TNumberTaobinMember = ""
If TNumberTaobinMember = "" Then
Else
If PayWithQR = 1 Then
Var VendingTSID = VendingTSIDTmp
EndIf
Var BmiYear = PointTaobinStr
Var PointCrm = ""
If FromConsent = 1 Then
Var PointCrm = "pdpa1"
EndIf
Var GetScore = VendingTSID
If TaobinErrorNetwork = 0 Then
AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
Else
Var PointCrm = ""
AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore
EndIf
Var TNumberTaobinMember = ""
Var VendingTSID = ""
EndIf
StopLongPlay StopLongPlay
@ -474,8 +450,16 @@
StrLen TelephoneNumberProblem TelNumLen StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 Then If TelNumLen >= 10 Then
If PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
Else
Var VendingTSIDProblem = VendingTSID
EndIf
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems" Var ChooseProblem = "taobin purchasing problems"
PROBLEM TelephoneNumberProblem ChooseProblem PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
If MachineStage = "remove-cup" Then If MachineStage = "remove-cup" Then

24
xml/page_payment.xml
View file

@ -108,18 +108,18 @@
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999" Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee" Var ServiceType = "coffee"
Var ECommerce = "" Var ECommerceQR = ""
Var ECommerce = ECommerce + PriceDrink Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerce = ECommerce + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerce = ECommerce + DiscountDrink Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerce = ECommerce + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerceQR = ECommerceQR + "/"
Var ECommerce = ECommerce + "KBA:2" Var ECommerceQR = ECommerceQR + "KBA:2"
Var ServiceParameter = "max" Var ServiceParameter = "max"
Var ServiceCharge = 0 Var ServiceCharge = 0
Var AccountType = "new" Var AccountType = "new"
@ -130,7 +130,7 @@
Var SessionID = "" Var SessionID = ""
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0 Var Timeout = 0
Var GetPayInfoFlag = 1 Var GetPayInfoFlag = 1
Var ReqPayInfoFlag = 1 Var ReqPayInfoFlag = 1

3
xml/page_payment_code.xml
View file

@ -9,6 +9,7 @@
<Refresh> "Partial" </Refresh> <Refresh> "Partial" </Refresh>
<EventOpen> <EventOpen>
; On open ; On open
Var ECommerce = ""
Var FreeVendingCampaign = 0 Var FreeVendingCampaign = 0
Var Timeout = 0 Var Timeout = 0
@ -89,6 +90,8 @@
SAVELOG "CodeChannel 1 > ActOK." SAVELOG "CodeChannel 1 > ActOK."
SAVELOG ECommerce
SPLIT ECommerce "/" 5 VendingCode SPLIT ECommerce "/" 5 VendingCode
SPLIT ECommerce "/" 7 VendingCampaignRI3 SPLIT ECommerce "/" 7 VendingCampaignRI3
SPLIT ECommerce "/" 8 VendingCampaign1 SPLIT ECommerce "/" 8 VendingCampaign1