diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 28925622..1ad72423 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -13,7 +13,7 @@
 	Var Seeker.FreeVendingCampaign = 0
 
 	Var Timeout = 0
-   
+
     Var GetPayInfoFlag = 0
     Var Seeker.CodeChannel = 0
 	Var Seeker.CollectPointMain = 0
@@ -22,17 +22,17 @@
 	;Var VendingQRCode = "ERROR"
 	;VendingQR ON
 	;Var QRCODE99 = ""
-	
+
 	;CoinVending OFF
 	VendingQR OFF
-	
+
 	Var ShowTextNumber = "Enable"
 	Var ShowErrorText = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
 	Var ErrorCause = ""
 
-	
-    If show_eng = "true" Then 
+
+    If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
@@ -40,7 +40,7 @@
 
 	If web_readyOK = "true" Then
 		Var web_readyOK = "false"
-		
+
 		If web_code = "" Then
 		Else
 			Var ShowTextNumber = "Invisible"
@@ -70,11 +70,11 @@
 			Var ECommerce = ECommerce + TOPPING_PRICE
 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + DiscountDrink
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + SessionID2
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + SelectDrink
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + "C00"
 	        Var ECommerce =	ECommerce + "/"
@@ -91,7 +91,7 @@
 
 			GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			Var Timeout = 0
-			
+
 	        Var TelephoneNumber = Seeker.CodeNumber
 	        Var Seeker.CodeChannel = 1
 		EndIf
@@ -101,49 +101,49 @@
 	Var Mode# = 0
 	Var Str# = ""
 	Var TelephoneNumber# = ""
-	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
-	;Open "ROOT/xml/page_board.xml" 
+<EventTimeout>
+	;Open "ROOT/xml/page_board.xml"
+
 
-	
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
 		;VendingQR OFF
-        ;Open menu_back_to_main 
+        ;Open menu_back_to_main
 
 		Var PayState1 = "PressForever"
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		Var Seeker.CodeChannel = 0
-		If CART_COUNT >= 1 Then 
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		If CART_COUNT >= 1 Then
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 		EndIf
 
 		Refresh
 	EndIf
 
 	TimerReset
-</EventTimeout> 
+</EventTimeout>
 
 <EventIDCard>
-	
+
 
 	If IDCardStatus = "OK" Then
 		If IDCardReady = "OK" Then
 			If IDCardData = "START" Then
 			CoinVending OFF
-			Open "ROOT/taobin_project/xml/page_show_consent2.xml" 
+			Open "ROOT/taobin_project/xml/page_show_consent2.xml"
 			EndIf
 		EndIf
 	EndIf
 
 
-	
+
 
 
 
@@ -159,7 +159,7 @@
 
 
 <EventActionOk>
-	
+
 
     If Seeker.CodeChannel = 1 Then
 
@@ -174,24 +174,24 @@
 		SPLIT  ECommerce "/"  9  ShouldCollectPoint
 
 		If Seeker.VendingCode = "" Then
-			Var Seeker.VendingCode = "C00" 
+			Var Seeker.VendingCode = "C00"
 		EndIf
 
 		If Seeker.VendingCode = "KBA:2" Then
-			Var Seeker.VendingCode = "C00" 
+			Var Seeker.VendingCode = "C00"
 		EndIf
 
 		If Seeker.VendingCode = "AIR:2" Then
-			Var Seeker.VendingCode = "C00" 
+			Var Seeker.VendingCode = "C00"
 		EndIf
 
 		If Seeker.VendingCode = "TWN:2" Then
-			Var Seeker.VendingCode = "C00" 
+			Var Seeker.VendingCode = "C00"
 		EndIf
 
 		SAVELOG Seeker.VendingCode
 		SAVELOG  Seeker.VendingCampaignRI3
-		
+
 		SAVELOG ShouldCollectPoint
 		INT ShouldCollectPoint
 
