Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png

ui/lang.tsv

@@ -720,6 +720,9 @@
 800528		Auto adjustment	ปรับอัตโนมัติ
 800529		Disable	ปิดการใช้งาน
 800530		Partial Refill	เติมแบบหยอด
+800531		Alert	ยืนยันการเคลียร์วัตถุดิบทั้งหมด
+800532		Please type the word 'taobin' to confirm clearing all materials.	กรุณาพิมพ์คำว่า 'taobin' เพื่อยืนยันการเคลียร์วัตถุดิบทั้งหมด
+800533		You typed the confirmation text incorrectly.	คุณพิมข้อความยืนยันผิด
 
 800600		Turn around	หมุนกลับ
 800601		Call arm	Call แขน

xml/event/ignore_multi_promotion_config_coconut_milk_matcha.json

@@ -0,0 +1,30 @@
+[
+    {
+        "name": "matcha_every_day",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "normal_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "press_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "press_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "disable_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "disable_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"
+        }
+    },
+    {
+        "name": "coconut_milk",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "normal_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "press_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "press_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "disable_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "disable_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
+            "video_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_coconut_milk.xml"
+        }
+    }
+]

xml/event/out_put_file3.txt

@@ -1 +1 @@
-/event/promotion_ovaltine_school.xml
+/event/promotion_matcha_every_day.xml

xml/event/promotion_onclick3.inc

@@ -1 +1 @@
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_ovaltine_school.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"

xml/event/promotion_template3.inc

@@ -35,43 +35,6 @@
         ###EventOnClick
 
 </EventOnClick>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State>
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        )
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State>
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        )
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.mp4" </Filename>
-</Video>
-
 </Button>
 
 <EventUnitTest1>

xml/event/script_common_for_open_promotion_xml.ev

@@ -8,6 +8,7 @@ DEBUGVAR StrawberrySeriesPro
 DEBUGVAR OvaltineSchoolPro
 DEBUGVAR RedStringOfFatePro
 DEBUGVAR CoconutMilkPro
+DEBUGVAR MatchaEveryDayPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -27,23 +28,18 @@ Else
 	Var CountEnablePromotion = 0
 	Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 
-	; zone promote
-    If OvaltineSchoolPro = 1 Then
-        If RedStringOfFatePro = 1 Then
-            Var PromotionState1 = "Enable"
-            Var PromotionState2 = "Enable"
-            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_ovaltine_and_red_string.xml"
-        Else
-            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_ovaltine_school.xml"
-        EndIf
-    Else
-        If RedStringOfFatePro = 1 Then
-            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_red_string_of_fate.xml"
-        EndIf
-    EndIf
-
     If CoconutMilkPro = 1 Then
         Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
+		Var PromotionState2 = "Enable"
+
+		If MatchaEveryDayPro = 1 Then
+			Var PromotionState1 = "Enable"
+        	Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
+		EndIf
+	Else
+		If MatchaEveryDayPro = 1 Then
+        	Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
+		EndIf
     EndIf
 
 

xml/event/tricker.ev

@@ -68,6 +68,9 @@ Var SwensenPro = 0
 ; Coconut Milk, 1 Mar - 31 Mar
 Var CoconutMilkPro = 0
 
+; Matcha every day, 10 Mar - 31 Mar
+Var MatchaEveryDayPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -119,6 +122,7 @@ EndIf
 If SystemDateMonthInt = 3 Then
 	If SystemDateDayInt >= 10 Then
 		Var SwensenPro = 1
+		Var MatchaEveryDayPro = 1
 	EndIf
 
 	Var CoconutMilkPro = 1
@@ -218,6 +222,7 @@ If taobin_nopro = "true" Then
 	Var OvaltineSchoolPro = 0
 	Var RedStringOfFatePro = 0
 	Var CoconutMilkPro = 0
+	Var MatchaEveryDayPro = 0
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
 EndIf
@@ -230,6 +235,12 @@ Else
 	Var CoconutMilkPro = 0
 EndIf
 
+If MatchaPowderEnable = "true" Then
+
+Else
+	Var MatchaEveryDayPro = 0
+EndIf
+
 DEBUGVAR HaveIngredientOvaltine
 If HaveIngredientOvaltine = "true" Then
 

xml/page_board.xml

@@ -211,6 +211,7 @@
 	STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
 	STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
 	STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
+	STRCONTAIN "1050" MaterialAvailable MatchaPowderEnable
 	
 	STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
 

xml/page_catalog_group_pro_matcha_every_day.skt

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

xml/page_catalog_group_recommend.xml

@@ -3859,38 +3859,38 @@ Soda Extra" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 15
-	; 12-03-01-0019 12-03-02-0019 12-03-03-0019 
+	; - - 12-03-03-0094 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-01-0019.Button,12-03-02-0019.Button,12-03-03-0019.Button,Disable=Invisible,$Sum120301001912030200191203030019) </State> 
+	<State> Flag( 12-03-03-0094.Button,Disable=Invisible,$Sum1203030094) </State> 
 	<Button>
