diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv
index d40c4f68..9ab8914a 100644
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@@ -966,3 +966,5 @@ ICED COCONUT PEPSI	51-05-02-0091	1	62	14	13	23					24	120	17:00	23
 COCONUT PEPSI FRAPPE	51-05-03-0091	1	23	62	14	41					24	120	17:00	23
 ICED COCONUT LYCHEE SODA	51-05-02-0093	1	62	11	13	23					24	120	17:00	23
 ICED COCONUT PEPSI MAX	51-05-02-0117	1	62	14	13	23					24	120	17:00	23
+HOT JASMINE LIME	51-02-01-0048	1	16	10	12						24	120	17:00	23
+ICED JASMINE LIME	51-02-02-0049	1	16	10	12	23					24	120	17:00	23
diff --git a/inter/aus/image/page_drink_disable_n2/bn_jasmine_lime_tea.png b/inter/aus/image/page_drink_disable_n2/bn_jasmine_lime_tea.png
new file mode 100644
index 00000000..5f46de34
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_jasmine_lime_tea.png differ
diff --git a/inter/aus/image/page_drink_n/bn_jasmine_lime_tea.png b/inter/aus/image/page_drink_n/bn_jasmine_lime_tea.png
new file mode 100644
index 00000000..1ff06b8b
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_jasmine_lime_tea.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_jasmine_lime_tea.png b/inter/aus/image/page_drink_picture2_n/bn_jasmine_lime_tea.png
new file mode 100644
index 00000000..987cf5d9
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_jasmine_lime_tea.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_jasmine_lime_tea.png b/inter/aus/image/page_drink_press_n/bn_jasmine_lime_tea.png
new file mode 100644
index 00000000..ed358a3c
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_jasmine_lime_tea.png differ
diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml
index e8ba2818..235f1b79 100644
--- a/inter/aus/xml/page_catalog_group_tea.lxml
+++ b/inter/aus/xml/page_catalog_group_tea.lxml
@@ -10722,6 +10722,280 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 51-02-01-0048 51-02-02-0049 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-02-01-0048.Button,51-02-02-0049.Button,$Sum51020100485102020049) </State> 
+	<Button>
+	<State> $Sum51020100485102020049 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_jasmine_lime_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_jasmine_lime_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_jasmine_lime_tea.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_jasmine_lime_tea.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $51-02-01-0048.Price
+		Var PriceD2 = $51-02-02-0049.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "51-02-01-0048"
+		Var PD_CODE2 = "51-02-02-0049"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "LIME JASMINE TEA"
+		Var aliasDesc[0] = "Jasmine Tea, Limenade,\nWater"
+		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] = "Hot LIME JASMINE TEA"
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = "Jasmine Tea, Limenade, Water"
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "ICED LIME JASMINE TEA"
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Jasmine Tea, Limenade, Water"
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		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 = $51-02-01-0048.Button
+		Var PD_STAGE_2 = $51-02-02-0049.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" "51-02-02-0049"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "51-02-01-0048"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>LIME JASMINE TEA</LanguageSlot1>
+		<LanguageSlot2>ชาดำไต้หวันมะนาว</LanguageSlot2>
+		<LanguageSlot3>LIME JASMINE TEA</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> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Jasmine Tea, Limenade,\nWater</LanguageSlot1>
+		<LanguageSlot2>ชาไต้หวัน น้ำ มะนาว</LanguageSlot2>
+		<LanguageSlot3>Jasmine Tea, Limenade,\nWater</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> $51-02-01-0048.Button </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> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-02-01-0048.Button </State>
+	<Value> StringFmt(  $51-02-01-0048.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> $51-02-02-0049.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-02-02-0049.Button </State>
+	<Value> StringFmt( $51-02-02-0049.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> TextPriceMenuBlendX </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 $Sum51020100485102020049 = "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 $Sum51020100485102020049 = "Disable" Then
+				STRCONTAIN "ERR" $51-02-01-0048.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-02-02-0049.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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum51020100485102020049 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; 51-02-01-0038 51-02-02-0038 - 
diff --git a/xml/event/weekday_discount/oreo_discount_11_error.xml b/xml/event/weekday_discount/oreo_discount_11_error.xml
index ef5f35ef..4bc7eec8 100644
--- a/xml/event/weekday_discount/oreo_discount_11_error.xml
+++ b/xml/event/weekday_discount/oreo_discount_11_error.xml
@@ -24,7 +24,7 @@
         Var Timeout = Timeout + 1
 
         If Timeout > 5 Then
-            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            TRY "ROOT/taobin_project/inc/return_condition_cancel.ev"
         EndIf
 
         Refresh
@@ -46,7 +46,7 @@
         <Filename> ButtonImg </Filename>
         <FilenamePress> ButtonPressedImg </FilenamePress>
         <EventOnClick>
-            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+            TRY "ROOT/taobin_project/inc/return_condition_cancel.ev"
         </EventOnClick>
     </Button>