diff --git a/.inter/whatthecup/sgp/image/user_take_cup_en/bn_door_open.png b/.inter/whatthecup/sgp/image/user_take_cup_en/bn_door_open.png
deleted file mode 100644
index 74d99a3a..00000000
Binary files a/.inter/whatthecup/sgp/image/user_take_cup_en/bn_door_open.png and /dev/null differ
diff --git a/.inter/whatthecup/sgp/image/user_take_cup_en/bp_door_open.png b/.inter/whatthecup/sgp/image/user_take_cup_en/bp_door_open.png
deleted file mode 100644
index fc76f11e..00000000
Binary files a/.inter/whatthecup/sgp/image/user_take_cup_en/bp_door_open.png and /dev/null differ
diff --git a/image/event/halloween/thank_you.png b/image/event/halloween/thank_you.png
deleted file mode 100644
index b89009bc..00000000
Binary files a/image/event/halloween/thank_you.png and /dev/null differ
diff --git a/image/event/halloween/thank_you_en.png b/image/event/halloween/thank_you_en.png
new file mode 100644
index 00000000..b6040eee
Binary files /dev/null and b/image/event/halloween/thank_you_en.png differ
diff --git a/image/event/halloween/thank_you_th.png b/image/event/halloween/thank_you_th.png
new file mode 100644
index 00000000..d5c0d563
Binary files /dev/null and b/image/event/halloween/thank_you_th.png differ
diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv
index 95d67801..eb75a8e5 100644
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@@ -936,3 +936,7 @@ Combination	51-99-05-0024	1	27	28							24	120	17:00	23
 Ume Ume	51-99-05-0025	1	27	28							24	120	17:00	23
 Like Sex\non The Beach	51-99-05-0026	1	27	28							24	120	17:00	23
 Plum Highball	51-99-05-0027	1	27	28							24	120	17:00	23
+
+Hot  VANILLA latte	51-21-81-0060	1	2	3	4	5	63	6	70		24	120	17:00	23
+Iced  VANILLA latte	51-21-82-0060	1	2	3	4	5	63	6	70	23	24	120	17:00	23
+VANILLA latte frappe	51-21-83-0060	1	2	3	4	5	63	6	70	41	24	120	17:00	23
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png
new file mode 100644
index 00000000..31191847
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png
new file mode 100644
index 00000000..267fdb03
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png
new file mode 100644
index 00000000..8b537ae3
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png
new file mode 100644
index 00000000..9c38ccac
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png
new file mode 100644
index 00000000..56fc0a7a
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png
new file mode 100644
index 00000000..498dcf78
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png differ
diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml
index 79dd72e8..bd5932ee 100644
--- a/inter/aus/xml/page_catalog_group_other.lxml
+++ b/inter/aus/xml/page_catalog_group_other.lxml
@@ -1953,7 +1953,7 @@
 		Var PD_CODE2 = "51-05-02-0132"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "TURTLE ENERGY\nTOKYO BANANA SODA"
+		Var aliasName[0] = "TURTLE ENERGY\nTOKYO SODA"
 		Var aliasDesc[0] = "Energy drink, Tokyo Banana Syrup, Soda, Ice"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -1977,7 +1977,7 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "TURTLE ENERGY TOKYO BANANA SODA"
+		Var NameLang[1][0] = "TURTLE ENERGY TOKYO SODA"
 		Var NameLang[1][1] = "-"
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
@@ -2048,9 +2048,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>TURTLE ENERGY\nTOKYO BANANA SODA</LanguageSlot1>
+		<LanguageSlot1>TURTLE ENERGY\nTOKYO SODA</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>TURTLE ENERGY\nTOKYO BANANA SODA</LanguageSlot3>
+		<LanguageSlot3>TURTLE ENERGY\nTOKYO SODA</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml
index b855ae4c..5c704b13 100644
--- a/inter/aus/xml/page_catalog_group_tea.lxml
+++ b/inter/aus/xml/page_catalog_group_tea.lxml
@@ -12357,13 +12357,13 @@
 	<State> Flag( 51-02-02-0076.Button,$Sum5102020076) </State> 
 	<Button>
 	<State> $Sum5102020076 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Lychee_jasmine_tea.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Lychee_jasmine_tea.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Lychee_jasmine_tea.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_Melon_jasmine_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_Melon_jasmine_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_Melon_jasmine_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_iced_Lychee_jasmine_tea.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_Melon_jasmine_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $51-02-02-0076.Price
diff --git a/inter/aus/xml/page_catalog_group_whey.lxml b/inter/aus/xml/page_catalog_group_whey.lxml
index e1fbbe5c..4d1084a6 100644
--- a/inter/aus/xml/page_catalog_group_whey.lxml
+++ b/inter/aus/xml/page_catalog_group_whey.lxml
@@ -4659,7 +4659,7 @@
 		Var PD_CODE2 = "51-04-02-0060"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "VANILLA PROTEIN SHAKE"
