Clean XML

xml/menu_catalog_new.xml

@@ -179,11 +179,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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

@@ -670,9 +670,7 @@
 		If SystemDateDayInt = 21 Then
 			Var PromotionOreoVolcanoEnable = 1
 		EndIf
-		If SystemDateDayInt = 22 Then
+		
-			Var PromotionOreoVolcanoEnable = 1
-		EndIf
 		If SystemDateDayInt = 27 Then
 			Var PromotionOreoVolcanoEnable = 1
 		EndIf
@@ -702,12 +700,6 @@
 		If SystemDateDayInt = 22 Then
 			Var PromotionOreoToppingFreeEnable = 1
 		EndIf
-		If SystemDateDayInt = 23 Then
-			Var PromotionOreoToppingFreeEnable = 1
-		EndIf
-		If SystemDateDayInt = 24 Then
-			Var PromotionOreoToppingFreeEnable = 1
-		EndIf
 	EndIf
 	 
 	If SystemDateMonthInt = 3 Then
@@ -733,10 +725,10 @@
 	DEBUGVAR $12-03-03-0009.Button
 
 	If PromotionOreoVolcanoEnable = 1 Then
-		Var bn_oreo_vo_get1_full_path =  "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1.png"
+		Var bn_oreo_vo_get1_full_path =  "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1_final.png"
-		Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1.png"
+		Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1_final.png"
-		Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1.png"
+		Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1_final.png"
-		Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1.png"
+		Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1_final.png"
 
 	Else
 
@@ -746,15 +738,6 @@
 		Var bn_oreo_vo_get1_full_path =  "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png"
 	EndIf
 
-	; cut off
-	If $12-03-03-0009.Button = "Enable" Then
-		
-	Else
-
-		Var PromotionOreoVolcanoEnable = 0
-
-	EndIf
-
 
 	Var PromotionIDCurrentOrder = 0
 	DEBUGVAR PromotionOreoToppingFreeEnable
@@ -883,11 +866,8 @@
 					Var PromotionOreoVolcanoEnable = 0
 				EndIf
 
-				If PromotionOreoVolcanoEnable = 1 Then
 				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_brewing.xml

@@ -1,166 +0,0 @@
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	Var LidState = "Enable"
-	Var StarwState = "Enable"
-
-</EventOpen>
-<Timeout> 800 </Timeout>
-<EventTimeout> 
-
-	Var CountDownBrewing = CountDownBrewing - 1
-	
-	; run test;
-	;If CountDownBrewing = 40 Then 
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
-	;EndIf
-	If CountDownBrewing = 0 Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
-
-	Var ShowCountDownBrewing = CountDownBrewing
-	
-	If MachineStage = "drink-success" Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
-	
-
-	If MachineStage = "show-menu" Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
-	
-	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
-	EndIf
-	
-	If MachineStage = "drink-success" Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
-	
-	Refresh
-	TimerReset
-
-</EventTimeout> 
-
-<EventMachine>
-	
-
-	If MachineStage = "drink-success" Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
-	If MachineStage = "drink-failed" Then
-		Open "ROOT/taobin_project/xml/page_drinkfail.xml" 
-	EndIf
-
-	
-</EventMachine>
-
-;<Image>
-;<X> 0 </X>
-;<Y> 0 </Y>
-;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-;</Image>
-
-<Video>
-<X> 0 </X>
-<Y> 0 </Y>
-<Width> 1080</Width>
-<Height> 380 </Height>
-<Loop> "true" </Loop>
-<Filename> video_menu_0 </Filename>
-</Video>
-
-<Image>
-<X> 751 </X>
-<Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
-</Image>
-
-<Image>
-<X> 237 </X>
-<Y> 1323 </Y>
-<Filename> "ROOT/taobin_project/image/page_doing/text1.png" </Filename>
-</Image>
-
-
-<Text>
-<X> 808 </X>
-<Y> 480 </Y>
-<Width> 1080</Width>
-<Align> "Hurr" </Align>
-<Size> 88 </Size>
-<Font> "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"</Font>
-<Color> 0x513C2F </Color>
-<Value> ShowCountDownBrewing </Value>
-</Text>
-
-<Text>
-<X> 0 </X>
-<Y> 1367 </Y>
-<Width> 1080 </Width>
-<Size> 72 </Size>
-<Align> Center </Align>
-<Font> RobotoBlack </Font>
-<Color> 0x513C2F </Color>
-<Value> BrewingTextThai </Value>
-</Text>
-;BrewingTextThai
-
-<GIF>
-<X> 182 </X>
-<Y> 700 </Y>
-<Filename> GIFShowProcess </Filename>
-</GIF>
-
-;<Text>
-;<X> 0 </X>
-;<Y> 1880 </Y>
-;<Size> 30 </Size>
-;<Align> Center </Align>
-;<Width> 1080 </Width>
-;<Font> RobotoBlack </Font>
-;<Color> 0x513C2F </Color>
-;<Value> MachineStage </Value>
-;</Text>
-
-
-;<Button>
-;<X> 0 </X>
-;<Y> 1860 </Y>
-;<Width> 200 </Width>
-;<Height> 50 </Height>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Var countClick = countClick + 1
-;	If countClick = 3 Then
-;		
-;	EndIf
-;
-;	If countClick = 5 Then
-;		Var countClick = 0
-;		MainMenu
-;	EndIf
-;	Refresh
-;</EventClick>
-;</Button>
-
-
-
-<Text>
-<X> 0 </X>
-<Y> 1886 </Y>
-<Size> 20 </Size>
-<Width> 1080</Width>
-<Align> Center </Align>
-<Font> RobotoBlack </Font>
-<Color> 0x513C2F </Color>
-<Value> countClick </Value>
-</Text>
-
-</Popup>

