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

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>

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

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

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
+