-	<State> $Sum120301001912030200191203030019 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_ovaltine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_ovaltine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_ovaltine.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-03-01-0019, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<State> $Sum1203030094 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Ovaltine_cocoa_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Ovaltine_cocoa_smoothie.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-03-03-0094, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Ovaltine"
-		Var NameDrinkTH = "โอวัลติน"
-		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล"
-		Var DrinkDescription = "Ovaltine, Milk, Cocoa, And Sugar"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ovaltine.png"
+		Var NameDrink = "Mini Bus Ovaltine Volcano"
+		Var NameDrinkTH = "โอวัลตินรถโรงเรียน ภูเขาไฟ"
+		Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม"
+		Var DrinkDescription = "Ovaltine, Sugar, milk"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Ovaltine_cocoa_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-03-01-0019.Price
-		Var PriceD2 = $12-03-02-0019.Price
-		Var PriceD3 = $12-03-03-0019.Price
-		Var PD_CODE1 = "12-03-01-0019"
-		Var PD_CODE2 = "12-03-02-0019"
-		Var PD_CODE3 = "12-03-03-0019"
-		Var PD_STAGE_1 = $12-03-01-0019.Button
-		Var PD_STAGE_2 = $12-03-02-0019.Button
-		Var PD_STAGE_3 = $12-03-03-0019.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-03-01-0019, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-03-03-0094.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-03-03-0094"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-03-03-0094.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0094, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3907,28 +3907,28 @@ Soda Extra" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-03-02-0019"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-03-01-0019"
+			Topping "Load" "-"
 			Else
-			Topping "Load" "12-03-03-0019"
+			Topping "Load" "12-03-03-0094"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $12-03-01-0019.NameE
-		Var menu_desc_eng_hot = $12-03-01-0019.descriptionE
-		Var menu_name_thai_hot = $12-03-01-0019.Name
-		Var menu_desc_thai_hot = $12-03-01-0019.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 = $12-03-02-0019.NameE
-		Var menu_desc_eng_cold = $12-03-02-0019.descriptionE
-		Var menu_name_thai_cold = $12-03-02-0019.Name
-		Var menu_desc_thai_cold = $12-03-02-0019.description
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
 		
-		Var menu_name_eng_blender = $12-03-03-0019.NameE
-		Var menu_desc_eng_blender = $12-03-03-0019.descriptionE
-		Var menu_name_thai_blender = $12-03-03-0019.Name
-		Var menu_desc_thai_blender = $12-03-03-0019.description
+		Var menu_name_eng_blender = $12-03-03-0094.NameE
+		Var menu_desc_eng_blender = $12-03-03-0094.descriptionE
+		Var menu_name_thai_blender = $12-03-03-0094.Name
+		Var menu_desc_thai_blender = $12-03-03-0094.description
 		
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
@@ -3949,7 +3949,8 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "โอวัลติน" </Value>
+	<Value> "โอวัลตินรถโรงเรียน
+ภูเขาไฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3959,7 +3960,7 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โอวัลติน นม โกโก้ และน้ำตาล" </Value>
+	<Value> "โอวัลติน น้ำตาล และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3970,7 +3971,8 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Ovaltine" </Value>
+	<Value> "Mini Bus Ovaltine
+Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3980,7 +3982,7 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ovaltine, Milk, Cocoa, And Sugar" </Value>
+	<Value> "Ovaltine, Sugar, milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3990,7 +3992,7 @@ Soda Extra" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-03-01-0019.Button </State>
+	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -4002,15 +4004,15 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-03-01-0019.Button </State>
-	<Value> StringFmt(  $12-03-01-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<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-0019.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -4020,15 +4022,15 @@ Soda Extra" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-03-02-0019.Button </State>
-	<Value> StringFmt( $12-03-02-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-03-03-0019.Button </State>
+	<State> $12-03-03-0094.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
@@ -4038,8 +4040,8 @@ Soda Extra" </Value>
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-03-03-0019.Button </State>
-	<Value> StringFmt(  $12-03-03-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-03-03-0094.Button </State>
+	<Value> StringFmt(  $12-03-03-0094.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4048,11 +4050,7 @@ Soda Extra" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum120301001912030200191203030019 = "Disable" Then
-				Var ice_tab_process_show = "Disable"
-			Else
-				Var ice_tab_process_show = "Enable"
-			EndIf
+			Var ice_tab_process_show = "Invisible"
 		
 		Else
 			Var ice_tab_process_show = "Invisible"
@@ -4068,10 +4066,10 @@ Soda Extra" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum120301001912030200191203030019 = "Disable" Then
-				STRCONTAIN "ERR" $12-03-01-0019.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-03-02-0019.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-03-03-0019.TAG tag3_is_disable
+			If $Sum1203030094 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-03-03-0094.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -4107,7 +4105,7 @@ Soda Extra" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum120301001912030200191203030019 </State> 
+	<State> $Sum1203030094 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -5646,7 +5644,7 @@ Water" </Value>
 		Var NameDrink = "Pepsi milk"
 		Var NameDrinkTH = "เป๊ปซี่นม"
 		Var DrinkDescriptionTH = "เป๊ปซี่ นม"
-		Var DrinkDescription = "Pepsi, Milk"
+		Var DrinkDescription = "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PEPSI_MILK.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5748,7 +5746,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Pepsi, Milk" </Value>
+	<Value> "-" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5876,7 +5874,255 @@ Water" </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
-	; - - - 
+	;  - - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( .Button,Disable=Invisible,$Sum) </State> 
+	<Button>
+	<State> $Sum </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_PEPSI_MILK.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_PEPSI_MILK.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_PEPSI_MILK.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<EventOnClick> 
+		Var NameDrink = "Pepsi milk"
+		Var NameDrinkTH = "เป๊ปซี่นม"
+		Var DrinkDescriptionTH = "เป๊ปซี่ นม"
+		Var DrinkDescription = "-"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PEPSI_MILK.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = "Disable2"
+		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" ""
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.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> "Pepsi milk" </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> "-" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "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
+		
+			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 $Sum = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.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> $Sum </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 19
 	; - - 12-03-03-0029 
 <Block>