Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

xml/page_board.xml

@@ -15,7 +15,7 @@
 
 
 
-	
+	Var show_eng = "false"	
 	Var NextOrder = "false"
 	
 	Var Seeker = "next"

xml/page_brewing3.xml

@@ -168,6 +168,8 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
 	EndIf
 
+	DEBUGVAR show_eng 
+
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
 	Var text_next_order = DirImage + "/text_add_order.png"
@@ -209,6 +211,12 @@
 		Var EnableSelectMenuBetweenBrew = "Invisible"
 	EndIf
 
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		Var EnableSelectMenuBetweenBrewBlink = "Enable"
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
 	; Hide
 	Var bg_strawlid_ST = "Invisible"
 	Var bg_strawProblem_ST = "Invisible"
@@ -837,6 +845,17 @@
 		Var EnableSelectMenuBetweenBrew = "Invisible"
 	EndIf
 
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		If EnableSelectMenuBetweenBrewBlink = "Enable" Then 
+			Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+		Else
+			Var EnableSelectMenuBetweenBrewBlink = "Enable"
+		EndIf
+		
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
 	DEBUGVAR CountUpBrewing
 	; animation video loop
 	If AnimationOn = "true" Then
@@ -1002,7 +1021,7 @@
 <Button>
 <X> 78 </X>
 <Y> 1652 </Y>
-<State>EnableSelectMenuBetweenBrew</State>
+<State>EnableSelectMenuBetweenBrewBlink</State>
 <Filename> text_next_order </Filename>
 <Button>
 

xml/page_brewing3Conti.xml

@@ -30,6 +30,16 @@
 	Else
 		Var EnableSelectMenuBetweenBrew = "Enable"
 	EndIf
+
+	If GetFreeFromError = 1 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	EndIf
+
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		Var EnableSelectMenuBetweenBrewBlink = "Enable"
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
 	
 
 	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
@@ -92,12 +102,12 @@
 		If Seeker.TaobinErrorNetwork = 0 Then
 			Var Cid = 11
 			Var AddData = 1
-			AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
 		Else
 			Var PointCrm = ""
 			Var Cid = 14
 			Var AddData = 1
-			AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
 		EndIf
 		
 		Var VendingTSIDTmp1 = ""
@@ -515,9 +525,10 @@
 				Var PayO2 = Seeker.CoffeePinNumber
 			EndIf
 
-			
+			If AddData = 1 Then
+				AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+			EndIf
 
-			
 			Var ServiceType = "coffee"
 			Var ServiceCredit = SelectDrink
 			Var SuggestID  = ""
@@ -620,7 +631,9 @@
 		If ErrTimeout = 0 Then
 			Var ErrTimeout = 1
 
-			
+			If AddData = 1 Then
+				AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+			EndIf
 
 
 			If Seeker.PayWithQR = 0 Then 
@@ -717,6 +730,17 @@
 		Var EnableSelectMenuBetweenBrew = "Invisible"
 	EndIf
 
+	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		If EnableSelectMenuBetweenBrewBlink = "Enable" Then 
+			Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+		Else
+			Var EnableSelectMenuBetweenBrewBlink = "Enable"
+		EndIf
+		
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
 	DEBUGVAR CountUpBrewing
 	; animation video loop
 	If AnimationOn = "true" Then
@@ -861,7 +885,7 @@
 <Button>
 <X> 78 </X>
 <Y> 1652 </Y>
-<State>EnableSelectMenuBetweenBrew</State>
+<State>EnableSelectMenuBetweenBrewBlink</State>
 <Filename> text_next_order </Filename>
 <Button>
 

xml/page_drinkok.xml

@@ -72,7 +72,7 @@
 
 	StopLongPlay
 
-	Var show_eng = "false"	
+	;Var show_eng = "false"	
 
 
 	Var sendPayMultiFlag = 0