Songgran go on

2023-03-28 14:44:43 +07:00 · 2023-03-28 14:44:43 +07:00 · 1c20abc0e9
commit 1c20abc0e9
parent d8fef6b51e
30 changed files with 416 additions and 2482 deletions
--- a/image/bn_songkran1.png
+++ b/image/bn_songkran1.png
--- a/image/bn_songkran1_en.png
+++ b/image/bn_songkran1_en.png
--- a/image/bp_songkran1.png
+++ b/image/bp_songkran1.png
--- a/image/bp_songkran1_en.png
+++ b/image/bp_songkran1_en.png
--- a/image/page3/bn_songkran1.png
+++ b/image/page3/bn_songkran1.png
--- a/image/page3/bp_songkran1.png
+++ b/image/page3/bp_songkran1.png
--- a/video/script1.ev
+++ b/video/script1.ev
@ -3,7 +3,7 @@ DEBUGVAR BoxID
 If BoxID = 173149 Then
 	Var EventTurnOn = 1
 EndIf
-If BoxID = 172644 Then
+If BoxID = 200001 Then
 	Var EventTurnOn = 1
 EndIf

@ -12,13 +12,12 @@ If SystemDateMonthInt = 4 Then
 	DEBUGVAR MainfileSize
 	If MainfileSize = 8071197 Then
 		
-		Var EventTurnOn = 1
-				
+		Var EventTurnOn = 1		
 	EndIf
-
 EndIf
+
 If EventTurnOn = 1 Then
 	Var CountDownShowButton = 0
 	Var ShowButtonClickFull = "Invisible"
-		Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
+	Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
 EndIf
--- a/video/sync_1.file
+++ b/video/sync_1.file
@ -1,18 +1,18 @@
-total 104512
+total 93572
 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4
 -rw-rw---- 1 root sdcard_rw  8321419 2023-03-10 14:23 brewing_adv3.mp4
 -rw-rw---- 1 root sdcard_rw  9268737 2022-09-28 15:26 main_page.mp4
 -rw-rw---- 1 root sdcard_rw 19087285 2023-01-23 16:15 main_page_en.mp4
 -rw-rw---- 1 root sdcard_rw  8071197 2023-03-16 17:27 main_page_event.mp4
-rw-rw---- 1 root sdcard_rw  8679952 2022-09-28 02:41 main_page_event_alter.mp4
 -rw-rw---- 1 root sdcard_rw  8071833 2023-03-16 17:26 main_page_event_en.mp4
-rw-rw---- 1 root sdcard_rw      505 2023-03-26 21:20 script1.ev
+-rw-rw---- 1 root sdcard_rw      501 2023-03-28 13:49 script1.ev
 -rw-rw---- 1 root sdcard_rw      295 2023-03-23 15:22 script2.ev
-rw-rw---- 1 root sdcard_rw        0 2021-03-18 15:10 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2023-04-08 00:49 sync_1.file
+-rw-rw---- 1 root sdcard_rw   557065 2021-02-18 15:05 taobin_brewing.mov
+-rw-rw---- 1 root sdcard_rw   920095 2021-02-18 15:05 taobin_drink_ok.mov
 -rw-rw---- 1 root sdcard_rw  4806758 2022-06-13 18:43 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2022-06-13 18:43 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2022-06-13 18:43 taobin_save_world3.mp4
 -rw-rw---- 1 root sdcard_rw  2084830 2022-06-13 18:43 taobin_thank1.mp4
 -rw-rw---- 1 root sdcard_rw  7539282 2023-03-16 10:25 taobin_thank1_event.mp4
-rw-rw---- 1 root sdcard_rw  3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
 -rw-rw---- 1 root sdcard_rw  1631940 2022-06-13 18:43 taobin_thank2.mp4
--- a/xml/big_logo.inc
+++ b/xml/big_logo.inc
@ -0,0 +1,43 @@
+
+<Button>
+    <X> 42 </X>
+    <Y> 519 </Y>
+    <State> BigButtonEnable </State> 
+    <Filename> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/page3/bn_songkran1_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/page3/bn_songkran1.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/page3/bp_songkran1_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/page3/bp_songkran1.png"
+        EndIf
+        )
+     </FilenameDisable>
+    <EventOnClick> 
+        
+        
+        Open "ROOT/taobin_project/xml/page_catalog_group_songkran.xml"
+        
+    </EventOnClick>
+</Button>
+
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>
--- a/xml/dummy_layout.py
+++ b/xml/dummy_layout.py
@ -2,13 +2,28 @@
 if current_file_name == "page_catalog_group_songkran.skt":
 	print( "dir= " + directory_to_process + "/page_catalog_group_recommend.xml");
 	file_xml = open(directory_to_process + "/page_catalog_group_recommend.xml", 'r')
