From 3474927a6f7a3d1f5ef1bd0fb49e2349393a4dd0 Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 27 Oct 2020 18:23:58 +0700 Subject: [PATCH 1/2] ... --- xml/page_payment_cash.xml | 68 ++++++++++++++++++++++----------------- xml/page_payment_code.xml | 6 ++-- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 845c7897..cdae17aa 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 429c6c24..21d973cd 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -16,9 +16,7 @@ Var CodeChannel = 0 ;Var VendingQRCode = "ERROR" - VendingQR ON - Var QRCODE99 = "" - + VendingQR OFF CoinVending OFF Var ShowTextNumber = "Enable" @@ -32,7 +30,7 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - VendingQR OFF + ;VendingQR OFF Open menu_back_to_main EndIf From bb17e81192b9f82d2e6f85e773facbbbc2548396 Mon Sep 17 00:00:00 2001 From: miggaze Date: Tue, 27 Oct 2020 20:36:56 +0700 Subject: [PATCH 2/2] ... --- xml/page_payment_code.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 21d973cd..93ad35ec 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -16,7 +16,9 @@ Var CodeChannel = 0 ;Var VendingQRCode = "ERROR" - VendingQR OFF + VendingQR ON + Var QRCODE99 = "" + CoinVending OFF Var ShowTextNumber = "Enable" @@ -30,7 +32,7 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - ;VendingQR OFF + VendingQR OFF Open menu_back_to_main EndIf @@ -145,6 +147,7 @@ If CodeChannel = 1 Then + Var TelephoneNumber = "" Var ShowErrorText = "Enable" Refresh EndIf