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-03-19 08:27:19 +07:00
commit e459583054
5 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_back_to_main.xml
View file

@ -25,7 +25,12 @@
EndIf
Var GetScore = VendingTSID
AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
If TaobinErrorNetwork = 0 Then
AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
Else
Var PointCrm = ""
AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore
EndIf
Var TNumberTaobinMember = ""
Var VendingTSID = ""

19
xml/page_brewing3.xml
View file

@ -237,6 +237,14 @@
EndIf
EndIf
If waitAckPay = 2 Then
If Timeout > 60 Then
SAVELOG "back_to_main from line > 241."
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If ChangeOK = 2 Then
If ActionOKCase = 0 Then
@ -322,7 +330,16 @@
PAYEXT SVT ACC VendingTSIDTmp DEE
Var ActionOKCase = 1
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If CodeChannel = 0 Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
Var waitAckPay = 2
Var Timeout = 5
EndIf
EndIf

10
xml/page_collect_point_2.xml
View file

@ -17,6 +17,8 @@
EndIf
Var TaobinLevel = 0
Var TaobinErrorNetwork = 0
</EventOpen>
<Timeout> 1000 </Timeout>
@ -34,6 +36,10 @@
Else
Var TaobinLevel = 0
Var CoffeePoint = 1
Var TaobinErrorNetwork = 1
Var PointTaobinStr = "" + PayAmount
Var PointTaobinStr = PointTaobinStr + "/1/0"
Var TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -131,6 +137,10 @@
Open "ROOT/taobin_project/xml/page_show_consent.xml"
Else
;Var CoffeePoint = 1
Var TaobinErrorNetwork = 1
Var PointTaobinStr = "" + PayAmount
Var PointTaobinStr = PointTaobinStr + "/1/0"
Var TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

7
xml/page_drinkok.xml
View file

@ -38,7 +38,12 @@
Var PointCrm = "pdpa1"
EndIf
Var GetScore = VendingTSID
AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
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

6
xml/page_payment_cash.xml
View file

@ -230,6 +230,12 @@
Var EnoughChange = "yes"
If NetworkStatus = "DOWN" Then
Var PayState2 = "Disable"
Var PayState3 = "Disable"
Var PayState4 = "Disable"
EndIf
</EventOpen>
<EventActionOk>