+	file_content_main = file_xml.read()
 	#print(file_xml.read())
 	# ; include-file=dummy_layout.inc
 	file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
 	file_inc_content = file_inc.read()
-	print( file_inc_content)
-	content_data = file_xml.read().replace("; include-file=dummy_layout.inc", file_inc_content)
+	file_inc2 = open(directory_to_process + "/big_logo.inc", 'r')
+	file_inc2_content = file_inc2.read()
+	#print( file_inc_content)
+	content_data = file_content_main.replace(";dummy_layout.inc", file_inc_content)
+	content_data = content_data.replace(";BigLogoLayout", file_inc2_content)
+
+	begin_text = content_data.index(";TAGESP")
+	end_text = content_data.index(";TAGESP", begin_text + 7)
+	print("sub text = " + str(begin_text) + " end = " + str(end_text))
+	tmp1 = content_data[: begin_text - 7]
 	
+	tmp2 = content_data[ end_text:-1]
+	print("tmp1=" + tmp1)
+	print("tmp2=" + tmp2)
+
+	content_data = tmp1 + tmp2	
+
 	file_xml3 = open(directory_to_process + "/page_catalog_group_recommend3.xml", 'w')
 	file_xml3.write( content_data)
 	file_xml3.close()
--- a/xml/eventopen_menu.ev
+++ b/xml/eventopen_menu.ev
@ -1,55 +1 @@
 	
-
-; Original
-;Var SoundThaiIndex = 0
-; north
-;Var SoundThaiIndex = 1
-; northeast
-;Var SoundThaiIndex = 2
-; south
-;Var SoundThaiIndex = 3
-
-;Var SongkranEnable = 0
-
-If BoxID = 173149 Then
-	Var SongkranEnable = 1
-EndIf
-If BoxID = 172527 Then
-	Var SongkranEnable = 1
-EndIf
-If BoxID = 172644 Then
-	Var SongkranEnable = 1
-EndIf
-If BoxID = 200001 Then
-	Var SongkranEnable = 1
-EndIf
-
-If SongkranEnable = 1 Then 
-
-	If SoundThaiIndex = 0 Then
-		Var SoundThaiIndex = 1
-	Else
-		If SoundThaiIndex = 1 Then
-			Var SoundThaiIndex = 2
-		Else
-			If SoundThaiIndex = 2 Then
-				Var SoundThaiIndex = 3
-			Else
-				Var SoundThaiIndex = 0
-			EndIf
-		EndIf
-	EndIf
-Else 
-	Var SongkranEnable = 0
-	Var $12-01-02-0054.Button = "Inivisble"
-	Var $12-01-02-0053.Button = "Inivisble"
-	Var $12-02-02-0043.Button = "Inivisble"
-	Var $12-02-02-0044.Button = "Inivisble"
-	Var $12-03-02-0026.Button = "Inivisble"
-	Var $12-05-02-0055.Button = "Inivisble"
-	Var $12-05-02-0056.Button = "Inivisble"
-EndIf
-
-DEBUGVAR SongkranEnable
-DEBUGVAR SoundThaiIndex
-
--- a/xml/menu_catalog_default_init.xml
+++ b/xml/menu_catalog_default_init.xml
@ -104,4 +104,3 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"
--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@ -182,6 +182,7 @@
            If ShowPromoitonOreo = 1 Then
                Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" 
            Else
+
                If SongkranEnable = 1 Then
                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
                Else
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@ -80,7 +80,7 @@
      
      out_xml('\t</QRCode>\r\n')
      out_xml('</Block>\r\n')
-      out_xml('; include-file=dummy_layout.inc\r\n')
+      out_xml(';dummy_layout.inc\r\n')


    out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
@ -89,6 +89,10 @@
        if spl[0] == "IGNORE":
          continue

+        if spl[0].startswith("TAG"):
+          out_xml( '\t;' + spl[0] + '\r\n')  
+        
+
        out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
        menu_img = spl[7]
        out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n')
@ -1002,6 +1006,8 @@
            out_xml( '\t</Text>\r\n')

          out_xml( '</Block>\r\n')
