7.04

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,15 +727,34 @@
 		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
 
 	If PromotionOreoVolcanoEnable = 1 Then
@@ -753,10 +773,21 @@
 
 
 	Var PromotionIDCurrentOrder = 0
-	DEBUGVAR PromotionOreoToppingFreeEnable
-	DEBUGVAR PromotionOreoVolcanoEnable
+	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