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 2020-10-27 21:00:52 +07:00
commit a879796f19
2 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

68
xml/page_payment_cash.xml
View file

@ -192,37 +192,39 @@
EndIf EndIf
If PayInfoCFlag = 1 Then If PayInfoCFlag = 1 Then
Var SessionID2 = SelectSlot + ":" If CodeChannel = 1 Then
Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"
Var ServiceType = "coffee" Var ServiceType = "coffee"
Var ECommerce = "" Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CodeNumber Var ECommerce = ECommerce + CodeNumber
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C" Var ECommerce = ECommerce + "C"
Var ServiceParameter = "max" Var ServiceParameter = "max"
Var ServiceCharge = 0 Var ServiceCharge = 0
Var AccountType = "new" Var AccountType = "new"
Var testservice = "kbank" Var testservice = "kbank"
Var tc = "" Var tc = ""
Var GetScore = "" Var GetScore = ""
Var OperatorName = "" Var OperatorName = ""
Var SessionID = "" Var SessionID = ""
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0 ;Var Timeout = 0
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf EndIf
@ -297,6 +299,9 @@
; Open "ROOT/taobin_project/xml/page_catalog.xml" ; Open "ROOT/taobin_project/xml/page_catalog.xml"
;EndIf ;EndIf
Var ActionOKCase = 1 Var ActionOKCase = 1
If IntVendingCampaign = 0 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
EndIf EndIf
EndIf EndIf
@ -397,6 +402,7 @@
EndIf EndIf
EndIf EndIf
VendingQR OFF VendingQR OFF
Refresh
</EventVDCancle> </EventVDCancle>
@ -575,6 +581,8 @@
;EndIf ;EndIf
;Open "ROOT/taobin_project/xml/page_catalog.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml"
Refresh
</EventClick> </EventClick>
</Button> </Button>

1
xml/page_payment_code.xml
View file

@ -147,6 +147,7 @@
<EventActionError> <EventActionError>
If CodeChannel = 1 Then If CodeChannel = 1 Then
Var TelephoneNumber = ""
Var ShowErrorText = "Enable" Var ShowErrorText = "Enable"
Refresh Refresh
EndIf EndIf