@@ -208,7 +208,7 @@
 
 				If IntVendingCampaign1 > 0 Then
 					Var VendingCreditRemain = VendingCampaign1
-				EndIf 
+				EndIf
 			EndIf
 
 
@@ -216,7 +216,7 @@
 
 			Var Seeker.IntVendingCampaign =  Seeker.VendingCampaignRI3
 			INT Seeker.IntVendingCampaign
-		
+
 			Var VendingREFID = SessionID
 
 
@@ -227,11 +227,11 @@
 			If  Seeker.IntVendingCampaign > 0 Then
 				Var QRChannel = 0
 
-				If Seeker.IntVendingCampaign >= PayAmount Then 
+				If Seeker.IntVendingCampaign >= PayAmount Then
 
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
-					
+
 						If PayMentCodeShouldCollectPromotionPoint = 1 Then
 							Var Seeker.CollectPointPromotion = 1
 						EndIf
@@ -240,24 +240,24 @@
 					TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
 
 
-					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+					;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 					Var Seeker.VendingCampaign = PayAmount
 					Var Seeker.FreeVendingCampaign = 1
 					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					If CART_COUNT >= 1 Then 
+					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+					If CART_COUNT >= 1 Then
 
 						Cart "PreparID" 1
 						Var CART_INDEX = 1
 						Var PayReference = ""
 						GenHashWithTimeStamp PayReference
 						Cart "MakeID" CART_INDEX
-						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+						Open "ROOT/taobin_project/xml/page_thankyou.xml"
 					Else
 						Var CART_INDEX = 0
 
 						If Seeker = "curr" Then
-							If New_Payment = 1 Then 
+							If New_Payment = 1 Then
 								__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 							EndIf
 							MakeDrinkV1  SelectDrink SelectSugarID
@@ -271,7 +271,7 @@
 							Var DrinkPaid = SelectDrink
 							Var PaidPaymentFromNextStage = 1
 						EndIf
-						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+						Open "ROOT/taobin_project/xml/page_thankyou.xml"
 					EndIf
 				Else
 					If ShouldCollectPoint = 1 Then
@@ -284,8 +284,8 @@
 				EndIf
 
 
-				
-				
+
+
 
 				;Var SessionID2 = SelectSlot + ":"
 				;Var SessionID2 = SessionID2 + Seeker.ExtendData
@@ -297,11 +297,11 @@
 				;Var ECommerce = ""
 				;Var ECommerce = ECommerce + PriceDrink
 				;Var ECommerce =	ECommerce + "/"
-				;Var ECommerce =	ECommerce + DiscountDrink 
+				;Var ECommerce =	ECommerce + DiscountDrink
 				;Var ECommerce =	ECommerce + "/"
-				;Var ECommerce =	ECommerce + SessionID2 
+				;Var ECommerce =	ECommerce + SessionID2
 				;Var ECommerce =	ECommerce + "/"
-				;Var ECommerce =	ECommerce + SelectDrink 
+				;Var ECommerce =	ECommerce + SelectDrink
 				;Var ECommerce =	ECommerce + "/"
 				;Var ECommerce =	ECommerce + "KBA:2/"
 				;Var ECommerce =	ECommerce + Seeker.VendingCode
@@ -324,11 +324,11 @@
 				;Var Seeker.CodeChannel = 2
 
 				Var Seeker.CodeChannel = 1
-		
-				If CART_COUNT >= 1 Then 
-					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+
+				If CART_COUNT >= 1 Then
+					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
 				Else
-					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+					Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 				EndIf
 
 
@@ -343,7 +343,7 @@
 			EndIf
 		EndIf
 
-	Else 
+	Else
 
 		;SAVELOG "Seeker.CodeChannel 2 > ActOK."
 		;
@@ -354,12 +354,12 @@
 		;Var QRCODETMP = QRCODE99
 		;Var Seeker.CodeChannel = 1
 		;
