Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

2024-11-08 17:00:52 +07:00 · 2024-11-08 17:00:52 +07:00 · 60d7978f96
commit 60d7978f96
parent 845f022536 036a5a2608
26 changed files with 1033 additions and 61 deletions
--- a/inter/aus/support_langs
+++ b/inter/aus/support_langs
@ -0,0 +1 @@
+ENG
--- a/inter/hkg/support_langs
+++ b/inter/hkg/support_langs
@ -0,0 +1 @@
+ENG
--- a/inter/mys/adv/taobin_adv_menu_25.mp4
+++ b/inter/mys/adv/taobin_adv_menu_25.mp4
--- a/inter/mys/support_langs
+++ b/inter/mys/support_langs
@ -1 +1 @@
-ENG,THAI,CHINA,JAPAN,MALAY
+ENG,-,CHINA,JAPAN,MALAY
--- a/inter/mys/xml/event/event_profile.ev
+++ b/inter/mys/xml/event/event_profile.ev
@ -5,75 +5,121 @@ DEBUGVAR XMLProfile
 STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
 STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce

-DEBUGVAR HasProYuzu250Concat
-DEBUGVAR ProReducedPriceEnable
-DEBUGVAR IgnoreProfileFromRunEV
+Var refresh_str = "-RefreshProf"
+STRCONTAIN refresh_str XMLProfile HasRefreshProf

-If ProReducedPriceEnable = 1 Then
+DEBUGVAR HasRefreshProf
+DEBUGVAR NeedRefreshProfile

-Else
-    DEBUGVAR "Case pro reduce end"
-    ; case-pro-reduce-end
-    If IgnoreProfileFromRunEV = 1 Then
-        DEBUGVAR "Pro yuzu ongoing"
-        ; concat-profile
-        If HasProYuzu250Concat = "true" Then
-            DEBUGVAR "Pro yuzu concat"
+; refresh-profile-after-promo-end
+If NeedRefreshProfile = 1 Then
+
+    READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS
+    READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
+
+    STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop
+    STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop
+
+    DEBUGVAR PromoYuzuDrop
+    DEBUGVAR PromoYuzuDis50Drop
+
+    If HasRefreshProf = "true" Then
+
+        DEBUGVAR "case already refresh"
+
+        ; restore-profile
+        CacheVarStr "get" XMLProfilePreEvent
+        Var XMLProfile = XMLProfilePreEvent
+        Var NeedRefreshProfile = 0
+    Else
+        ; save-current-as-pre
+        CacheVarStr "put" XMLProfilePreEvent
+
+        If PromoYuzuDrop = "true" Then
+            DEBUGVAR "case yuzu drop --> refresh"
+            Var XMLProfile = XMLProfile + refresh_str
        Else
+            If PromoYuzuDis50Drop = "true" Then
+                DEBUGVAR "case yuzu drop discount 50% --> refresh"
+                Var XMLProfile = XMLProfile + refresh_str
+            EndIf
+        EndIf
+
+    EndIf
+Else
+
+    DEBUGVAR HasProYuzu250Concat
+    DEBUGVAR ProReducedPriceEnable
+    DEBUGVAR IgnoreProfileFromRunEV
+
+    If ProReducedPriceEnable = 1 Then
+
+    Else
+        DEBUGVAR "Case pro reduce end"
+        ; case-pro-reduce-end
+        If IgnoreProfileFromRunEV = 1 Then
+            DEBUGVAR "Pro yuzu ongoing"
+            ; concat-profile
+            If HasProYuzu250Concat = "true" Then
+                DEBUGVAR "Pro yuzu concat"
+            Else
+
+                If IsProfileReduce = "true" Then
+                    DEBUGVAR "Pro reduce was set but disabled from trick"
+                    CacheVarStr "get" XMLProfilePreEvent
+                    If XMLProfilePreEvent = "" Then
+                        DEBUGVAR "Get PreEvent Empty"
+                        Var XMLProfile = "General"
+                    Else
+                        DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
+                        DEBUGVAR XMLProfilePreEvent
+                        Var XMLProfile = XMLProfilePreEvent + "-"
+                        Var XMLProfile = XMLProfile + "PromoYuzu250"
+
+                    EndIf

