7.46

xml/event/promotion_oreo_welcome_drink.xml

@@ -8940,27 +8940,27 @@ LIMENADE SODA" </Value>
     <Filename> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"
+            Var return = "ROOT/taobin_project/image/event/bn_3anniversary_oreo_en.png"
         Else
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
+            Var return = "ROOT/taobin_project/image/event/bn_3anniversary_oreo_th.png"
         EndIf
         )
      </Filename>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"    
+            Var return = "ROOT/taobin_project/image/event/bn_3anniversary_oreo_en.png"    
         Else
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
+            Var return = "ROOT/taobin_project/image/event/bn_3anniversary_oreo_th.png"
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/welcomedrink_en.png"
+            Var return = "ROOT/taobin_project/image/event/bd_3anniversary_oreo_en.png"
         Else
-            Var return = "ROOT/taobin_project/image/event/welcomedrink.png"
+            Var return = "ROOT/taobin_project/image/event/bd_3anniversary_oreo_th.png"
         EndIf
         )
      </FilenameDisable>

xml/event/script_common_for_open_promotion_xml.ev

@@ -10,6 +10,14 @@ If OpenFromPageBoard = 1 Then
 
 	Else
 		If OreoWelcomeDrinkEnable = 1 Then
+			
+			READ_FILE "/mnt/sdcard/oreo_for_free_limit" oreo_for_free_limit
+			If oreo_for_free_limit = "true" Then
+				Var BigButtonEnable = "Disable"
+			Else 
+				Var BigButtonEnable = "Enable"	
+			EndIf
+
 			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_oreo_welcome_drink.xml" 
 	    Else
 			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
@@ -23,6 +31,12 @@ Else
 		Open "ROOT/taobin_project/xml/event/promotion_mystery_cup_35.xml" 
 	Else
 		If OreoWelcomeDrinkEnable = 1 Then
+			READ_FILE "/mnt/sdcard/oreo_for_free_limit" oreo_for_free_limit
+			If oreo_for_free_limit = "true" Then
+				Var BigButtonEnable = "Disable"
+			Else 
+				Var BigButtonEnable = "Enable"	
+			EndIf
 			Open "ROOT/taobin_project/xml/event/promotion_oreo_welcome_drink.xml" 
 	    Else
 			Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 

xml/event/tricker.ev

@@ -81,7 +81,12 @@ EndIf
 
 
 If SystemDateMonthInt = 7 Then
-
+	If SystemDateDayInt = 24 Then
+		Var OreoWelcomeDrinkEnable = 0
+	EndIf
+	If SystemDateDayInt = 25 Then
+		Var OreoWelcomeDrinkEnable = 0
+	EndIf
 	If SystemDateDayInt = 26 Then
 		Var OreoWelcomeDrinkEnable = 1
 	EndIf
@@ -133,19 +138,19 @@ EndIf
 
 
 
-
 If SystemDateMonthInt = 7 Then
 	If SystemDateDayInt > 19 Then
-		If SystemDateDayInt < 30 Then
+		Var Anniversary3VideoEnable = 1
-			Var Anniversary3VideoEnable = 1
-		EndIf
-		If SystemDateDayInt = 30 Then
-			Var Anniversary3VideoEnable = 1
-		EndIf
 	EndIf
 EndIf
 
 
+If SystemDateMonthInt = 8 Then
+	If SystemDateDayInt < 7 Then
+		Var Anniversary3VideoEnable = 1
+	EndIf
+EndIf
+
 
 
 If BoxID = 173149 Then
@@ -184,6 +189,14 @@ If SystemDateMonthInt > 7 Then
 EndIf
 
 
+Var OreoWelcomeDrinkEnable = 0
+Var Anniversary3VideoEnable = 0
+
+DEBUGVAR Anniversary3VideoEnable
+DEBUGVAR OreoWelcomeDrinkEnable
+
+
+
 If InternationalEnable = 1 Then
 	Var PepsiProEnable = 0
 	Var PepsiPromoteVideo = 0

xml/page_catalog_group_other.lxml

@@ -799,7 +799,7 @@
 		Var PD_CODE3 = "12-05-03-0035"
 		; begin lang 
 		Var aliasName[0] = "TAO POWER \nDRINK SODA"
-		Var aliasDesc[0] = "Medicine drink, Soda & Ice"
+		Var aliasDesc[0] = "Energy drink, Soda & Ice"
 		Var aliasName[1] = "เต่าทรงพลังโซดา"
 		Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน)"
 		Var aliasName[2] = "-"