-		;If CART_COUNT >= 1 Then 
-		;	Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		;If CART_COUNT >= 1 Then
+		;	Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
 		;Else
-		;	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		;	Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 		;EndIf
-		
+
 
 	EndIf
 
@@ -368,7 +368,7 @@
 <EventActionError>
   If Seeker.CodeChannel = 1 Then
 		Var TelephoneNumber = ""
-		
+
 		Var ShowErrorText = "Enable"
 
 		SAVELOG ShowErrorText
@@ -386,7 +386,7 @@
 		If ErrorCause = "failed_fromoper_0006" Then
 			Var text_show_error = DirImage + "/text_show_error4.png"
 		EndIf
-		
+
 		If ErrorCause = "failed_fromoper_0007" Then
 			Var text_show_error = DirImage + "/text_show_error7.png"
 		EndIf
@@ -405,10 +405,10 @@
 		Var Seeker.CodeChannel = 1
 		Var QRCODE99 = ""
 		Var QRCODETMP = ""
-		If CART_COUNT >= 1 Then 
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		If CART_COUNT >= 1 Then
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
 	Else
-			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 	EndIf
 	EndIf
 
@@ -438,7 +438,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "1"
 	Var ShowTextNumber = "Invisible"
@@ -449,7 +449,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -463,7 +463,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "2"
 	Var ShowTextNumber = "Invisible"
@@ -474,7 +474,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -488,7 +488,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "3"
 	Var ShowTextNumber = "Invisible"
@@ -499,7 +499,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -513,7 +513,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_A.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "A"
 	Var ShowTextNumber = "Invisible"
@@ -524,7 +524,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -538,7 +538,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "4"
 	Var ShowTextNumber = "Invisible"
@@ -549,7 +549,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -563,7 +563,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "5"
 	Var ShowTextNumber = "Invisible"
@@ -574,7 +574,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -588,7 +588,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "6"
 	Var ShowTextNumber = "Invisible"
@@ -599,7 +599,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -613,7 +613,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_B.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "B"
 	Var ShowTextNumber = "Invisible"
@@ -624,7 +624,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -638,7 +638,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "7"
 	Var ShowTextNumber = "Invisible"
@@ -649,7 +649,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -663,7 +663,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "8"
 	Var ShowTextNumber = "Invisible"
@@ -674,7 +674,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -688,7 +688,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "9"
 	Var ShowTextNumber = "Invisible"
@@ -699,7 +699,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -713,7 +713,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_C.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "C"
 	Var ShowTextNumber = "Invisible"
@@ -724,7 +724,7 @@
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
@@ -738,7 +738,7 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "0"
 	Trim TelephoneNumber 8
@@ -746,7 +746,7 @@
 	Var TelephoneNumber# = Str# + TelephoneNumber
 
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 8 Then 
+	If TelNumLen >= 8 Then
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowTextNumber = "Invisible"
@@ -764,19 +764,19 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_sh.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	;Var TelephoneNumber = TelephoneNumber + "0"
 	Trim TelephoneNumber 8
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen = 0 Then 
+	If TelNumLen = 0 Then
 		Var ShowTextNumber = "Invisible"
 		Var Mode# = 1
 		Var Str# = "#"
 
 		Var TelephoneNumber# = Str# + TelephoneNumber
 	EndIf
-	
+
 	TimerReset
 	Refresh
 	Var ShowErrorText = "Invisible"
@@ -791,21 +791,21 @@
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var Timeout = 0
 	Var Clear# = 0
 
 	StrLen TelephoneNumber TelNumLen
-	If TelNumLen = 0 Then 
+	If TelNumLen = 0 Then
 		Var Clear# = 1
 	EndIf
 
 	Trim TelephoneNumber  -1
 	Var Tel_Confirm_State = "Invisible"
-	
+
 	StrLen TelephoneNumber TelNumLen
