diff --git a/inter/mys/xml/page_brewing3.lxml b/inter/mys/xml/page_brewing3.lxml index a6c58ee2..1aa936ef 100644 --- a/inter/mys/xml/page_brewing3.lxml +++ b/inter/mys/xml/page_brewing3.lxml @@ -35,7 +35,8 @@ DEBUGVAR Seeker DEBUGVAR Seeker.selected_a_drink DEBUGVAR Seeker.ServiceAmount2 - + DEBUGVAR PayAmount + DEBUGVAR Seeker.CreditCard DEBUGVAR Seeker.CodeNumber Var SessionID2 = SelectSlot + ":" @@ -238,6 +239,7 @@ Var VendingCampaign = Seeker.VendingCampaign Var TxReference = Seeker.TxRef1 DEBUGVAR TxReference + DEBUGVAR Seeker.VendingCampaign If show_eng = "true" Then diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index 7fbd78e1..22366e48 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -557,6 +557,13 @@ EndIf + DEBUGVAR ReqPayInfoFlag + DEBUGVAR VendingCashless + + DEBUGVAR VendingCampaign + DEBUGVAR Seeker.VendingCode + DEBUGVAR Seeker.CodeChannel + If ReqPayInfoFlag = 1 Then If VendingQRTypeResult = "MBB:2" Then Var CashTextWarning = "" @@ -622,6 +629,7 @@ If VendingCashless = "OK" Then DEBUGVAR CashlessCode + DEBUGVAR PayAmount Var Timeout = 0 Var QRErrorState = "Invisible" @@ -692,9 +700,21 @@ Var LOADING_STATE = "Invisible" EndIf + CashlessReq OFF + Coin CARDOFF + + If CashlessPayFlag = 1 Then + Var CashlessPayFlag = 0 + CashlessReq FAIL + EndIf + EndIf - + DEBUGVAR PayAmount + DEBUGVAR Seeker.IntVendingCampaign + DEBUGVAR VendingCashless + DEBUGVAR ActionOKCase + DEBUGVAR QRErrorFlag Refresh @@ -714,6 +734,8 @@ Var VendingCashless = "-" Var LOADING_STATE = "Enable" Var alphaState = "Enable" + DEBUGVAR PayAmount + DEBUGVAR Seeker.IntVendingCampaign Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 @@ -732,6 +754,8 @@ ;DEBUGVAR alphaState2 ;DEBUGVAR alphaState3 + DEBUGVAR CashlessPayFlag + If ReadyForBrew = "false" Then SAVELOG "Back to main1" Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -887,6 +911,9 @@ EndIf CoinVending OFF + + Coin CARDOFF + Var CancelFlag = 1 Var cancelState = "Enable" @@ -1336,6 +1363,8 @@ Var CashlessPayFlag = 0 CashlessReq FAIL EndIf + + Coin CARDOFF EndIf EndIf @@ -1764,11 +1793,13 @@ EndIf Var CancelNumber = 12 EndIf + CashlessReq OFF + Coin CARDOFF + If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 CashlessReq FAIL EndIf - EndIf EndIf @@ -1953,6 +1984,7 @@ EndIf CoinVending BILLREJECT EndIf CoinVending OFF + C Var CancelFlag = 1 Var cancelState = "Enable" Var CancelCounter = 0 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 37c3f07a..75c761e3 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -180,6 +180,8 @@ Var remainCredit = "/remainCredit-SGP.png" EndIf + DEBUGVAR Seeker.CreditCard + DEBUGVAR Seeker.CreditCardRef TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/script_thankyou.ev"