diff --git a/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png b/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png
new file mode 100644
index 00000000..dc56dc08
Binary files /dev/null and b/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png differ
diff --git a/xml/event/backToSchool.ev b/xml/event/backToSchool.ev
new file mode 100644
index 00000000..6ef32abd
--- /dev/null
+++ b/xml/event/backToSchool.ev
@@ -0,0 +1,55 @@
+
+
+;DEBUGVAR SystemDateMonthInt
+;DEBUGVAR SystemDateDayInt
+
+Var OreoDueEnable = 0
+If SystemDateMonthInt = 5 Then
+	If SystemDateDayInt = 6 Then
+		Var OreoDueEnable = 1
+	EndIf
+	If SystemDateDayInt = 7 Then
+		Var OreoDueEnable = 1
+	EndIf
+
+	If SystemDateDayInt = 13 Then
+		Var OreoDueEnable = 1
+	EndIf
+	If SystemDateDayInt = 14 Then
+		Var OreoDueEnable = 1
+	EndIf
+
+
+	If SystemDateDayInt = 20 Then
+		Var OreoDueEnable = 1
+	EndIf
+	If SystemDateDayInt = 21 Then
+		Var OreoDueEnable = 1
+	EndIf
+
+
+	If SystemDateDayInt = 27 Then
+		Var OreoDueEnable = 1
+	EndIf
+	If SystemDateDayInt = 28 Then
+		Var OreoDueEnable = 1
+	EndIf
+
+EndIf
+
+DEBUGVAR OreoDueEnable
+If OreoDueEnable = 0 Then
+	Var $12-03-03-0009-alter.Button = "Invisible"
+Else
+	Var $12-03-03-0009-alter.Button = "Enable"
+
+EndIf
+
+
+Var $12-03-03-0009-alter.Price = 70
+
+Var $12-03-03-0009-alter.NameE = $12-03-03-0009.NameE
+Var $12-03-03-0009-alter.descriptionE = $12-03-03-0009.descriptionE
+Var $12-03-03-0009-alter.Name = $12-03-03-0009.Name
+Var $12-03-03-0009-alter.description = $12-03-03-0009.description
+
diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml
index 83960365..e91a6734 100644
--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@@ -79,6 +79,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index cafc3647..f75e7170 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -211,14 +211,14 @@
 
         out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
         #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ spl[5].replace("-alter", "") +'"\r\n')
         out_xml( '\t\tElse\r\n')
         out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
         #out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ spl[4].replace("-alter", "") +'"\r\n')
         out_xml( '\t\t\tElse\r\n')
         #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ spl[6].replace("-alter", "") +'"\r\n')
         out_xml( '\t\t\tEndIf\r\n')
         out_xml( '\t\tEndIf\r\n')
 
@@ -251,10 +251,7 @@
         
         out_xml( '\t\t\r\n')
         out_xml( '\t\t\r\n')
-        if "inter" in param:
-          out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
-        else:
-          out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n')
+        out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
         out_xml( '\t\t\r\n')
         
         
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 02ef2214..b2caa956 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -700,10 +700,18 @@
 	If BoxID = 200434 Then
 		Var SongkranEnable = 0
 	EndIf
+	If BoxID = 172644 Then
+		Var SongkranEnable = 0
+	EndIf
 	If BoxID = 172102 Then
 		Var SongkranEnable = 0
 	EndIf
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/backToSchool.ev"
+
+	If BoxID = 200001 Then
+		Var OreoDueEnable = 0
+	EndIf
 
 	DEBUGVAR SoundThaiIndex
 
@@ -884,9 +892,18 @@
 	;Var CupOnArm = "true"
 
 	If CupOnArm = "true" Then
-		Var buttonRemoveCup = "Enable"
+
+		If CheckCupStateDoorCupClose = "" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+		If CheckCupStateDoorCupClose = "done" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
 	Else
-		Var buttonRemoveCup = "Invisible"
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		EndIf
 	EndIf
 
 
@@ -924,6 +941,7 @@
 	EndIf
 
 
+
 	Refresh
 
 	TimerReset
@@ -1136,6 +1154,9 @@
 <EventClick> 
 	Machine RemoveCup
 	Machine DoorLidOpen
+
+	Var CheckCupStateDoorCupClose = "reset"
+	Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index 7fcd181c..3ffec5dc 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -203,6 +203,8 @@
 		RebootWithCause "BoxID was zero"
 	EndIf
 	
+	
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/backToSchool.ev"
 
 
 	Var Price5Active = 0
@@ -237,7 +239,21 @@
         EndIf
 	EndIf
 
-	
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
 
 	Refresh
 	TimerReset
@@ -581,7 +597,11 @@
 <Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