-            If IsProfileReduce = "true" Then
-                DEBUGVAR "Pro reduce was set but disabled from trick"
-                CacheVarStr "get" XMLProfilePreEvent
-                If XMLProfilePreEvent = "" Then
-                    DEBUGVAR "Get PreEvent Empty"
-                    Var XMLProfile = "General"
                Else
-                    DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
-                    DEBUGVAR XMLProfilePreEvent
-                    Var XMLProfile = XMLProfilePreEvent + "-"
+                    DEBUGVAR "No pro reduce, concat pro yuzu"
+                    CacheVarStr "put" XMLProfilePreEvent
+
+                    Var XMLProfile = XMLProfile + "-"
                    Var XMLProfile = XMLProfile + "PromoYuzu250"

                EndIf
-
-            Else
-                DEBUGVAR "No pro reduce, concat pro yuzu"
-                CacheVarStr "put" XMLProfilePreEvent
-
-                Var XMLProfile = XMLProfile + "-"
-                Var XMLProfile = XMLProfile + "PromoYuzu250"
-
            EndIf
-        EndIf
-    Else
-        If IsProfileReduce = "true" Then
-            DEBUGVAR "No yuzu but set pro reduce"
-            CacheVarStr "get" XMLProfilePreEvent
-            If XMLProfilePreEvent = "" Then
-                DEBUGVAR "PreEvent empty, set General"
-                Var XMLProfile = "General"
-            Else
-                DEBUGVAR "Restore profile by pre-event"
-                Var XMLProfile = XMLProfilePreEvent
-            EndIf
-
        Else
-
-            If HasProYuzu250Concat = "true" Then
+            If IsProfileReduce = "true" Then
+                DEBUGVAR "No yuzu but set pro reduce"
                CacheVarStr "get" XMLProfilePreEvent
-                Var XMLProfile = XMLProfilePreEvent
+                If XMLProfilePreEvent = "" Then
+                    DEBUGVAR "PreEvent empty, set General"
+                    Var XMLProfile = "General"
+                Else
+                    DEBUGVAR "Restore profile by pre-event"
+                    Var XMLProfile = XMLProfilePreEvent
+                EndIf
+
+            Else
+
+                If HasProYuzu250Concat = "true" Then
+                    CacheVarStr "get" XMLProfilePreEvent
+                    Var XMLProfile = XMLProfilePreEvent
+                EndIf
+
+                DEBUGVAR "Store profile pre event"
+                DEBUGVAR XMLProfilePreEvent
+                CacheVarStr "put" XMLProfilePreEvent
            EndIf

-            DEBUGVAR "Store profile pre event"
-            DEBUGVAR XMLProfilePreEvent
-            CacheVarStr "put" XMLProfilePreEvent
        EndIf

    EndIf

-EndIf
-
-
-
-If IgnoreProfileFromRunEV = 1 Then
-    Var ToggleAfterEventProfileOff = 1
+
+
+    If IgnoreProfileFromRunEV = 1 Then
+        Var ToggleAfterEventProfileOff = 1
+    EndIf
+
+
 EndIf
--- a/inter/mys/xml/event/tricker.ev
+++ b/inter/mys/xml/event/tricker.ev
@ -58,8 +58,25 @@ If SystemDateMonthInt = 9 Then
 	EndIf
 EndIf

+If SystemDateMonthInt = 10 Then
+
+    Var IgnoreProfileFromRunEV = 0
+
+EndIf
+
+If SystemDateMonthInt = 11 Then
+
+    Var IgnoreProfileFromRunEV = 0
+EndIf
+
+If SystemDateMonthInt = 12 Then
+    Var IgnoreProfileFromRunEV = 0
+
+EndIf
+
 If SystemDateMonthInt < 10 Then
    Var ProReducedPriceEnable = 0
+    Var IgnoreProfileFromRunEV = 0
 EndIf

 If ProReducedPriceEnable = 0 Then
@ -69,6 +86,23 @@ If ProReducedPriceEnable = 0 Then
    EndIf
 EndIf

+
+; zone-refresh-once
+
+READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr
+STRCONTAIN "1" NeedRefreshStr need_refresh
+
+If need_refresh = "true" Then
+
+    Var NeedRefreshProfile = 1
+    WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0"
+
+Else
+    Var NeedRefreshProfile = 0
+EndIf
+
+
+
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
 	Var ProYuzuEnable = 1