+          if spl[0].startswith("TAG"):
+            out_xml( '\t;' + spl[0] + '\r\n')  

        count_test = count_test + 1
        #if count_test > 8 :
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -783,12 +783,40 @@
 		Var ShowPromoitonOreo = 0
 	EndIf

+	Var SongkranEnable = 0 
+	If BoxID = 173149 Then
+		Var SongkranEnable = 1
+	EndIf
+	
+	If BoxID = 200001 Then
+		Var SongkranEnable = 1
+	EndIf
+
 	If SystemDateMonthInt = 4 Then
 		If SystemDateDayInt > 7 Then
 			Var SongkranEnable = 1
 		EndIf
 	EndIf
 
+	If SongkranEnable = 1 Then 
+
+		If SoundThaiIndex = 0 Then
+			Var SoundThaiIndex = 1
+		Else
+			If SoundThaiIndex = 1 Then
+				Var SoundThaiIndex = 2
+			Else
+				If SoundThaiIndex = 2 Then
+					Var SoundThaiIndex = 3
+				Else
+					Var SoundThaiIndex = 0
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
+	DEBUGVAR SoundThaiIndex

 	RootLayoutVisible 3 "hide"
 </EventOpen>
@ -915,7 +943,11 @@
 				If ShowPromoitonOreo = 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"
+			    	If SongkranEnable = 1 Then
+	                    OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml" 
+	                Else
+						OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
+		    		EndIf
 		    	EndIf

 				Machine DoorClose
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@ -351,7 +351,11 @@
 	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" 
+    	If SongkranEnable = 1 Then
+    		Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+    	Else
+   			Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"  
+    	EndIf
    EndIf
 </EventClick>
 </Button>
--- a/xml/page_catalog_group_appfast.xml
+++ b/xml/page_catalog_group_appfast.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    

@ -331,7 +330,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu8Selected = "PressForever"
@ -323,7 +322,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu2Selected = "PressForever"
@ -323,7 +322,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -524,7 +528,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 57
+; menu_new_list 55
 	; ==================> Len = 16
 	; 12-01-01-0001 - - 
 <Block>
