diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index d7b0a629..fb59c142 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -192,37 +192,39 @@ EndIf If PayInfoCFlag = 1 Then - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData - Var CreditAmount1 = "" - Var ServiceAmountFlow = "" - Var TelephoneNumber = "0899999999" - Var ServiceType = "coffee" - Var ECommerce = "" - Var ECommerce = ECommerce + PriceDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C00" - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C" - Var ServiceParameter = "max" - Var ServiceCharge = 0 - Var AccountType = "new" - Var testservice = "kbank" - Var tc = "" - Var GetScore = "" - Var OperatorName = "" - Var SessionID = "" - GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - ;Var Timeout = 0 + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf @@ -297,6 +299,9 @@ ; Open "ROOT/taobin_project/xml/page_catalog.xml" ;EndIf Var ActionOKCase = 1 + If IntVendingCampaign = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf EndIf EndIf @@ -397,6 +402,7 @@ EndIf EndIf VendingQR OFF + Refresh @@ -575,6 +581,8 @@ ;EndIf ;Open "ROOT/taobin_project/xml/page_catalog.xml" + + Refresh diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index cff8e630..1e345d55 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -147,6 +147,7 @@ If CodeChannel = 1 Then + Var TelephoneNumber = "" Var ShowErrorText = "Enable" Refresh EndIf