@@ -823,7 +823,7 @@
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "SODA TAO POWER"
-		Var DescLang[1][0] = "Medicine drink, Soda, Ice"
+		Var DescLang[1][0] = "Energy drink, Soda, Ice"
 		Var DescLang[1][1] = "เครื่องดื่มเต่าทรงพลัง  โซดา และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -901,9 +901,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Medicine drink, Soda & Ice</LanguageSlot1>
+		<LanguageSlot1>Energy drink, Soda & Ice</LanguageSlot1>
 		<LanguageSlot2>เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน)</LanguageSlot2>
-		<LanguageSlot3>Medicine drink, Soda & Ice</LanguageSlot3>
+		<LanguageSlot3>Energy drink, Soda & Ice</LanguageSlot3>
 		<LanguageSlot4>เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน)</LanguageSlot4>
 		<LanguageSlot5>Minuman Bervitamin, Soda</LanguageSlot5>
 		<LanguageSlot6>เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน)</LanguageSlot6>
@@ -7087,7 +7087,7 @@
 		Var PD_CODE3 = "12-05-03-0034"
 		; begin lang 
 		Var aliasName[0] = "TAO POWER DRINK"
-		Var aliasDesc[0] = "Medicine drink & Ice"
+		Var aliasDesc[0] = "Energy drink & Ice"
 		Var aliasName[1] = "เต่าทรงพลัง"
 		Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)"
 		Var aliasName[2] = "-"
@@ -7111,7 +7111,7 @@
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "TAO POWER"
-		Var DescLang[1][0] = "Medicine drink, Ice"
+		Var DescLang[1][0] = "Energy drink, Ice"
 		Var DescLang[1][1] = "เครื่องดื่มเต่าทรงพลัง และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -7189,9 +7189,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Medicine drink & Ice</LanguageSlot1>
+		<LanguageSlot1>Energy drink & Ice</LanguageSlot1>
 		<LanguageSlot2>เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)</LanguageSlot2>
-		<LanguageSlot3>Medicine drink & Ice</LanguageSlot3>
+		<LanguageSlot3>Energy drink & Ice</LanguageSlot3>
 		<LanguageSlot4>เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)</LanguageSlot4>
 		<LanguageSlot5>Minuman Bervitamin, Ais</LanguageSlot5>
 		<LanguageSlot6>เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)</LanguageSlot6>

xml/page_catalog_group_recommend.lxml

@@ -10888,7 +10888,7 @@
 		Var PD_CODE3 = "12-05-03-0035"
 		; begin lang 
 		Var aliasName[0] = "TAO POWER \nDRINK SODA"
-		Var aliasDesc[0] = "Medicine drink, Soda"
+		Var aliasDesc[0] = "Energy drink, Soda"
 		Var aliasName[1] = "เต่าทรงพลังโซดา"
 		Var aliasDesc[1] = "เครื่องดื่มเต่าทรงพลัง  โซดา"
 		Var aliasName[2] = "-"
@@ -10912,7 +10912,7 @@
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = "SODA TAO POWER"
-		Var DescLang[1][0] = "Medicine drink, Soda, Ice"
+		Var DescLang[1][0] = "Energy drink, Soda, Ice"
 		Var DescLang[1][1] = "เครื่องดื่มเต่าทรงพลัง  โซดา และน้ำแข็ง"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -10990,9 +10990,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Medicine drink, Soda</LanguageSlot1>
+		<LanguageSlot1>Energy drink, Soda</LanguageSlot1>
 		<LanguageSlot2>เครื่องดื่มเต่าทรงพลัง  โซดา</LanguageSlot2>
-		<LanguageSlot3>Medicine drink, Soda</LanguageSlot3>
+		<LanguageSlot3>Energy drink, Soda</LanguageSlot3>
 		<LanguageSlot4>เครื่องดื่มเต่าทรงพลัง  โซดา</LanguageSlot4>
 		<LanguageSlot5>Minuman Bervitamin, Soda</LanguageSlot5>
 		<LanguageSlot6>เครื่องดื่มเต่าทรงพลัง  โซดา</LanguageSlot6>

xml/page_payment.xml

@@ -301,6 +301,8 @@
 	EndIf
 	DEBUGVAR PromotionIDCurrentOrder
 
+	Var CoundDownStillOnPage = 240
+
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.44"
+	Var XMLPageVersion = "7.46"
-	Var XMLPageVersionInt = 744
+	Var XMLPageVersionInt = 746
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>