From 473432293e9a91b8224072c8770c65f0cfc9c7b5 Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 23 Feb 2022 14:16:48 +0700 Subject: [PATCH 1/3] DO payment --- xml/page_payment.xml | 48 ++++++++++---------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index a476e485..55c518a4 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -224,12 +224,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - 375 - 623 - 331 - 435 - PictureDrink - - - 0 - 938 - 1080 - Center - 72 - KanitMediumTTF - 0x513C2F - showname - - - - 0 - 1022 - 1080 - Center - 24 - KanitLightTTF - 0x6F5F51 - showdesc - + + 493 + 968 +"Enable" + 94 + 94 + Var( DirImage + "/loading.gif" ) + - 144 - 413 - Var( DirImage + "/text_1.png" ) + 267 + 1065 + Var( DirImage + "/loadingText.png" ) From b97be007fc756e14f7be93e64a57bdb50a4716eb Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 24 Feb 2022 13:39:59 +0700 Subject: [PATCH 2/3] DO --- xml/page_board.xml | 2 +- xml/page_payment.xml | 102 +++++++++++++++++++++++++++------- xml/page_payment_cashMore.xml | 6 ++ 3 files changed, 90 insertions(+), 20 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 0d3f4575..d6a1eb39 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -536,7 +536,7 @@ DEBUGVAR CountUpReloadAll - If CountUpReloadAll > 60 Then + If CountUpReloadAll > 40 Then Var StartUpExt = "-" Var CountUpReloadAll = 0 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 55c518a4..7bdd9c77 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -12,7 +12,6 @@ Var QRCODETMP = "" Var QRChannel = 0 - Var HaveCup = "true" ;Var PriceDrink = 5 @@ -82,20 +81,7 @@ EndIf - If Seeker = "curr" Then - - If MachineStage = "remove-cup" Then - SAVELOG "MachineStage = remove-cup" - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - - EndIf - - If CupChecking = "true" Then - SAVELOG "CupChecking = true" - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - EndIf - - EndIf + Var MachineStage = "-" @@ -122,12 +108,44 @@ DEBUGVAR Seeker.thankStrawFlag Var Seeker.PayWithQR = 0 - + + If CupChecking = "true" Then + Var StageShowAlias = "Invisible" + Var StageShowLoading = "Enable" + Else + Var StageShowAlias = "Enable" + Var StageShowLoading = "Invisible" + EndIf + + + 900 + DEBUGVAR Seeker + DEBUGVAR HaveCup + DEBUGVAR CupChecking + + + If Seeker = "curr" Then + + If MachineStage = "remove-cup" Then + SAVELOG "MachineStage = remove-cup" + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf + + EndIf + + If CupChecking = "true" Then + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf + EndIf + + EndIf If ReadyForBrew = "false" Then Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -139,8 +157,11 @@ Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" EndIf - - Var CountStepPackPayment = CountStepPackPayment + 1 + If CupChecking = "false" Then + If HaveCup = "false" Then + Var CountStepPackPayment = CountStepPackPayment + 1 + EndIf + EndIf If CountStepPackPayment = 1 Then @@ -219,6 +240,8 @@ EndIf + + TimerReset Refresh @@ -235,16 +258,57 @@ + + StageShowAlias + 375 + 623 + 331 + 435 + PictureDrink + + + + StageShowAlias + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + StageShowAlias + 0 + 1022 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + + StageShowAlias + 144 + 413 + Var( DirImage + "/text_1.png" ) + + 493 968 -"Enable" +StageShowLoading 94 94 Var( DirImage + "/loading.gif" ) +StageShowLoading 267 1065 Var( DirImage + "/loadingText.png" ) diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 972e797b..c8fe2a58 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -575,6 +575,7 @@ If CancelFlag = 0 Then SAVELOG "Timeout > 180 s." Cart "DeleteMenuID" "ALL" + Var CART_COUNT=0 If ViewBill > 0 Then @@ -809,6 +810,7 @@ If CoinInOK = 0 Then If CancelFlag = 0 Then Cart "DeleteMenuID" "ALL" + Var CART_COUNT=0 SAVELOG "VDCancle > Cancle Order." CoinVending OFF Var CancelFlag = 1 @@ -1349,6 +1351,8 @@ If CoinInOK = 0 Then If CancelFlag = 0 Then Cart "DeleteMenuID" "ALL" + Var CART_COUNT = 0 + SAVELOG "ButtonCancleMain > Cancle All Order." CoinVending OFF Var CancelFlag = 1 @@ -1616,6 +1620,8 @@ EndIf If CancelFlag = 0 Then Cart "DeleteMenuID" "ALL" SAVELOG "ButtonCancleAlpha2 > Cancle Order." + Var CART_COUNT = 0 + CoinVending OFF Var CancelFlag = 1 Var cancelState = "Enable" From 6b2caad97a3156d705c4eea015457721807440d6 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 24 Feb 2022 14:45:26 +0700 Subject: [PATCH 3/3] FIX SessionID2 --- xml/page_drinkfail2Multi.xml | 7 +++++-- xml/page_payment.xml | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml index 2097dd49..e83edef7 100644 --- a/xml/page_drinkfail2Multi.xml +++ b/xml/page_drinkfail2Multi.xml @@ -134,9 +134,10 @@ Var ServiceType = "coffee" Var ServiceCredit = CART2_PDCODE Var SuggestID = "" - Var SessionID2 = + Var SessionID2 = "" DEBUGVAR CART2_PRICE + DEBUGVAR ServiceAmountSum Var ServiceAmount2 = CART2_PRICE @@ -178,9 +179,11 @@ Var ServiceType = "coffee" Var ServiceCredit = CART3_PDCODE Var SuggestID = "" - Var SessionID2 = + Var SessionID2 = "" DEBUGVAR CART3_PRICE + DEBUGVAR ServiceAmountSum + Var ServiceAmount2 = CART3_PRICE diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 56ea9f17..9a8cfe0d 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -129,6 +129,7 @@ DEBUGVAR Seeker DEBUGVAR HaveCup DEBUGVAR CupChecking + DEBUGVAR CountStepPackPayment If Seeker = "curr" Then @@ -159,14 +160,14 @@ Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" EndIf + If CupChecking = "false" Then If HaveCup = "false" Then Var CountStepPackPayment = CountStepPackPayment + 1 EndIf EndIf - If CountStepPackPayment = 1 Then - + If CountStepPackPayment = 1 Then SAVELOG ExtendData