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

xml/event/my_mint_my_moment/page_mymint_random.xml

@@ -115,6 +115,9 @@
             Var var2 = "X"
             Var var3 = "X"
 
+            ; Debug code
+            ;Var UserCouponReward = "glass"
+
             If UserCouponReward = "glass" Then
                 Var CodeType = "117"
             EndIf

xml/event/promotion_mymint.xml

@@ -10011,7 +10011,7 @@ LIMENADE SODA" </Value>
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/event/promotion_template1.inc

@@ -71,7 +71,7 @@
         ) 
     </State>
     <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
+    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
 </Video>
 
 </Button>

xml/page_brewing3.xml

@@ -217,6 +217,11 @@
 		Var AddData = 0
 	EndIf 
 
+	If MyMintEnable = 1 Then
+		If FromMyMintPro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
 
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0

xml/page_brewing3Conti.xml

@@ -128,6 +128,12 @@
 		Var AddData = 0
 	EndIf 
 
+	If MyMintEnable = 1 Then
+		If FromMyMintPro = 1 Then
+			Var AddData = 0
+		EndIf
+	EndIf
+
 	If LedLidBlink = "true" Then
 		Var LedLidBlink = "no"
 		LED LedDoorLid Blink 255 255 255 255