xml/page_catalog.lxml

@@ -697,7 +697,7 @@
 
 </EventUnitTest1>
 <EventUnitTest2>
-	Var waitAckPay = 1
+	Var waitAckPay = 0
 	Var CountDownBrewing = 122
 
 	Var InternationalEnable = 1
@@ -711,6 +711,7 @@
 	EndIf
 
 	Var Top2Timeout = 19
+	DEBUGVAR CountDownBrewing
 </EventUnitTest2>
 
 </Popup>

xml/page_catalog.xml

@@ -336,11 +336,8 @@
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	
 	; eng
-	If PromotionOreoVolcanoEnable = 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_catalog2.xml

@@ -337,11 +337,8 @@
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	
-	If PromotionOreoVolcanoEnable = 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_appfast.xml

@@ -326,11 +326,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +318,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +318,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +327,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +318,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +316,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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.skt

@@ -1,45 +0,0 @@
-<?hurr 
-    #include=menu_head.py 
-?>
-
-<Popup>
-<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
-<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
-<EventOpen>
-	; On open
-	<?hurr
-        #include=menu_catalog_default_init.xml
-    ?>
-    
-
-
-    Var Timeout = 0
-
-
-    <?hurr 
-        #include=menu_catalog_new_menu.xml
-    ?>
-
-</EventOpen>
-
-
-<?hurr 
-    #include=menu_catalog_inc.py
-?>
-
-
-
-
-<?hurr 
-    #include=menu_new_layout_gen_v2.py
-?>
-<?hurr 
-    #include=menu_new_layout_gen.py
-?>
-
-
-
-</Popup>

xml/page_catalog_group_oreo.xml

@@ -314,11 +314,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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>
 
@@ -517,7 +513,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 2
+; menu_new_list 9
 	; ==================> Len = 16
 	; - - 12-03-03-0009 
 <Block>
@@ -787,7 +783,7 @@ VOLCANO" </Value>
 		Var NameDrink = "PINK MILK OREO VOLCANO"
 		Var NameDrinkTH = "นมชมพูปั่น โอริโอ้ภูเขาไฟ"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล   Oreo"
-		Var DrinkDescription = "Salak Syrup, Milk, Sugar Oreo"
+		Var DrinkDescription = "Salak Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PinkOreo_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -891,7 +887,7 @@ OREO VOLCANO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Salak Syrup, Milk,
-Sugar Oreo" </Value>
+Sugar, Oreo" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1019,7 +1015,6 @@ Sugar Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; - - - 
 </FrameScroll>
 ; Cart
 <Button>

xml/page_catalog_group_other.xml

@@ -317,11 +317,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +324,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +318,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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,11 +323,7 @@
         <EventClick> 
             SAVELOG "Click rec"
             Var NextPage = "-"
-            If PromotionOreoVolcanoEnable = 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_with_vending.xml

@@ -280,7 +280,7 @@
 	
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	; eng
-    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+    Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
 </EventClick>
 </Button>
 

xml/page_lid_straw.xml

@@ -164,12 +164,9 @@
 		Var CountDownBrewing = CountDownBrewing - 1
 	EndIf
 	
-	; run test;
-	;If CountDownBrewing = 58 Then 
-	;	Open "ROOT/taobin_project/xml/page_brewing.xml"  
-	;EndIf
 	
 	Var LidStrawCountDown = LidStrawCountDown - 1
+	
 	; count down
 	If LidStrawCountDown = 1 Then
 		Var LidStrawCountDown = 10

xml/page_thankyou.xml

@@ -261,7 +261,7 @@
 		EndIf
 
 		If TestLoopMakeDrink = 1 Then 
-			Open "ROOT/taobin_project/xml/page_brewing2.xml"  
+			Open "ROOT/taobin_project/xml/page_brewing_test_loop.xml"  
 		EndIf
 
 		Var CountDownBrewing = BrewTime