--- a/inter/sgp/animation01/play_list.tsv
+++ b/inter/sgp/animation01/play_list.tsv
@ -570,9 +570,9 @@ Coke	52-05-03-0019	1	23	37	13	41					24	49	0:49	23
 ไมโลเย็น	52-03-03-0048	1	7	61	16	23	41				24	120	8:00	23
 ไมโลปั่นภูเขาไฟ	52-03-03-0049	1	7	15	61	41	61				24	120	8:00	23

-
-
-
+รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้	52-21-03-0078	1	2	3	4	14	23	41			24	49	11:01	23
+พรีเมียมมัทฉะคาราเมลโอริโอ้	52-02-03-0057	1	6	22	40	8	9	23	41		24	133	14:13	22
+พรีเมียมชาไทยคาราเมลโอริโอ้	52-02-03-0058	1	1	6	10	22	40	23	41		24	133	14:13	22



--- a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/inter/sgp/support_langs
+++ b/inter/sgp/support_langs
@ -0,0 +1 @@
+ENG
--- a/inter/sgp/video/script_thank.ev
+++ b/inter/sgp/video/script_thank.ev
@ -11,3 +11,17 @@ If EventTurnOn = 1 Then
 EndIf


+If UsePepsiTheme = 1 Then
+
+    ; expect-wtc
+    If SaveTheWorldCount = 0 Then
+        GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize
+        DEBUGVAR MainfileSize
+        If MainfileSize = 5184722 Then
+            Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4"
+        EndIf
+    Else
+
+    EndIf
+
+EndIf
--- a/inter/sgp/xml/page_catalog_group_coffee.lxml
+++ b/inter/sgp/xml/page_catalog_group_coffee.lxml
@ -690,7 +690,7 @@
 	 Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
-; menu_new_list 60
+; menu_new_list 61
 	; ==================> Len = 3
 	; 52-01-01-0001 - - 
 <Block>
