From 46e0080a5e4062b141614bc4142e14729c699969 Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 1 Dec 2021 11:26:27 +0700 Subject: [PATCH] fix webapp by credit --- xml/page_board.xml | 4 ++-- xml/page_payment_credit2.xml | 3 +++ xml/page_payment_credit3.xml | 40 ++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index dbc231c2..0ec736bb 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -28,7 +28,7 @@ Cart "DeleteMenuID" "ALL" Var MultiPayEnable = "true" - Var ShoppyPayEnable = "false" + Var ShoppyPayEnable = "true" Var WebAppEnable = "true" Var WebAppShow = "Enable" Var PayType = "" @@ -517,7 +517,7 @@ DEBUGVAR web_ready If web_ready = "true" Then - If web_ref = QRCODE99 Then + If web_ref = QRCODE99x Then Var web_readyOK = web_ready Var web_telnumOK = web_telnum diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index bd8b1110..e540541e 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -41,9 +41,12 @@ Var Ext1a = "" + Var AcceptAuto = "false" + If web_readyOK = "true" Then Var web_readyOK = "false" + Var AcceptAuto = "true" Var Tel_Confirm_State = "Enable" diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index 1ebd3439..317382a4 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -23,8 +23,18 @@ Var NotEnoughFlag = 0 + Var timeCountUp = 0 + If SumCreditAmount >= PayAmount Then Var Tel_Confirm_State = "Enable" + + + If AcceptAuto = "true" Then + + + + EndIf + Else Var Tel_Confirm_State = "Enable" Var ShowNotEnoughText = "Enable" @@ -48,6 +58,36 @@ ;Open "ROOT/xml/page_board.xml" Var Timeout = Timeout + 1 + + + If AcceptAuto = "true" Then + If Timeout > 0 Then + CoinVending OFF + + + Var TNumberTaobinCredit = TelephoneNumber + Var CoffeePinNumber = PinNumber + + Var StoreCreditFlag = 1 + + If CART_COUNT >= 1 Then + + Cart "PreparID" 1 + Var CART_INDEX = 1 + Var PayReference = "" + GenHashWithTimeStamp PayReference + Open "ROOT/taobin_project/xml/page_thankyou.xml" + Else + Var CART_INDEX = 0 + + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + EndIf + EndIf + + + If Timeout > 30 Then Var PayState1 = "PressForever" Var PayState2 = "Enable"