-	
-	If TelNumLen = 0 Then 
+
+	If TelNumLen = 0 Then
 		If Clear# = 1 Then
 			Var ShowTextNumber = "Enable"
 			Var Mode# = 0
@@ -818,7 +818,7 @@
 	;Var ShowErrorText = "Invisible"
 	TimerReset
 	Refresh
-	
+
 </EventClick>
 </Button>
 
@@ -830,15 +830,15 @@
 <FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	Var PayState1 = "PressForever"
 	Var PayState2 = "Enable"
 	Var QRChannel = 0
 	Var Seeker.CodeChannel = 0
-	If CART_COUNT >= 1 Then 
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+	If CART_COUNT >= 1 Then
+			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
 	Else
-			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 	EndIf
 </EventClick>
 </Button>
@@ -854,9 +854,9 @@
 <FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
+
 
-		
 
 	If UnitTestType = "2" Then
 		If TelephoneNumber = "00000001" Then
@@ -870,14 +870,14 @@
 			Var ShowErrorText = "Enable"
 		EndIf
 
-		
+
 
 	    If GetPayInfoFlag = 0 Then
 			Var GetPayInfoFlag = 1
 
 			VendingQR OFF
 
-			
+
 			Var Seeker.CodeNumber = TelephoneNumber
 			Var RemainAmount = 0
 			;PrepareDrink SelectDrink SelectSugarID
@@ -896,11 +896,24 @@
 			Var ECommerce = ECommerce + TOPPING_PRICE
 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + DiscountDrink
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + SessionID2
+
+			If Seeker.UseFreeSugarZeroCalTopping = 1 Then
+			    Var ECommerce = ECommerce + ":1"
+			Else
+                Var ECommerce = ECommerce + ":0"
+			EndIf
+
+			If Seeker.UseFreeCollagenTopping = 1 Then
+			    Var ECommerce = ECommerce + "1"
+			Else
+                Var ECommerce = ECommerce + "0"
+			EndIf
+
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + SelectDrink
 			Var ECommerce =	ECommerce + "/"
 
 
@@ -910,7 +923,7 @@
 				Var ECommerce =	ECommerce + "C00"
 			EndIf
 
-			
+
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
 
@@ -929,17 +942,17 @@
 
 			GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			Var Timeout = 0
-			
+
 	        Var TelephoneNumber = Seeker.CodeNumber
 	        Var Seeker.CodeChannel = 1
-	       
+
 		EndIf
 
 	EndIf
-	
+
 	SAVELOG ShowTextNumber
     Refresh
-	
+
 </EventClick>
 </Button>
 
@@ -971,7 +984,7 @@
 </Text>
 
 
-	
+
 
 <Image>
 <X> 188 </X>
@@ -1004,9 +1017,9 @@
 </Video>
 
 
-			
-<EventSecurity> 
-	Open "/media/bt/xml/security_alarm.xml" 
+
+<EventSecurity>
+	Open "/media/bt/xml/security_alarm.xml"
 </EventSecurity>
 
 
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 9e34bfdd..d5793b4a 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -7739,10 +7739,10 @@
     If CollagenState = "Press" Then
         Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice
         Var topping3 = toppingID3index2
-        Var DisableUsingCode = "true"
+        Var Seeker.UseFreeCollagenTopping = 1
     Else
         Var topping3 = toppingID3index1
-        Var DisableUsingCode = "false"
+        Var Seeker.UseFreeCollagenTopping = 0
     EndIf
 
 
@@ -7750,6 +7750,9 @@
 		If SugarZeroCalOption = "Enable" Then
 			If SugarZeroCalCheck = "PressForever" Then
 				Var TOPPING_PRICE = TOPPING_PRICE + SugarZeroCalPrice
+			    Var Seeker.UseFreeSugarZeroCalTopping = 1
+			Else
+                Var Seeker.UseFreeSugarZeroCalTopping = 0
 			EndIf
 		EndIf
 	EndIf