7.04

xml/menu_catalog_new.xml

@@ -179,7 +179,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_board.xml

@@ -158,6 +158,7 @@
 	STRCONTAIN "1046" MaterialAvailable WheyEnable 
 	
 	STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable
+	STRCONTAIN "1058" MaterialAvailable OreoEnable
 	
 	DEBUGVAR PromoteYuzuEnable
 
@@ -665,7 +666,7 @@
 		EndIf
 	EndIf
 
-	Var ShowPromoitonOreo = 1
+
 
 	Var PromotionOreoVolcanoEnable = 0
 
@@ -726,13 +727,32 @@
 		EndIf
 	EndIf
 
+	
+	Var ShowPromoitonOreo = 1
+
+	If SystemDateMonthInt = 3 Then
+		If SystemDateDayInt = 30 Then
+			Var ShowPromoitonOreo = 0
+		EndIf
+		If SystemDateDayInt = 31 Then
+			Var ShowPromoitonOreo = 0
+		EndIf
+	EndIf
+
 	If SystemDateMonthInt = 4 Then
 		Var ShowPromoitonOreo = 0
+
 	EndIf
 	If SystemDateMonthInt = 5 Then
 		Var ShowPromoitonOreo = 0
 	EndIf
 
+	;Var ShowPromoitonOreo = 0
+
+	If ShowPromoitonOreo = 0 Then
+		Var PromotionOreoVolcanoEnable = 0
+		Var PromotionOreoToppingFreeEnable = 0
+	EndIf
 
 
 	DEBUGVAR $12-03-03-0009.Button
@@ -753,9 +773,20 @@
 
 
 	Var PromotionIDCurrentOrder = 0
+	If OreoEnable = "true" Then
+
+	Else
+		Var PromotionOreoVolcanoEnable = 0
+		Var PromotionOreoToppingFreeEnable = 0
+		Var ShowPromoitonOreo = 0
+	EndIf
+	
+
 	DEBUGVAR PromotionOreoToppingFreeEnable
 	DEBUGVAR PromotionOreoVolcanoEnable
+	DEBUGVAR OreoEnable
 
+	DEBUGVAR $12-03-03-0026.Button
 	
 	RootLayoutVisible 3 "hide"
 </EventOpen>
@@ -882,9 +913,9 @@
 
 
 				If ShowPromoitonOreo = 1 Then
-					OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
-		    	Else
 					OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml"
+		    	Else
+					OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
 		    	EndIf
 
 				Machine DoorClose

xml/page_brewing3.xml

@@ -1096,6 +1096,7 @@
 				EndIf
 
 				If adver_brewing_count_down = 0 Then
+
 					GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size	
 					DEBUGVAR brewing_adv_size
 					If brewing_adv_size = 8321419 Then
@@ -1105,6 +1106,13 @@
 						Var adver_brewing_play_index = 1
 						Var adver_brewing_count_down = 0
 					EndIf				
+				
+					If ShowPromoitonOreo = 1 Then
+
+					Else
+						Var adver_brewing_play_index = 1
+						Var adver_brewing_count_down = 0
+					EndIf 
 				EndIf
 			EndIf
 

xml/page_catalog.xml

@@ -89,6 +89,23 @@
 	DEBUGVAR PromotionOreoVolcanoEnable
 
 
+	If SystemDateMonthInt = 3 Then
+		If SystemDateDayInt = 30 Then
+			Var ShowPromoitonOreo = 0
+		EndIf
+		If SystemDateDayInt = 31 Then
+			Var ShowPromoitonOreo = 0
+		EndIf
+	EndIf
+
+	If SystemDateMonthInt = 4 Then
+		Var ShowPromoitonOreo = 0
+	EndIf
+	If SystemDateMonthInt = 5 Then
+		Var ShowPromoitonOreo = 0
+	EndIf
+
+
 	If SpiralOnline = "true" Then
 		If Seeker = "next" Then
 			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"

xml/page_catalog2.xml

@@ -336,9 +336,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	
+	If ShowPromoitonOreo = 1 Then
-    Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+    	Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
-
+    Else
+    	Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+    EndIf
 </EventClick>
 </Button>
 

xml/page_catalog_group_appfast.xml

@@ -326,7 +326,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_cocktail.xml

@@ -318,7 +318,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_coffee.xml

@@ -318,7 +318,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_forkid.xml

@@ -327,7 +327,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_health.xml

@@ -318,7 +318,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_milk.xml

@@ -316,7 +316,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_oreo.xml

@@ -314,7 +314,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_other.xml

@@ -317,7 +317,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_recommend.xml

@@ -324,7 +324,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_tea.xml

@@ -318,7 +318,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_catalog_group_whey.xml

@@ -323,7 +323,11 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
+            If ShowPromoitonOreo = 1 Then
                 Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
+            Else
+                Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+            EndIf
         </EventClick>
         </Button>
 

xml/page_topping_select6.xml

@@ -321,6 +321,13 @@
 		
 	EndIf
 
+	If ShowPromoitonOreo = 1 Then
+
+	Else
+		Var oreo_topping_wed_free = "Invisible"
+		Var oreo_topping_wed_topping = "Invisible"
+	EndIf
+
 	DEBUGVAR PromotionIDCurrentOrder
 	
 </EventOpen>

xml_main/startup.xml

@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.03"
+	Var XMLPageVersion = "7.04"
-	Var XMLPageVersionInt = 703
+	Var XMLPageVersionInt = 704
 </EventOpen>
 
 <Text>