@ -19227,504 +19231,6 @@ Sugar, Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; ==================> Len = 11
-	; - 12-01-02-0053 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0053.Button,$Sum1201020053) </State> 
-	<Button>
-	<State> $Sum1201020053 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_sexy_dance_americano.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_sexy_dance_americano.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_sexy_dance_americano.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "SEXY DANCE AMERICANO"
-		Var NameDrinkTH = "โอเลี้ยงจ้ำบ๊ะ"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำแดง"
-		Var DrinkDescription = "Espresso, Salak Syrup, water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_sexy_dance_americano.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-01-02-0053.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-01-02-0053"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-01-02-0053.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-01-02-0053"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-01-02-0053.NameE
-		Var menu_desc_eng_cold = $12-01-02-0053.descriptionE
-		Var menu_name_thai_cold = $12-01-02-0053.Name
-		Var menu_desc_thai_cold = $12-01-02-0053.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "SEXY DANCE AMERICANO" </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> "Espresso, Salak Syrup,
-water" </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> $12-01-02-0053.Button </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> $12-01-02-0053.Button </State>
-	<Value> StringFmt( $12-01-02-0053.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1201020053 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-01-02-0053.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1201020053 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 11
-	; - 12-01-02-0054 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0054.Button,$Sum1201020054) </State> 
-	<Button>
-	<State> $Sum1201020054 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_snake_wife_americano.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_snake_wife_americano.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_snake_wife_americano.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "SNAKE WIFE AMERICANO"
-		Var NameDrinkTH = "โอยั๊วะเมียงู"
-		Var DrinkDescriptionTH = "กาแฟ น้ำ และ กล้วย"
-		Var DrinkDescription = "Espresso, Tokyo Banana Syrup,  Water"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_snake_wife_americano.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-01-02-0054.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-01-02-0054"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-01-02-0054.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-01-02-0054"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-01-02-0054.NameE
-		Var menu_desc_eng_cold = $12-01-02-0054.descriptionE
-		Var menu_name_thai_cold = $12-01-02-0054.Name
-		Var menu_desc_thai_cold = $12-01-02-0054.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "SNAKE WIFE AMERICANO" </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> "Espresso, Tokyo Banana Syrup,
- Water" </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> $12-01-02-0054.Button </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> $12-01-02-0054.Button </State>
-	<Value> StringFmt( $12-01-02-0054.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1201020054 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-01-02-0054.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1201020054 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; - - - 
 </FrameScroll>
 ; Cart
 <Button>
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
        ; protein
@ -332,7 +331,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu22Selected = "PressForever"
@ -323,7 +322,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu4Selected = "PressForever"
@ -321,7 +320,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -521,7 +525,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 19
+; menu_new_list 18
 	; ==================> Len = 16
 	; 12-03-01-0005 12-03-02-0005 12-03-03-0005 
 <Block>
@ -4795,254 +4799,6 @@ BANANA MILK" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 11
-	; - 12-03-02-0026 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-03-02-0026.Button,$Sum1203020026) </State> 
-	<Button>
-	<State> $Sum1203020026 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_mini_van_Ovaltine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_mini_van_Ovaltine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_mini_van_Ovaltine.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "MINI VAN OVANTINE"
-		Var NameDrinkTH = "โอวัลตินรถโรงเรียน"
-		Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม"
-		Var DrinkDescription = "Ovaltine, Sugar, milk"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_mini_van_Ovaltine.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-03-02-0026.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-03-02-0026"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-03-02-0026.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-03-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-03-02-0026.NameE
-		Var menu_desc_eng_cold = $12-03-02-0026.descriptionE
-		Var menu_name_thai_cold = $12-03-02-0026.Name
-		Var menu_desc_thai_cold = $12-03-02-0026.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "MINI VAN OVANTINE" </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> "Ovaltine, Sugar, milk" </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> $12-03-02-0026.Button </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> $12-03-02-0026.Button </State>
-	<Value> StringFmt( $12-03-02-0026.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1203020026 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-03-02-0026.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1203020026 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; - - - 
 </FrameScroll>
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    

@ -319,7 +318,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    ; soda and other
@ -322,7 +321,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -523,7 +527,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 40
+; menu_new_list 38
 	; ==================> Len = 16
 	; - 12-05-02-0007 12-05-03-0007 
 <Block>
@ -5748,502 +5752,6 @@ SODA" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 11
-	; - 12-05-02-0055 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0055.Button,$Sum1205020055) </State> 
-	<Button>
-	<State> $Sum1205020055 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Wishing_Tree_Soda.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Wishing_Tree_Soda.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Wishing_Tree_Soda.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "WISHING TREE SODA"
-		Var NameDrinkTH = "โซดาสอยดาว"
-		Var DrinkDescriptionTH = "มะนาว น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ โซดา"
-		Var DrinkDescription = "Limenade, Ume Syrup, Lychee syrup & Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Wishing_Tree_Soda.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0055.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0055"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0055.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-05-02-0055"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-05-02-0055.NameE
-		Var menu_desc_eng_cold = $12-05-02-0055.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0055.Name
-		Var menu_desc_thai_cold = $12-05-02-0055.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "WISHING TREE SODA" </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> "Limenade, Ume Syrup, Lychee syrup & Ice" </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> $12-05-02-0055.Button </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> $12-05-02-0055.Button </State>
-	<Value> StringFmt( $12-05-02-0055.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1205020055 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-02-0055.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1205020055 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 11
-	; - 12-05-02-0056 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0056.Button,$Sum1205020056) </State> 
-	<Button>
-	<State> $Sum1205020056 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_bucket_popsicle_pepsi.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_bucket_popsicle_pepsi.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_bucket_popsicle_pepsi.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "BUCKET POPSICLE PEPSI"
-		Var NameDrinkTH = "เป๊ปซี่ไอติมแท่ง"
-		Var DrinkDescriptionTH = "เป๊ปซี่ น้ำแดงกลิ่นสละ โซดา"
-		Var DrinkDescription = "Pepsi, Salak ryrup, soda"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_bucket_popsicle_pepsi.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0056.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0056"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0056.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-05-02-0056"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-05-02-0056.NameE
-		Var menu_desc_eng_cold = $12-05-02-0056.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0056.Name
-		Var menu_desc_thai_cold = $12-05-02-0056.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "BUCKET POPSICLE PEPSI" </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> "Pepsi, Salak ryrup, soda" </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> $12-05-02-0056.Button </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> $12-05-02-0056.Button </State>
-	<Value> StringFmt( $12-05-02-0056.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1205020056 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-02-0056.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1205020056 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 16
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@ -16,6 +16,17 @@
    
    Var Menu1Selected = "PressForever"

+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
    
    SAVELOG PreviseXMLFileName2

@ -64,7 +75,7 @@



-
+;BigLogoLayout

 </Popup>

--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@ -114,11 +114,21 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu1Selected = "PressForever"

+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
    
    SAVELOG PreviseXMLFileName2

@ -329,7 +339,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -563,7 +578,7 @@
 	<Service> testservice </Service>
 	</QRCode>
 </Block>
-; include-file=dummy_layout.inc
+;dummy_layout.inc
 ; menu_new_list 44
 	; ==================> Len = 16
 	; 12-06-01-0001 - - 
@ -1572,37 +1587,38 @@ Sugar Oreo" </Value>
 	</Text>
 </Block>
 	; - - - 
-	; ==================> Len = 16
-	; 12-01-01-0001 - - 
+	;TAGESP
+	; ==================> Len = 18
+	; กาแฟ (30 ml) Espresso (30 ml) 12-01-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0001.Button,Disable=Invisible,$Sum1201010001) </State> 
+	<State> Flag( กาแฟ (30 ml).Button,Espresso (30 ml).Button,12-01-01-0001.Button,Disable=Invisible,$Sumกาแฟ (30 ml)Espresso (30 ml)1201010001) </State> 
 	<Button>