-    Machine DoorLidOpen
+	Machine DoorLidOpen
+
+	Var CheckCupStateDoorCupClose = "reset"
+	Var buttonRemoveCup = "Invisible"
+	
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml
index 87249ffd..3d07d946 100644
--- a/xml/page_catalog_group_appfast.xml
+++ b/xml/page_catalog_group_appfast.xml
@@ -227,6 +227,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml
index 371f1c3c..a3a0b278 100644
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@@ -219,6 +219,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index cf45777c..c6169b6b 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -219,6 +219,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml
index e34f169e..1288f1df 100644
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@@ -228,6 +228,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml
index e6eff2b2..f8509d47 100644
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@@ -219,6 +219,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml
index 2925894f..2ec6bf98 100644
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@@ -217,6 +217,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml
index a745108b..5beb8571 100644
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@@ -215,6 +215,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index 67213c45..7e8e73e2 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -218,6 +218,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt
index 681ce228..d4de5d16 100644
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@@ -70,6 +70,7 @@
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 1c412bb5..8a96f4b8 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -236,6 +236,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
@@ -576,7 +593,7 @@
 	</QRCode>
 </Block>
 ;dummy_layout.inc
-; menu_new_list 30
+; menu_new_list 31
 	;TAGESP
 	; ==================> Len = 16
 	; - - 12-03-03-0009 
@@ -830,6 +847,256 @@ VOLCANO" </Value>
 	; - - - 
 	;TAGESP
 	; ==================> Len = 16
