From daf4bc4c68fc2b4b84261c79669db577ef0f53b7 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Thu, 17 Oct 2024 12:10:30 +0700
Subject: [PATCH 1/2] THAI: Fix misspell description

---
 xml/page_catalog_group_pro_halloween.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xml/page_catalog_group_pro_halloween.xml b/xml/page_catalog_group_pro_halloween.xml
index 8c21b705..2a085bc9 100644
--- a/xml/page_catalog_group_pro_halloween.xml
+++ b/xml/page_catalog_group_pro_halloween.xml
@@ -1320,7 +1320,7 @@ and 7Up" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Foul Metta"
 		Var NameDrinkTH = "เมตามหาโสมม"
-		Var DrinkDescriptionTH = "ชามะลิ น้ำเชี่ยมสละ 7up และโซดา"
+		Var DrinkDescriptionTH = "ชามะลิ น้ำเชี่อมสละ 7up และโซดา"
 		Var DrinkDescription = "Jasmine tea, Ume syrup, 7Up  and Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_7UP_Jasmin_Plum_Soda_halloween.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1403,7 +1403,7 @@ and 7Up" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิ น้ำเชี่ยมสละ 7up และโซดา" </Value>
+	<Value> "ชามะลิ น้ำเชี่อมสละ 7up และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

From 41bd9bbefecb32072202c0e638cdd7e83dcfa51c Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Thu, 17 Oct 2024 13:13:07 +0700
Subject: [PATCH 2/2] spiral price origin

---
 xml/profile/run.ev | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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
+