Merge branch 'masterpiece' into feat/sgp-new-payment

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

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

inter/whatthecup/sgp/xml/process/addpoint.ev

@@ -0,0 +1,89 @@
+
+
+	Var AddData = 1
+
+	DEBUGVAR Seeker.TNumberTaobinMember
+	DEBUGVAR Seeker.PointTaobinStr
+
+	If Seeker.TNumberTaobinCredit = "" Then
+		Var TelephoneNumber = "0899999999"
+		Var PayO2 = ""
+
+		If Seeker.TNumberTaobinMember = "" Then
+			Var AddData = 0
+		Else
+			Var TelephoneNumber = Seeker.TNumberTaobinMember
+		EndIf
+
+	Else
+		Var TelephoneNumber = Seeker.TNumberTaobinCredit
+		Var PayO2 = Seeker.CoffeePinNumber
+	EndIf
+
+
+	If Seeker.VendingCode = "MKFOO" Then
+		Var AddData = 0
+	EndIf
+
+	DEBUGVAR Seeker.CodeChannel
+	DEBUGVAR Seeker.CollectPointMain
+
+	Var PointCrm = ""
+	If Seeker.FromConsent = 1 Then
+		Var PointCrm = "pdpa1"
+	EndIf
+
+	If Seeker.PayWithQR = 1 Then
+		Var GetScore = Seeker.VendingTSID
+	Else
+		Var GetScore = ""
+	EndIf
+    
+    DEBUGVAR Seeker.RedeemSwensenCoupon
+    DEBUGVAR Seeker.RedeemSwensenCouponDrinkPrice
+	If Seeker.RedeemSwensenCoupon = 1 Then
+        Var Cid = 56
+        Var var1 = ""
+        Var var2 = ""
+        Var var3 = ""
+        If Seeker.RedeemSwensenCouponDrinkPrice >= 20 Then
+            Var var1 = "153"
+        EndIf
+        If Seeker.RedeemSwensenCouponDrinkPrice >= 30 Then
+            Var var1 = "154"
+        EndIf
+        If Seeker.RedeemSwensenCouponDrinkPrice >= 40 Then
+            Var var1 = "155"
+        EndIf
+        If Seeker.RedeemSwensenCouponDrinkPrice >= 50 Then
+            Var var1 = "156"
+        EndIf
+
+        DEBUGVAR var1
+
+        If var1 = "" Then
+        
+        Else
+            AddData Cid Seeker.TNumberTaobinMember var1 var2 var3
+        EndIf
+	EndIf
+
+	If AddData = 1 Then
+		Var Cid = 26
+		DEBUGVAR "Befor Brewing3"
+		DEBUGVAR Seeker
+		DEBUGVAR Seeker.UseGet15Discount
+		If NewCollectPoint = 1 Then
+			If Seeker.UseGet15Discount = 1 Then
+				Var Cid = 39
+			Else
+				Var Cid = 40
+				Var PreviousSeeker.UseGetDrink5Bath = 0
+			EndIf
+		EndIf
+
+		AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+	EndIf
+
+
+

inter/whatthecup/sgp/xml/process/discount_from_promotion.ev

@@ -0,0 +1,111 @@
+
+If From12Day12MenuPro = 1 Then
+    Var PriceDiff = PriceDrink - PromotionPriceDrink
+    Var Seeker.VendingCode = "PMD" + PriceDiff
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = PriceDiff
+    Var Seeker.VendingCampaignRI3 = PriceDiff
+EndIf
+
+If FromOreoDiscount11Pro = 1 Then
+    Var Seeker.VendingCode = "PMD11"
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = 11
+    Var Seeker.VendingCampaignRI3 = 11
+EndIf
+
+If FromMomCocoaPro = 1 Then
+    If DiscountMomCocoaPro > 0 Then
+        Var DiscountDrink = DiscountMomCocoaPro
+        Var Seeker.CampaignPPrice = PromotionPriceDrink
+    EndIf
+EndIf
+
+If FromCocoa77Pro = 1 Then
+    Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE
+    Var PriceDiff = OriginalPriceWithTopping - PromotionPriceDrink
+    Var DiscountDrink = PriceDiff
+    Var Seeker.CampaignPPrice = PromotionPriceDrink
+EndIf
+
+If FromPassionMintPro = 1 Then
+    Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE
+    Var PriceDiff = OriginalPriceWithTopping - PromotionPriceDrink
+    Var DiscountDrink = PriceDiff
+    Var Seeker.CampaignPPrice = PromotionPriceDrink
+EndIf
+
+If BoxID = 105005 Then
+    If Seeker.selected_a_drink = "12-05-02-0045" Then
+        Var PriceDiff = PriceDrink - 25
+        Var DiscountDrink = PriceDiff
+        Var Seeker.CampaignPPrice = 25
+        Var DiscountCampaignCode = "SVB0002"
+
+        Var PriceDrink = PriceDrink - PriceDiff
+    EndIf
+EndIf
+
+If ChildrenFree = 1 Then
+
+    Var RemainAmountStr = "Free###size=150"
+
+    Var Seeker.VendingCode = "MKFOO"
+    Var Seeker.IntVendingCampaign = PriceDrink
+    Var Seeker.FreeVendingCampaign = 1
+    Var Seeker.CodeChannel = 1
+    Var Seeker.CodeNumber = IDNum
+
+    DEBUGVAR IDNum
+
+    Var Seeker.TNumberTaobinMember = TelNumPromotion
+
+    ;If Seeker = "curr" Then
+    ;
+    ;	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"
+    Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+
+
+
+EndIf
+
+; Oreo free
+If PromotionIDOreoBuyTwoSaveMore = 1 Then
+    Var PromotionIDOreoBuyTwoSaveMore = 0
+    Var PromotionIDCurrentOrder = 2
+EndIf
+
+If PromotionIDCurrentOrder = 2 Then
+    SAVELOG "Promotion: Oreo Get 1 Free 1"
+EndIf
+
+If FromCoffeeDrink1BathPro = 1 Then
+    SAVELOG "From Coffee Drink 1 Bath pro"
+    Var PromotionIDCurrentOrder = 3
+EndIf
+
+
+
+If InternationalEnable = 1 Then
+    If CountryName = "Thailand" Then
+        ;do not thing
+    Else
+        Var discount_promo_file = CountryRootPath + "/xml/process/discount_from_promotion.ev"
+        TRY discount_promo_file
+    EndIf
+EndIf

