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

xml/page_catalog.lxml

@@ -406,15 +406,18 @@
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
-	Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-	If CountryName = "Malaysia" Then 
-		; zone promote
-		TRY OpenFileXML
-	EndIf
+;	Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
+;	If CountryName = "Malaysia" Then 
+;		; zone promote
+;		TRY OpenFileXML
+;	EndIf
 
 	If CountryName = "Thailand" Then 
     	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
-    EndIf
+    Else
+		Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
+		TRY OpenFileXML
+	EndIf
 
 </EventClick>
 <Language>

xml/page_payment.xml

@@ -268,6 +268,7 @@
 			Var Seeker.FreeVendingCampaign = 0
 			Var Seeker.CodeChannel = 1
 			Var Seeker.CodeNumber = "00000000"
+			Var Seeker.VendingCampaignRI3 = 30
 		EndIf
 	EndIf