-	<State> $Sum1201010001 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso.png" </FilenameDisable>
+	<State> $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ESPRESSO"
-		Var NameDrinkTH = "เอสเพรสโซ่"
-		Var DrinkDescriptionTH = "กาแฟ (30 ml)"
-		Var DrinkDescription = "Espresso (30 ml)"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
+		Var NameDrink = ""
+		Var NameDrinkTH = "TAGESP"
+		Var DrinkDescriptionTH = "เอสเพรสโซ่"
+		Var DrinkDescription = "ESPRESSO"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-01-01-0001.Price
-		Var PriceD2 = $-.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-01-01-0001"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-01-01-0001.Button
-		Var PD_STAGE_2 = "Disable2"
-		Var PD_STAGE_3 = "Disable2"
+		Var PriceD1 = $กาแฟ (30 ml).Price
+		Var PriceD2 = $Espresso (30 ml).Price
+		Var PriceD3 = $12-01-01-0001.Price
+		Var PD_CODE1 = "กาแฟ (30 ml)"
+		Var PD_CODE2 = "Espresso (30 ml)"
+		Var PD_CODE3 = "12-01-01-0001"
+		Var PD_STAGE_1 = $กาแฟ (30 ml).Button
+		Var PD_STAGE_2 = $Espresso (30 ml).Button
+		Var PD_STAGE_3 = $12-01-01-0001.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@ -1618,28 +1634,28 @@ Sugar Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "Espresso (30 ml)"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-01-01-0001"
+			Topping "Load" "กาแฟ (30 ml)"
 			Else
-			Topping "Load" "-"
+			Topping "Load" "12-01-01-0001"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-01-01-0001.NameE
-		Var menu_desc_eng_hot = $12-01-01-0001.descriptionE
-		Var menu_name_thai_hot = $12-01-01-0001.Name
-		Var menu_desc_thai_hot = $12-01-01-0001.description
+		Var menu_name_eng_hot = $กาแฟ (30 ml).NameE
+		Var menu_desc_eng_hot = $กาแฟ (30 ml).descriptionE
+		Var menu_name_thai_hot = $กาแฟ (30 ml).Name
+		Var menu_desc_thai_hot = $กาแฟ (30 ml).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_cold = $Espresso (30 ml).NameE
+		Var menu_desc_eng_cold = $Espresso (30 ml).descriptionE
+		Var menu_name_thai_cold = $Espresso (30 ml).Name
+		Var menu_desc_thai_cold = $Espresso (30 ml).description
 		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