+		Var aliasName[0] = "VANILLA PROTEIN\nSHAKE"
 		Var aliasDesc[0] = "Whey protein, Milk,\nVanilla Syrup"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -4689,7 +4689,7 @@
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein, Espresso\n& Milk, Caramel Syrup  "
+		Var DescLang[1][0] = "Whey protein, Milk,\nVanilla Syrup"
 		Var DescLang[1][1] = "-"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
@@ -4754,9 +4754,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>VANILLA PROTEIN SHAKE</LanguageSlot1>
+		<LanguageSlot1>VANILLA PROTEIN\nSHAKE</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>VANILLA PROTEIN SHAKE</LanguageSlot3>
+		<LanguageSlot3>VANILLA PROTEIN\nSHAKE</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -4959,7 +4959,7 @@
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein, Milk,\nVanilla Syrup"
+		Var DescLang[1][0] = "Whey protein, Espresso\n& Milk, Caramel Syrup  "
 		Var DescLang[1][1] = "-"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
diff --git a/xml/event/halloween/thank_you.xml b/xml/event/halloween/thank_you.xml
index e8817086..018ae45e 100644
--- a/xml/event/halloween/thank_you.xml
+++ b/xml/event/halloween/thank_you.xml
@@ -9,6 +9,12 @@
 
         Var Timeout = 0
 
+        Var ThankyouImg = "ROOT/taobin_project/image/event/halloween/thank_you_th.png"
+
+        If show_eng = "true" Then
+            Var ThankyouImg = "ROOT/taobin_project/image/event/halloween/thank_you_en.png"
+        EndIf
+
     </EventOpen>
 
     <Timeout> 1000 </Timeout>
@@ -35,7 +41,7 @@
     <Image>
         <X> 0 </X>
         <Y> 380 </Y>
-        <Filename> "ROOT/taobin_project/image/event/halloween/thank_you.png" </Filename>
+        <Filename> ThankyouImg </Filename>
     </Image>
 
 </Popup>
\ No newline at end of file
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index bb32b55c..9f34937d 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -27,6 +27,7 @@
 	;Var PriceDrink = 2
 
 	Var DiscountDrink = 0
+	Var DiscountCampaignCode = ""
 	Var SelectSlot = "1"
 
 	SAVELOG BoxID
@@ -332,6 +333,7 @@
 
 		Var param1 = Seeker.ORDER_ID
 		Var param2 = Seeker.NameDrinkEN
+		Var param3 = DiscountCampaignCode
 
 		STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
 		If SizeFromSheet = "true" Then
@@ -343,7 +345,7 @@
     		Var WaitPOSStatus = 1
     		Var TimeWaitPOSStatus = 0
     		Var POS_SELL_STATUS = "-"
-    		GetPOSStatus param1 param2
+    		GetPOSStatus param1 param2 param3
 		EndIf
 
 	EndIf
diff --git a/xml/process/discount_from_promotion.ev b/xml/process/discount_from_promotion.ev
index 6b777fab..96cbe6ca 100644
--- a/xml/process/discount_from_promotion.ev
+++ b/xml/process/discount_from_promotion.ev
@@ -24,6 +24,7 @@ If BoxID = 105005 Then
         Var PriceDiff = PriceDrink - 25
         Var DiscountDrink = PriceDiff
         Var Seeker.CampaignPPrice = 25
+        Var DiscountCampaignCode = "SVB0002"
 
         Var PriceDrink = PriceDrink - PriceDiff
     EndIf
diff --git a/xml/profile/run.ev b/xml/profile/run.ev
index c45e8641..8bef2eb3 100644
--- a/xml/profile/run.ev
+++ b/xml/profile/run.ev
@@ -35,6 +35,7 @@
 	STRCONTAIN "AllPriceUp05" XMLProfile AllPriceUp05
 	STRCONTAIN "AllPriceUp10" XMLProfile AllPriceUp10
 
+	Var SpiralPriceOrigin = "true"
 	STRCONTAIN "SpiralPriceUp15" XMLProfile SpiralPriceUp15
 	STRCONTAIN "SpiralPriceUp45" XMLProfile SpiralPriceUp45
 	STRCONTAIN "SpiralPriceRetail" XMLProfile SpiralPriceRetail
@@ -111,20 +112,25 @@
 
 	;spiral price
 	If SpiralPriceUp15 = "true" Then
-		
+		Var SpiralPriceOrigin = "false"
 		__CMD "invoke-all-up-priceSpiral-15" "-" "-" "-"
 	EndIf
 
 	If SpiralPriceUp45 = "true" Then
-		
+		Var SpiralPriceOrigin = "false"
 		__CMD "invoke-all-up-priceSpiral-45" "-" "-" "-"
 	EndIf
 
 	If SpiralPriceRetail = "true" Then
-		
+		Var SpiralPriceOrigin = "false"
 		__CMD "invoke-all-up-priceSpiral-Retail" "-" "-" "-"
 	EndIf
 
+	If SpiralPriceOrigin = "true" Then
+		
+		__CMD "invoke-all-up-priceSpiral-Origin" "-" "-" "-"
+	EndIf
+