@ -23279,6 +23279,281 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 52-21-03-0078 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 52-21-03-0078.Button,$Sum5221030078) </State> 
+	<Button>
+	<State> $Sum5221030078 </State> 
+	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $52-21-03-0078.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "52-21-03-0078"
+		; begin lang 
+		Var aliasName[0] = "PREMIUM ESPRESSO\nCARAMEL OREO"
+		Var aliasDesc[0] = "Coffee, Milk, Caramel Syrup, Oreo"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "PREMIUM ESPRESSO\nCARAMEL OREO###size=58"
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Coffee, Milk, Caramel Syrup, Oreo"
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $52-21-03-0078.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "52-21-03-0078"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		Var OverlayMenuFilter = ""
+		Var OverlayMenuFilter1 = ""
+		Var OverlayMenuFilter2 = ""
+		Var OverlayMenuFilter3 = ""
+		Var OverlayMenuFilter = ""
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width> 222 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> HeadlineColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>PREMIUM ESPRESSO\nCARAMEL OREO</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>PREMIUM ESPRESSO\nCARAMEL OREO</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width> 222 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> BodyTextColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Coffee, Milk, Caramel Syrup, Oreo</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Coffee, Milk, Caramel Syrup, Oreo</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</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> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> $52-21-03-0078.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </ColorDisable>
+	<State> $52-21-03-0078.Button </State>
+	<Value> StringFmt(  $52-21-03-0078.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 $Sum5221030078 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $52-21-03-0078.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> WTCMediumBlueColor </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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5221030078 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart
--- a/inter/sgp/xml/page_catalog_group_tea.lxml
+++ b/inter/sgp/xml/page_catalog_group_tea.lxml
@ -692,7 +692,7 @@
 	 Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
-; menu_new_list 46
+; menu_new_list 48
 	; ==================> Len = 3
 	; 52-02-01-0001 52-02-02-0001 52-02-03-0001 
 <Block>
@ -13865,6 +13865,556 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 52-02-03-0057 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 52-02-03-0057.Button,$Sum5202030057) </State> 
+	<Button>
+	<State> $Sum5202030057 </State> 
+	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $52-02-03-0057.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "52-02-03-0057"
+		; begin lang 
+		Var aliasName[0] = "PREMIUM GREEN TEA\nCARAMEL OREO"
+		Var aliasDesc[0] = "Matcha, Milk, Caramel Syrup, Oreo"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = ""
+		Var aliasDesc[3] = ""
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "PREMIUM GREEN TEA\nCARAMEL OREO###size=58"
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Matcha, Milk, Caramel Syrup, Oreo"
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $52-02-03-0057.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "52-02-03-0057"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		Var OverlayMenuFilter = ""
+		Var OverlayMenuFilter1 = ""
+		Var OverlayMenuFilter2 = ""
+		Var OverlayMenuFilter3 = ""
+		Var OverlayMenuFilter = ""
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width> 222 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> HeadlineColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>PREMIUM GREEN TEA\nCARAMEL OREO</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>PREMIUM GREEN TEA\nCARAMEL OREO</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width> 222 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> BodyTextColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Matcha, Milk, Caramel Syrup, Oreo</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Matcha, Milk, Caramel Syrup, Oreo</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</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> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> $52-02-03-0057.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </ColorDisable>
+	<State> $52-02-03-0057.Button </State>
+	<Value> StringFmt(  $52-02-03-0057.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 $Sum5202030057 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $52-02-03-0057.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> WTCMediumBlueColor </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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5202030057 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 52-02-03-0058 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 52-02-03-0058.Button,$Sum5202030058) </State> 
+	<Button>
+	<State> $Sum5202030058 </State> 
+	<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $52-02-03-0058.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "52-02-03-0058"
+		; begin lang 
+		Var aliasName[0] = "PREMIUM THAI TEA\nCARAMEL OREO"
+		Var aliasDesc[0] = "Thai Tea, Milk, Caramel Syrup, Oreo"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = ""
+		Var aliasDesc[3] = ""
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "PREMIUM THAI TEA\nCARAMEL OREO###size=58"
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Thai Tea, Milk, Caramel Syrup, Oreo"
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $52-02-03-0058.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "52-02-03-0058"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		Var OverlayMenuFilter = ""
+		Var OverlayMenuFilter1 = ""
+		Var OverlayMenuFilter2 = ""
+		Var OverlayMenuFilter3 = ""
+		Var OverlayMenuFilter = ""
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width> 222 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> HeadlineColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>PREMIUM THAI TEA\nCARAMEL OREO</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>PREMIUM THAI TEA\nCARAMEL OREO</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width> 222 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> BodyTextColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Thai Tea, Milk, Caramel Syrup, Oreo</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Thai Tea, Milk, Caramel Syrup, Oreo</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</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> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </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> $52-02-03-0058.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width> 220 </Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> WTCBlueColor </Color>
+	<ColorDisable> WTCWhiteColor </ColorDisable>
+	<State> $52-02-03-0058.Button </State>
+	<Value> StringFmt(  $52-02-03-0058.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 $Sum5202030058 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $52-02-03-0058.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> WTCMediumBlueColor </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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5202030058 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart
--- a/inter/whatthecup/common/video/wtc_thankyou.mp4
+++ b/inter/whatthecup/common/video/wtc_thankyou.mp4
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -667,6 +667,7 @@
 	Var UsePepsiTheme = 0

 	Var NoTrickPriceProfile = 0
+	Var NeedRefreshProfile = 0

 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"

@ -1502,7 +1503,7 @@ PRICE "Reset" "-"
 </EventUnitTest7>

 <EventUnitTest8>
-	Var XMLProfile = "Discount50"
+	Var XMLProfile = "General"
 	Var TimeProfilePrice = 0

 </EventUnitTest8>
@ -2188,5 +2189,46 @@ PRICE "Reset" "-"
 <Value> ShowNetworkProblemText </Value>
 </Text>

+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Enable"
+    Else
+        Var return = "Invisible"
+    EndIf
+) </State>
+<Color> "0xFFFF00" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+<EventClick>
+</EventClick>
+</Button>
+
+<Text>
+<State> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Enable"
+    Else
+        Var return = "Invisible"
+    EndIf
+) </State>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0x000000 </Color>
+<Value> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Loading ..."
+    Else
+        Var return = ""
+    EndIf
+) </Value>
+</Text>
+

 </Page>
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -161,6 +161,14 @@
 		Else
 			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 		EndIf
+	Else
+	    If InternationalEnable = 1 Then
+            If UsePepsiTheme = 1 Then
+                Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+                TRY script_thankyou
+            EndIf
+        EndIf
+
 	EndIf