diff --git a/xml/page_board.xml b/xml/page_board.xml
index 23c707cf..41daa79f 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -14,6 +14,9 @@
DEBUGVAR SoundVolume
+
+ Var PauseOrder = "false"
+
DEBUGVAR web_ref
DEBUGVAR web_payment
DEBUGVAR web_telnum
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index d3670fac..47dff9e9 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -534,7 +534,7 @@
Var PayDetail = PayDetail + NOBONUS
- Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+ ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If GetFreeFromError = 1 Then
Var CodeChannel = 1
@@ -963,15 +963,19 @@
-
+
+
+;
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 41b23206..fdf38230 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -534,7 +534,11 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0
EndIf
- Open "ROOT/taobin_project/xml/page_catalog.xml"
+ If PauseOrder = "false" Then
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_brewing3.xml"
+ EndIf
EndIf
@@ -579,9 +583,23 @@
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
+
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
+
+
+
If IntVendingCampaign = 0 Then
VendingQR OFF
- Open "ROOT/taobin_project/xml/page_catalog.xml"
+ If PauseOrder = "false" Then
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_brewing3.xml"
+ EndIf
EndIf
EndIf
@@ -648,7 +666,11 @@
;EndIf
Var ActionOKCase = 1
If IntVendingCampaign = 0 Then
- Open "ROOT/taobin_project/xml/page_catalog.xml"
+ If PauseOrder = "false" Then
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_brewing3.xml"
+ EndIf
EndIf
EndIf
EndIf
diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml
index 0bae281c..c9c0105d 100644
--- a/xml/page_payment_cashMore.xml
+++ b/xml/page_payment_cashMore.xml
@@ -568,6 +568,13 @@
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
+
If IntVendingCampaign = 0 Then
VendingQR OFF
@@ -1037,6 +1044,12 @@
If CoinInFlag = 0 Then
VendingQR OFF
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
@@ -1360,6 +1373,12 @@
cart1_en
"ROOT/taobin_project/image/page_payment/iconX.png"
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
Cart "DeleteMenuID" 1
@@ -1399,6 +1418,12 @@
cart2_en
"ROOT/taobin_project/image/page_payment/iconX.png"
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
Cart "DeleteMenuID" 2
@@ -1438,6 +1463,12 @@
cart3_en
"ROOT/taobin_project/image/page_payment/iconX.png"
+ If IntVendingCredit > 0 Then
+ Var BmiYear = IntVendingCredit
+ Var GetScore = "useCredit"
+ AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore
+ Var IntVendingCredit = 0
+ EndIf
Cart "DeleteMenuID" 3