inter/whatthecup/sgp/xml/process/payext_setup.ev

@@ -0,0 +1,26 @@
+
+If Seeker.PayWithQR = 0 Then
+    If Seeker.TNumberTaobinCredit = "" Then
+        Var TelephoneNumber = "0899999999"
+        Var PayO2 = ""
+
+        If Seeker.TNumberTaobinMember = "" Then
+
+        Else
+            Var TelephoneNumber = Seeker.TNumberTaobinMember
+        EndIf
+
+    Else
+        Var TelephoneNumber = Seeker.TNumberTaobinCredit
+        Var PayO2 = Seeker.CoffeePinNumber
+    EndIf
+EndIf
+
+DEBUGVAR TelephoneNumber
+Var TelephoneNumberExt = TelephoneNumber
+If TelephoneNumberExt = "" Then
+    Var TelephoneNumberExt = "0899999999"
+EndIf
+__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
+Var payOrderChannel = "/XML|" +  Seeker.OrderChanel
+__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""

inter/whatthecup/sgp/xml/process/payment.ev

@@ -0,0 +1,128 @@
+DEBUGVAR "MIGGAZE0-SGP"
+If Seeker.PayWithQR = 1 Then
+
+		Var ServiceAmount2 = Seeker.ServiceAmount2
+		Var CreditReference = ""
+		Var TxReference = ""
+		Var VendingDiscount = 0
+		Var VendingCampaign = 0
+		Var SelectDrink = Seeker.selected_a_drink
+		Var SuggestID  = ""
+
+		If ChangeFlag2 = 1 Then
+			Var TelephoneNumber = "0899999999"
+			Var PayO2 = ""
+			Var ServiceType = "credit"
+			Var SessionID2 = SelectDrink
+			Var ServiceCredit = "coffee"
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+		Else
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+				Var ServiceType = "credit"
+				Var SessionID2 = SelectDrink
+				Var ServiceCredit = "coffee"
+				Var PayDetail = ""
+				Var PayDetail2 = ""
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			EndIf
+		EndIf
+
+		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+		If ConnectWithPOSMachine = 1 Then
+    		Var SelectDrink = Seeker.selected_a_drink
+    		Var ExtendData = Seeker.ExtendData
+    		Var ServiceAmount2 = Seeker.ServiceAmount2
+    		Var SessionID2 = SelectSlot + ":"
+    		Var SessionID2 = SessionID2 + ExtendData
+
+    		Var CreditReference = Seeker.CreditReferenceTmp
+    		Var VendingDiscount = Seeker.VendingDiscount
+    		Var VendingCampaign = Seeker.VendingCampaign
+    		Var TxReference = Seeker.TxRef1
+    		Var VendingOrderID = Seeker.ORDER_ID
+    		Var PayType = "newpay"
+
+    		Var ServiceType = "coffee-payment"
+    		Var ServiceCredit = SelectDrink
+    		Var SuggestID  = ""
+
+    		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
+
+    		If GetFreeFromError = 1 Then
+    			Var Seeker.CodeChannel = 1
+    			Var Seeker.VendingCode = "FAU"
+    			Var Seeker.CodeNumber = "0000000000"
+    			Var VendingCampaign = ServiceAmount2
+    		EndIf
+
+    		Var PayDetail2 = Seeker.PayDetail2
+    		POSPay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		EndIf
+
+
+	Else
+
+        ; not-open-yet
+		;TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+
+		Var SelectDrink = Seeker.selected_a_drink
+		Var ExtendData = Seeker.ExtendData
+		Var ServiceAmount2 = Seeker.ServiceAmount2
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + ExtendData
+
+		Var CreditReference = Seeker.CreditReferenceTmp
+		Var VendingDiscount = Seeker.VendingDiscount
+		Var VendingCampaign = Seeker.VendingCampaign
+		Var TxReference = Seeker.TxRef1
+		Var VendingOrderID = Seeker.ORDER_ID
+		Var PayType = "newpay"
+
+		Var ServiceType = "coffee-payment"
+		Var ServiceCredit = SelectDrink
+		Var SuggestID  = ""
+
+		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
+
+		If GetFreeFromError = 1 Then
+			Var Seeker.CodeChannel = 1
+			Var Seeker.VendingCode = "FAU"
+			Var Seeker.CodeNumber = "0000000000"
+			Var VendingCampaign = ServiceAmount2
+		EndIf
+
+		If Seeker.CodeChannel = 1 Then
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + ""
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + Seeker.VendingCode
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + SelectDrink
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + BoxID
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + "S"
+			Var SessionID2 = SessionID2 + "/"
+			Var SessionID2 = SessionID2 + Seeker.CodeNumber
+			Var SessionID2 = SessionID2 + "/"
+
+
+			Var PayDetail2 = Seeker.PayDetail2
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		Else
+
+
+			Var PayDetail2 = Seeker.PayDetail2
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+		EndIf
+	EndIf

