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

inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml

@@ -30,11 +30,15 @@
 				DEBUGVAR Seeker.CodeChannel
 				Var Seeker.UseProThaiTeaCode = 1
 				Var Seeker.ProThaiTea = 1
-			Else				
+			Else
 				Var Seeker.ProThaiTea = 1
 				Var Seeker.UseProThaiTeaCode = 0
 				DEBUGVAR Seeker.ProThaiTea
 				DEBUGVAR Seeker.UseProThaiTeaCode
+
+                ; support-for-multi-pro-with-same-cid
+				Var param1 = "702"
+
             	AddData Cid TelephoneNumber param1 param2 param3
 			EndIf
         EndIf

inter/mys/xml/event/tricker.ev

@@ -1,4 +1,4 @@
-; malaysia 
+; malaysia
 
 
 ;DEBUGVAR SystemDateMonthInt
@@ -24,8 +24,13 @@ If SystemDateMonthInt = 6 Then
 	EndIf
 EndIf
 
+
 If SystemDateMonthInt = 7 Then
-	If SystemDateDayInt < 16 Then
+    Var ProThaiTeaEnable = 1
+EndIf
+
+If SystemDateMonthInt = 8 Then
+	If SystemDateDayInt < 31 Then
 		Var ProThaiTeaEnable = 1
 	Else
 		Var ProThaiTeaEnable = 0
@@ -34,4 +39,4 @@ EndIf
 
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
-EndIf
+EndIf