+		Var menu_name_eng_blender = $12-01-01-0001.NameE
+		Var menu_desc_eng_blender = $12-01-01-0001.descriptionE
+		Var menu_name_thai_blender = $12-01-01-0001.Name
+		Var menu_desc_thai_blender = $12-01-01-0001.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@ -1660,7 +1676,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "เอสเพรสโซ่" </Value>
+	<Value> "TAGESP" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1670,7 +1686,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ (30 ml)" </Value>
+	<Value> "เอสเพรสโซ่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1681,7 +1697,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ESPRESSO" </Value>
+	<Value> "" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1691,7 +1707,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso (30 ml)" </Value>
+	<Value> "ESPRESSO" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1701,7 +1717,7 @@ Sugar Oreo" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-01-01-0001.Button </State>
+	<State> $กาแฟ (30 ml).Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@ -1713,15 +1729,15 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-01-01-0001.Button </State>
-	<Value> StringFmt(  $12-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $กาแฟ (30 ml).Button </State>
+	<Value> StringFmt(  $กาแฟ (30 ml).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>
+	<State> $Espresso (30 ml).Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@ -1731,15 +1747,15 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $Espresso (30 ml).Button </State>
+	<Value> StringFmt( $Espresso (30 ml).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> "Invisible" </State>
+	<State> $12-01-01-0001.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@ -1749,8 +1765,8 @@ Sugar Oreo" </Value>
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-01-01-0001.Button </State>
+	<Value> StringFmt(  $12-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@ -1759,7 +1775,7 @@ Sugar Oreo" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum1201010001 = "Disable" Then
+			If $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@ -1779,10 +1795,10 @@ Sugar Oreo" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1201010001 = "Disable" Then
-				STRCONTAIN "ERR" $12-01-01-0001.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+			If $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 = "Disable" Then
+				STRCONTAIN "ERR" $กาแฟ (30 ml).TAG tag1_is_disable
+				STRCONTAIN "ERR" $Espresso (30 ml).TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-01-01-0001.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@ -1818,41 +1834,41 @@ Sugar Oreo" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1201010001 </State> 
+	<State> $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; 12-21-01-0001 - - 
+	; - bn_hot_espresso.png 12-21-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0001.Button,Disable=Invisible,$Sum1221010001) </State> 
+	<State> Flag( bn_hot_espresso.png.Button,12-21-01-0001.Button,Disable=Invisible,$Sumbn_hot_espresso.png1221010001) </State> 
 	<Button>
-	<State> $Sum1221010001 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso.png" </FilenameDisable>
+	<State> $Sumbn_hot_espresso.png1221010001 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//-" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//-" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//-" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ESPRESSO"
-		Var NameDrinkTH = "เอสเพรสโซ่"
-		Var DrinkDescriptionTH = "กาแฟ (30 ml)"
-		Var DrinkDescription = "Espresso (30 ml)"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
+		Var NameDrink = ""
+		Var NameDrinkTH = "TAGESP"
+		Var DrinkDescriptionTH = "เอสเพรสโซ่"
+		Var DrinkDescription = "ESPRESSO"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "-"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-21-01-0001.Price
-		Var PriceD2 = $-.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-21-01-0001"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-21-01-0001.Button
-		Var PD_STAGE_2 = "Disable2"
-		Var PD_STAGE_3 = "Disable2"
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $bn_hot_espresso.png.Price
+		Var PriceD3 = $12-21-01-0001.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "bn_hot_espresso.png"
+		Var PD_CODE3 = "12-21-01-0001"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $bn_hot_espresso.png.Button
+		Var PD_STAGE_3 = $12-21-01-0001.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@ -1868,28 +1884,28 @@ Sugar Oreo" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "bn_hot_espresso.png"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-21-01-0001"
-			Else
 			Topping "Load" "-"
+			Else
+			Topping "Load" "12-21-01-0001"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-21-01-0001.NameE
-		Var menu_desc_eng_hot = $12-21-01-0001.descriptionE
-		Var menu_name_thai_hot = $12-21-01-0001.Name
-		Var menu_desc_thai_hot = $12-21-01-0001.description
+		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_cold = $bn_hot_espresso.png.NameE
+		Var menu_desc_eng_cold = $bn_hot_espresso.png.descriptionE
+		Var menu_name_thai_cold = $bn_hot_espresso.png.Name
+		Var menu_desc_thai_cold = $bn_hot_espresso.png.description
 		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
+		Var menu_name_eng_blender = $12-21-01-0001.NameE
+		Var menu_desc_eng_blender = $12-21-01-0001.descriptionE
+		Var menu_name_thai_blender = $12-21-01-0001.Name
+		Var menu_desc_thai_blender = $12-21-01-0001.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@ -1910,7 +1926,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "เอสเพรสโซ่" </Value>
+	<Value> "TAGESP" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1920,7 +1936,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ (30 ml)" </Value>
+	<Value> "เอสเพรสโซ่" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1931,7 +1947,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ESPRESSO" </Value>
+	<Value> "" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1941,7 +1957,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso (30 ml)" </Value>
+	<Value> "ESPRESSO" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1951,7 +1967,7 @@ Sugar Oreo" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-21-01-0001.Button </State>
+	<State> $-.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@ -1963,53 +1979,53 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $-.Button </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> $bn_hot_espresso.png.Button </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> $bn_hot_espresso.png.Button </State>
+	<Value> StringFmt( $bn_hot_espresso.png.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-21-01-0001.Button </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-21-01-0001.Button </State>
 	<Value> StringFmt( $12-21-01-0001.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> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 183 </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>
 	<State> 
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum1221010001 = "Disable" Then
+			If $Sumbn_hot_espresso.png1221010001 = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@ -2029,10 +2045,10 @@ Sugar Oreo" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1221010001 = "Disable" Then
-				STRCONTAIN "ERR" $12-21-01-0001.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+			If $Sumbn_hot_espresso.png1221010001 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $bn_hot_espresso.png.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-21-01-0001.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@ -2068,11 +2084,12 @@ Sugar Oreo" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1221010001 </State> 
+	<State> $Sumbn_hot_espresso.png1221010001 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
+	;TAGESP
 	; ==================> Len = 16
 	; 12-01-01-0003 12-01-02-0001 - 
 <Block>
@ -12243,7 +12260,7 @@ LIMENADE SODA" </Value>



-
+;BigLogoLayout

 </Popup>

--- a/xml/page_catalog_group_recommend3.xml
+++ b/xml/page_catalog_group_recommend3.xml
@ -114,11 +114,21 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu1Selected = "PressForever"

+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
    
    SAVELOG PreviseXMLFileName2

@ -329,7 +339,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -2918,508 +2933,7 @@ Sugar Oreo" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; - - - 
-	; ==================> Len = 16
-	; 12-01-01-0001 - - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-01-01-0001.Button,Disable=Invisible,$Sum1201010001) </State> 
-	<Button>
-	<State> $Sum1201010001 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "ESPRESSO"
-		Var NameDrinkTH = "เอสเพรสโซ่"
-		Var DrinkDescriptionTH = "กาแฟ (30 ml)"
-		Var DrinkDescription = "Espresso (30 ml)"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-01-01-0001.Price
-		Var PriceD2 = $-.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-01-01-0001"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-01-01-0001.Button
-		Var PD_STAGE_2 = "Disable2"
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-01-01-0001"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $12-01-01-0001.NameE
-		Var menu_desc_eng_hot = $12-01-01-0001.descriptionE
-		Var menu_name_thai_hot = $12-01-01-0001.Name
-		Var menu_desc_thai_hot = $12-01-01-0001.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 = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "กาแฟ (30 ml)" </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> "ESPRESSO" </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> "Espresso (30 ml)" </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> $12-01-01-0001.Button </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> $12-01-01-0001.Button </State>
-	<Value> StringFmt(  $12-01-01-0001.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum1201010001 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		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 $Sum1201010001 = "Disable" Then
-				STRCONTAIN "ERR" $12-01-01-0001.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1201010001 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; 12-21-01-0001 - - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-21-01-0001.Button,Disable=Invisible,$Sum1221010001) </State> 
-	<Button>
-	<State> $Sum1221010001 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_espresso.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "ESPRESSO"
-		Var NameDrinkTH = "เอสเพรสโซ่"
-		Var DrinkDescriptionTH = "กาแฟ (30 ml)"
-		Var DrinkDescription = "Espresso (30 ml)"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-21-01-0001.Price
-		Var PriceD2 = $-.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "12-21-01-0001"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = $12-21-01-0001.Button
-		Var PD_STAGE_2 = "Disable2"
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-21-01-0001"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		Var menu_name_eng_hot = $12-21-01-0001.NameE
-		Var menu_desc_eng_hot = $12-21-01-0001.descriptionE
-		Var menu_name_thai_hot = $12-21-01-0001.Name
-		Var menu_desc_thai_hot = $12-21-01-0001.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 = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.description
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.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> "กาแฟ (30 ml)" </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> "ESPRESSO" </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> "Espresso (30 ml)" </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> $12-21-01-0001.Button </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> $12-21-01-0001.Button </State>
-	<Value> StringFmt( $12-21-01-0001.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> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 183 </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>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum1221010001 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
-		
-		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 $Sum1221010001 = "Disable" Then
-				STRCONTAIN "ERR" $12-21-01-0001.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1221010001 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
+	; -;TAGESP
 	; ==================> Len = 16
 	; 12-01-01-0003 12-01-02-0001 - 
 <Block>
@ -13591,7 +13105,49 @@ LIMENADE SODA" </Value>



+<Button>
+    <X> 42 </X>
+    <Y> 519 </Y>
+    <State> BigButtonEnable </State> 
+    <Filename> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/page3/bn_songkran1_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/page3/bn_songkran1.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/page3/bp_songkran1_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/page3/bp_songkran1.png"
+        EndIf
+        )
+     </FilenameDisable>
+    <EventOnClick> 
+        
+        
+        Open "ROOT/taobin_project/xml/page_catalog_group_songkran.xml"
+        
+    </EventOnClick>
+</Button>
+
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>
+

 </Popup>

-
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    

@ -319,7 +318,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    Var Menu3Selected = "PressForever"
@ -323,7 +322,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>
@ -526,7 +530,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 29
+; menu_new_list 27
 	; ==================> Len = 11
 	; 12-02-01-0001 12-02-02-0001 12-02-03-0001 
 <Block>
@ -7344,503 +7348,6 @@ Water" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 16
-	; - 12-02-02-0043 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0043.Button,$Sum1202020043) </State> 
-	<Button>
-	<State> $Sum1202020043 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Papong_Tea_Soda.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Papong_Tea_Soda.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Papong_Tea_Soda.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "PAPONG TEA SODA"
-		Var NameDrinkTH = "ชาดำปาโป่ง"
-		Var DrinkDescriptionTH = "ชาไทย มะนาว โซดา"
-		Var DrinkDescription = "Thai tea, Limenade,soda"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Papong_Tea_Soda.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-02-02-0043.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-02-02-0043"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-02-02-0043.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-02-02-0043"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-02-02-0043.NameE
-		Var menu_desc_eng_cold = $12-02-02-0043.descriptionE
-		Var menu_name_thai_cold = $12-02-02-0043.Name
-		Var menu_desc_thai_cold = $12-02-02-0043.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "PAPONG TEA SODA" </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> "Thai tea, Limenade,soda" </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> $12-02-02-0043.Button </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> $12-02-02-0043.Button </State>
-	<Value> StringFmt( $12-02-02-0043.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1202020043 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-02-02-0043.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1202020043 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; - - - 
-	; ==================> Len = 16
-	; - 12-02-02-0044 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0044.Button,$Sum1202020044) </State> 
-	<Button>
-	<State> $Sum1202020044 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Matcha_Haunted_House.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Matcha_Haunted_House.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Matcha_Haunted_House.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var NameDrink = "MATCHA HAUNTED HOUSE "
-		Var NameDrinkTH = "ชาเขียวบ้านผีปอบ "
-		Var DrinkDescriptionTH = "ชาเขียว น้ำเชื่อมสตรอเบอรี โซดา"
-		Var DrinkDescription = "Match, Strawberry Syrup,Soda"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Matcha_Haunted_House.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-02-02-0044.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-02-02-0044"
-		Var PD_CODE3 = "##-##-##-####"
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-02-02-0044.Button
-		Var PD_STAGE_3 = "Disable2"
-		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" "12-02-02-0044"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			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 = $12-02-02-0044.NameE
-		Var menu_desc_eng_cold = $12-02-02-0044.descriptionE
-		Var menu_name_thai_cold = $12-02-02-0044.Name
-		Var menu_desc_thai_cold = $12-02-02-0044.description
-		
-		Var menu_name_eng_blender = $##-##-##-####.NameE
-		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-		Var menu_name_thai_blender = $##-##-##-####.Name
-		Var menu_desc_thai_blender = $##-##-##-####.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> "MATCHA HAUNTED
-HOUSE " </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> "Match, Strawberry Syrup,Soda" </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> $12-02-02-0044.Button </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> $12-02-02-0044.Button </State>
-	<Value> StringFmt( $12-02-02-0044.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> "Invisible" </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> "Invisible" </State>
-	<Value> StringFmt(  $-.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 $Sum1202020044 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-02-02-0044.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.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> $Sum1202020044 </State> 
-	<Value> text_unavailable </Value>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; - - - 
 </FrameScroll>
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@ -114,7 +114,6 @@
        ;
        

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev"

    
    If AppFastEnable = "true" Then
@ -328,7 +327,12 @@
            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" 
+
+                If SongkranEnable = 1 Then
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+                Else
+                    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+                EndIf
            EndIf
        </EventClick>
        </Button>