merge from masterpiece

inter/sgp/animation01/play_list.tsv

@@ -885,3 +885,9 @@ PEPSI Max BANANA	52-05-02-0077	1	14	56	23	13					24	120	14:00	23
 PEPSI Max YUZU	52-05-02-0076	1	14	53	23	13					24	120	4:00	23
 PEPSI MINT	52-05-02-0068	1	14	59	12	23					24	120	15:00	23
 Almost Dirty	52-21-02-0071	1	2	3	4	5	6	7			24	66	6:06	32
+ICED  SANTA GINGER	12-03-02-0081	1	7	22	23						24	49	10:01	23
+ICED  SANTA GINGER	12-23-02-0081	1	7	22	23						24	49	10:01	23
+CHOCO SNOWFLAKE SMOOTHIE	12-03-03-0088	1	15	7	22	40	41				24	49	10:01	23
+REINDEER PEPPERMINT SMOOTHIE	12-03-03-0089	1	59	7	19	41					24	49	10:01	23
+ICED CHRISTMAS CAFE LATTE	12-01-02-0084	1	6	7	12	22	23				24	49	10:01	23
+ICED CHRISTMAS CAFE LATTE	12-21-02-0084	1	6	7	12	22	23				24	49	10:01	23

inter/sgp/xml/event/tricker.ev

@@ -8,6 +8,7 @@
 
 
 Var SeasonPassMode = 0
+Var New_PaymentInter = 0
 
 If SystemDateMonthInt = 7 Then
     If SystemDateDayInt > 28 Then
@@ -37,3 +38,7 @@ If SeasonPassMode = 1 Then
     Var SeasonPassFile = CountryRootPath + "xml/event/season_pass/season_pass.ev"
     TRY SeasonPassFile
 EndIf
+
+
+
+DEBUGVAR New_PaymentInter

inter/sgp/xml/page_brewing3_blue.lxml

@@ -6,6 +6,12 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
+    If New_PaymentInter = 1 Then
+        Open "ROOT/taobin_project/inter/sgp/xml/page_NewBrewing3_blue.lxml"
+    EndIf
+
+
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 2

inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml

@@ -118,6 +118,12 @@
 				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
 				Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
 
+				If New_PaymentInter = 1 Then
+				    Var Brew3Inter = CountryRootPath + "/xml/page_NewBrewing3_blue.lxml"
+					Var Brew3ConInter = CountryRootPath + "/xml/page_NewBrewing3Conti_blue.xml"
+				EndIf
+
+
 				If Seeker = "next" Then
 					;CoinBack
 				    Open Brew3ConInter
@@ -204,4 +210,4 @@
 <Value> StoreCreditAmountStr </Value>
 </Text>
 
-</Popup>
+</Popup>

inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml

@@ -266,6 +266,10 @@
 		CoinVending OFF
 		If Seeker = "curr" Then
 
+            If New_PaymentInter = 1 Then
+     			__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+      		EndIf
+
 			MakeDrinkV1  SelectDrink SelectSugarID
 			Var TxRef1 = ""
 			CreateTxRef1 TxRef1
@@ -283,6 +287,31 @@
 
 	EndIf
 
+	If Seeker.FreeVendingCampaign = 1 Then
+
+		Var RemainAmountStr = "Free###size=150"
+
+		CoinVending OFF
+		If Seeker = "curr" Then
+
+			If New_PaymentInter = 1 Then
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+			EndIf
+			MakeDrinkV1  SelectDrink SelectSugarID
+			Var TxRef1 = ""
+			CreateTxRef1 TxRef1
+		Else
+			Var TxRef1 = ""
+			CreateTxRef1 TxRef1
+
+			Var DrinkPaid = SelectDrink
+			Var PaidPaymentFromNextStage = 1
+
+		EndIf
+		Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+	EndIf
+
 
 
 	If CoinInOK = 0 Then
@@ -535,6 +564,10 @@
 
 
 			If Seeker = "curr" Then
+			    If New_PaymentInter = 1 Then
+    				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+     			EndIf
+
 				MakeDrinkV1  SelectDrink SelectSugarID
 				;Var TxRef1 = ""
 				;CreateTxRef1 TxRef1
@@ -735,7 +768,10 @@
 		Refresh
 
 		If Seeker = "curr" Then
-				MakeDrinkV1  SelectDrink SelectSugarID
+	        If New_PaymentInter = 1 Then
+				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+ 			EndIf
+			MakeDrinkV1  SelectDrink SelectSugarID
 		EndIf
 		Var Seeker.CreditCard = 1
 		Var Seeker.CreditCardRef = CreditCardRef
@@ -1184,6 +1220,10 @@
 
 			If Seeker = "curr" Then
 
+			    If New_PaymentInter = 1 Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+				EndIf
+
 				MakeDrinkV1  SelectDrink SelectSugarID
 				Var TxRef1 = ""
 				CreateTxRef1 TxRef1