xml/page_board.xml

@@ -1052,6 +1052,8 @@
 
 		;Var EnablePepsiFullscreen = 1
 
+		Var New_PaymentInter = 0
+
 	EndIf
 
 	;inter-page-board

xml/page_get_yourchange.xml

@@ -173,6 +173,12 @@
 						Open "ROOT/taobin_project/xml/page_brewing3.xml"
 					EndIf
 				Else
+
+				    If New_PaymentInter = 1 Then
+						; TODO: change script
+						TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+					EndIf
+
 					Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
 					Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
 

xml/page_lid_straw.xml

@@ -273,6 +273,16 @@
 
 					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				Else
+
+				    If New_PaymentInter = 1 Then
+						If UsePepsiTheme = 1 Then
+
+							If CountryName = "Singapore" Then
+							    TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
+							EndIf
+						EndIf
+					EndIf
+
 					Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
 					Open Brew3Inter
 				EndIf
@@ -287,6 +297,11 @@
 		Else
 			If UsePepsiTheme = 1 Then
 				If CountryName = "Singapore" Then
+
+				    If New_PaymentInter = 1 Then
+						TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
+					EndIf
+
 					Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
 				EndIf
 				If CountryName = "UnitedArabEmirates Dubai" Then

xml/page_payment.xml

@@ -375,6 +375,12 @@
 			__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
 		EndIf
 
+		If New_PaymentInter = 1 Then
+			Var Seeker.ORDER_ID = ""
+			GenHashWithTimeStamp Seeker.ORDER_ID
+			__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+		EndIf
+
 		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 
 
@@ -425,6 +431,32 @@
 
 	EndIf
 
+	If New_PaymentInter = 1 Then
+		Var Seeker.ORDER_ID = ""
+		GenHashWithTimeStamp Seeker.ORDER_ID
+
+		DEBUGVAR Seeker.NameDrinkTH
+		DEBUGVAR Seeker.NameDrinkEN
+
+		Var param1 = Seeker.ORDER_ID
+		Var param2 = Seeker.NameDrinkEN
+		Var param3 = DiscountCampaignCode
+
+		STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.NameDrinkEN "###" 1 PureName
+			Var param2 = PureName
+		EndIf
+
+		If ConnectWithPOSMachine = 1 Then
+    		Var WaitPOSStatus = 1
+    		Var TimeWaitPOSStatus = 0
+    		Var POS_SELL_STATUS = "-"
+    		GetPOSStatus param1 param2 param3
+		EndIf
+
+	EndIf
+
 
 </EventOpen>
 <Timeout> 900 </Timeout>

xml/vending_info.xml

@@ -293,7 +293,7 @@
 
 	Var GPRSStr = ""
 	Var GPRSStr = GPRSStr + GPRSStatus
-	Var GPRSStr = GPRSStr + ", "
+	Var GPRSStr = GPRSStr + ", \n"
 	Var GPRSStr = GPRSStr + GPRSState
 
 
@@ -1028,9 +1028,13 @@
 </Image>
 
 <Text>
-<X> info1_text_startX </X>
+<X> eval(
-<Y> info_text_13Y </Y>
+    Var return = info1_text_startX + 10
-<Size> 30 </Size>
+) </X>
+<Y> eval(
+    Var return = info_text_13Y - 10
+) </Y>
+<Size> 24 </Size>
 <Font> fontType1 </Font>
 <Color> 0x000000 </Color>
 <Value> GPRSStr </Value>