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_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 0d84d647..9a8cfe0d 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
@@ -84,20 +83,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 = "-"
@@ -124,12 +110,45 @@
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
+ DEBUGVAR CountStepPackPayment
+
+
+ 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"
@@ -141,12 +160,15 @@
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
- Var CountStepPackPayment = CountStepPackPayment + 1
If CountStepPackPayment = 1 Then
-
-
SAVELOG ExtendData
If GetPayInfoFlag = 0 Then
@@ -221,17 +243,13 @@
EndIf
+
+
TimerReset
Refresh
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
+
+ StageShowAlias
375
623
331
@@ -251,6 +271,7 @@
+ StageShowAlias
0
938
1080
@@ -262,6 +283,7 @@
+ StageShowAlias
0
1022
1080
@@ -273,10 +295,27 @@
+ StageShowAlias
144
413
Var( DirImage + "/text_1.png" )
+
+ 493
+ 968
+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"