From a406ec83f80362c0c0f42f4f194ce952a4984246 Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 24 May 2021 15:35:03 +0700 Subject: [PATCH] fix bug Event OK --- xml/page_payment_code.xml | 281 ++++++++++++++++++----------------- xml/page_payment_credit.xml | 2 + xml/page_payment_credit2.xml | 3 + 3 files changed, 151 insertions(+), 135 deletions(-) diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index f7776421..4daf2568 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -91,148 +91,158 @@ SPLIT ECommerce "/" 7 VendingCampaignRI3 SPLIT ECommerce "/" 8 VendingCampaign1 - Var IntVendingCampaign = VendingCampaignRI3 - INT IntVendingCampaign - - Var VendingREFID = SessionID + If VendingCode = "" Then + Var VendingCode = "C00" + EndIf - If IntVendingCampaign > 0 Then - Var QRChannel = 0 - - If IntVendingCampaign >= PayAmount Then - ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" - Var VendingCampaign = PayAmount - Var FreeVendingCampaign = 1 - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - - - - - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData - - Var CreditAmount1 = "" - Var ServiceAmountFlow = "" - Var TelephoneNumber2 = "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 + "KBA:1/" - Var ECommerce = ECommerce + VendingCode - Var ECommerce = ECommerce + ":" - Var ECommerce = ECommerce + CodeNumber - Var ECommerce = ECommerce + ":" - Var ECommerce = ECommerce + VendingCampaignRI3 - Var ServiceParameter = "max" - Var ServiceCharge = 0 - Var AccountType = "new" - Var testservice = "kbank" - Var tc = "" - Var GetScore = "" - Var OperatorName = "" - Var SessionID = "" - - - GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - Var Timeout = 0 - Var CodeChannel = 2 + If VendingCode = "C00" Then Else - Var FreeVendingCampaign = 1 - + Var IntVendingCampaign = VendingCampaignRI3 + INT IntVendingCampaign + + Var VendingREFID = SessionID - + If IntVendingCampaign > 0 Then + Var QRChannel = 0 + + If IntVendingCampaign >= PayAmount Then + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var VendingCampaign = PayAmount + Var FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber2 = "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 + "KBA:2/" + Var ECommerce = ECommerce + VendingCode + Var ECommerce = ECommerce + ":" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + ":" + Var ECommerce = ECommerce + VendingCampaignRI3 + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + + GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var Timeout = 0 + Var CodeChannel = 2 + + Else + + Var FreeVendingCampaign = 1 + + + + + If VendingCode = "C24" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C25" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C30" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C32" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C33" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C34" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C36" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C38" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + If VendingCode = "C41" Then + Var VendingCampaign = PayAmount + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + Var ShowErrorText = "Enable" + Var GetPayInfoFlag = 0 + Var CodeChannel = 0 - If VendingCode = "C24" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf - If VendingCode = "C25" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C30" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C32" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C33" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C34" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C36" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C38" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - If VendingCode = "C41" Then - Var VendingCampaign = PayAmount - CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - - Var ShowErrorText = "Enable" - Var GetPayInfoFlag = 0 - Var CodeChannel = 0 - EndIf Else @@ -585,6 +595,7 @@ If GetPayInfoFlag = 0 Then + Var GetPayInfoFlag = 1 VendingQR OFF @@ -625,7 +636,7 @@ GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var Timeout = 0 - Var GetPayInfoFlag = 1 + Var TelephoneNumber = CodeNumber Var CodeChannel = 1 diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 23827117..2e643576 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -33,6 +33,8 @@ Var number9 = "" Var number10 = "" + Var Ext1a = "" + 1000 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 6e6ac3fb..9823c91f 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -38,6 +38,9 @@ Else Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + + Var Ext1a = "" + 1000