+	; - - 12-03-03-0009-alter 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0009-alter.Button,Disable=Invisible,$Sum1203030009alter) </State> 
+	<Button>
+	<State> $Sum1203030009alter </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_weekend_special.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_weekend_special.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_weekend_special.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "OREO SMOOTHIE  VOLCANO"
+		Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
+		Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้   "
+		Var DrinkDescription = "Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_oreo_vo_weekend_special.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0009-alter.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0009-alter"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0009-alter.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0009"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-03-03-0009-alter.NameE
+		Var menu_desc_eng_blender = $12-03-03-0009-alter.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0009-alter.Name
+		Var menu_desc_thai_blender = $12-03-03-0009-alter.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โอริโอ้ปั่นภูเขาไฟ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "นม น้ำตาล โอริโอ้ 
+ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "OREO SMOOTHIE 
+VOLCANO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Milk, Sugar, Oreo" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-03-03-0009-alter.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-03-0009-alter.Button </State>
+	<Value> StringFmt(  $12-03-03-0009-alter.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1203030009alter = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0009-alter.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1203030009alter </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 16
 	; - - 12-03-03-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -7928,6 +8195,7 @@ LIMENADE SODA" </Value>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_group_recommend3.xml b/xml/page_catalog_group_recommend3.xml
index d81a282d..453b7bf9 100644
--- a/xml/page_catalog_group_recommend3.xml
+++ b/xml/page_catalog_group_recommend3.xml
@@ -236,6 +236,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
@@ -1809,6 +1826,256 @@ VOLCANO" </Value>
     </Text>
 </Block>
 ; menu_new_li;TAGESP
+	; ==================> Len = 16
+	; - - 12-03-03-0009-alter 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-03-03-0009-alter.Button,Disable=Invisible,$Sum1203030009alter) </State> 
+	<Button>
+	<State> $Sum1203030009alter </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_weekend_special.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_weekend_special.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_weekend_special.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "OREO SMOOTHIE  VOLCANO"
+		Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
+		Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้   "
+		Var DrinkDescription = "Milk, Sugar, Oreo"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_oreo_vo_weekend_special.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0009-alter.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0009-alter"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0009-alter.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-03-03-0009"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-03-03-0009-alter.NameE
+		Var menu_desc_eng_blender = $12-03-03-0009-alter.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0009-alter.Name
+		Var menu_desc_thai_blender = $12-03-03-0009-alter.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โอริโอ้ปั่นภูเขาไฟ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "นม น้ำตาล โอริโอ้ 
+ " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "OREO SMOOTHIE 
+VOLCANO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Milk, Sugar, Oreo" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-03-03-0009-alter.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-03-03-0009-alter.Button </State>
+	<Value> StringFmt(  $12-03-03-0009-alter.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum1203030009alter = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0009-alter.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1203030009alter </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; - - - 
 	; ==================> Len = 16
 	; - - 12-03-03-0009 
 <Block>
@@ -8908,6 +9175,7 @@ LIMENADE SODA" </Value>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml
index de6e72ef..58201c35 100644
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@@ -215,6 +215,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index 8efecba9..2655418c 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -219,6 +219,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index e69d7411..3d6e3249 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -224,6 +224,23 @@
         EndIf
     EndIf
 
+
+    If CupOnArm = "true" Then
+
+        If CheckCupStateDoorCupClose = "" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+
+        If CheckCupStateDoorCupClose = "done" Then
+            Var buttonRemoveCup = "Enable"
+        EndIf
+    Else
+        If buttonRemoveCup = "Enable" Then
+            Var buttonRemoveCup = "Invisible"
+        EndIf
+    EndIf
+
+
     Var Timeout = Timeout + 1
     TimerReset
 </EventTimeout> 
diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml
index 80454153..32760057 100644
--- a/xml/page_face_compare.xml
+++ b/xml/page_face_compare.xml
@@ -16,7 +16,7 @@
 </EventOpen>
 
 <EventActionOk>
-    SAVELOG "EventActionOk" 
+    SAVELOG "EventActionOk-facecompare" 
     Var FaceCompareStatus = "OK"
     Var AdultFlag = 0
     
@@ -50,7 +50,7 @@
 <EventActionError>
     Var Price5Active = 0
     Var FaceCompareStatus = "Fail"
-    SAVELOG "EventActionError" 
+    SAVELOG "EventActionError-facecompare" 
     Var load_gif_stage = "Invisible"
     Var Timeout = 10
     Var IDcardTextState = "Enable"
diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml
index 6e56712e..21d50fe0 100644
--- a/xml/page_identity_verification.xml
+++ b/xml/page_identity_verification.xml
@@ -99,11 +99,6 @@
     EndIf
 
 
-    09:59:35 [X]Var IDCardState=PRESENT
-09:59:35 [X]Var Timeout=112
-09:59:35 [X]Var LivenessResult=
-09:59:36 [X]Var IDCardStatus=ERROR
-
     If IDCardStatus = "OK" Then
         If IDCardReady = "OK" Then
             If IDCardData = "ERROR" Then
@@ -245,7 +240,7 @@
         EndIf
     EndIf
 
-    
+
     If IDCardState = "PRESENT" Then
         If IDCardStatus = "ERROR" Then
             Var load_gif_stage = "Invisible"
@@ -311,6 +306,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+    SAVELOG "Liveness Result - Cancel"
     Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
@@ -407,7 +403,10 @@
 <EventLivenessResult>
     DEBUGVAR LivenessResult
     If LivenessResult = "pass" Then
-        SAVELOG "Liveness Result - pass"
+        
+        Var strlog_liveness = "Liveness Result - pass " + FailTrickCount
+        
+        SAVELOG strlog_liveness
     Else
         Var FailTrickCount = FailTrickCount + 1
         Var strlog_liveness = "Liveness Result - fail " + FailTrickCount
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index c1ad6fe7..81eccd6c 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -10,6 +10,8 @@
 
 	Var IndoQR = 0
 
+	
+
 	Var GetPayInfoFlag = 0
 	Var SessionID2 = ""
 	Var testservice = "kbank"
@@ -144,14 +146,7 @@
 		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
 	EndIf
 
-	Var PromotionIDCurrentOrder = 0
 
-	If PromotionOreoVolcanoEnable = 1 Then
-		If PD_CODE3 = "12-03-03-0009" Then
-			Var PromotionIDCurrentOrder = 2
-		EndIf
-	EndIf
-	DEBUGVAR PromotionIDCurrentOrder
 
 	SAVELOG MachineStage
 
diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml
index e44002eb..b30c851e 100644
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@@ -303,33 +303,8 @@
 
 	Var PromotionIDCurrentOrder = 0
 
-	If PromotionOreoVolcanoEnable = 1 Then
-		If PD_CODE3 = "12-03-03-0009" Then
-			Var PromotionIDCurrentOrder = 2
-		EndIf
-	EndIf
-	
-
-	If PromotionOreoToppingFreeEnable = 1 Then
-		
-	
-		Var oreo_topping_wed_free = "Enable"
-		Var oreo_topping_wed_topping = "Invisible"
-	Else
-	
-		Var oreo_topping_wed_free = "Invisible"
-		Var oreo_topping_wed_topping = "Enable"
-		
-	EndIf
-
-	If ShowPromoitonOreo = 1 Then
-
-	Else
-		Var oreo_topping_wed_free = "Invisible"
-		Var oreo_topping_wed_topping = "Invisible"
-	EndIf
-
 	DEBUGVAR PromotionIDCurrentOrder
+
 	Var DiscountWithIdentifyState = "Invisible"
 
 	DEBUGVAR Price5Active 
@@ -3250,6 +3225,8 @@
 	; 
 		
 
+	
+
 	Var SelectDrink = UserSelectProductCode
 	; Set drink 
 	Topping "Select" UserSelectProductCode
@@ -3428,6 +3405,8 @@
 	EndIf
 	; 
 	
+	Var PromotionIDCurrentOrder = 0
+
 
 	Var SelectDrink = UserSelectProductCode
 	
@@ -3660,7 +3639,15 @@
 	EndIf
 	; 
 	
-
+	If OreoDueEnable = 1 Then
+		If UserSelectProductCode = "12-03-03-0009-alter" Then
+			Var PromotionIDCurrentOrder = 2
+			Var UserSelectProductCode = "12-03-03-0009" 
+		EndIf
+	EndIf
+	DEBUGVAR PromotionIDCurrentOrder
+	
+	
 	Var SelectDrink = UserSelectProductCode
 	
 	Var Seeker.selected_a_drink = UserSelectProductCode
@@ -3992,7 +3979,7 @@
 
 	EndIf
 
-
+	
 	DEBUGVAR showOreoAddEnable
 	DEBUGVAR TOPPING_PRICE
 
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index e374c512..f6874713 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.15"
-	Var XMLPageVersionInt = 715
+	Var XMLPageVersion = "7.16"
+	Var XMLPageVersionInt = 716
 </EventOpen>
 
 <Text>