diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index a245bda8..fb7c5c70 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -229,80 +229,8 @@
 		Var AddData = 0
 	EndIf 
 
-	If MyMintEnable = 1 Then
-		If FromMyMintPro = 1 Then
-			Var AddData = 0
-		EndIf
-	EndIf
-
-	If ProBadValentineEnable = 1 Then
-		If FromBadValentinePro = 1 Then
-			Var AddData = 0
-		EndIf
-	EndIf
-
 	DEBUGVAR Seeker.CodeChannel
 	DEBUGVAR Seeker.CollectPointMain
-	DEBUGVAR LipitPro
-	DEBUGVAR FromLipitPro
-	If LipitPro = 1 Then
-		If FromLipitPro = 1 Then
-			If Seeker.CodeChannel = 1 Then
-				If Seeker.CollectPointMain = 0 Then
-					Var AddData = 0
-				EndIf
-			EndIf
-		EndIf
-	EndIf
-
-	DEBUGVAR FromPowerUpPro
-	If FreeEnergyDrink = 1 Then
-		If FromPowerUpPro = 1 Then
-				; AddData
-
-			; +1 in quota in this id card
-			Var Param1 = ""
-			Var Param2 = ""
-			Var Param3 = ""
-
-			If IDNum = "" Then
-
-			Else
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-			EndIf
-
-			; clear id
-			Var IDNum = ""
-			Var FromPowerUpPro = 0
-			Var AddData = 0
-			Var DisableFromPowerup = "true"
-		Else
-			Var DisableFromPowerup = ""
-		EndIf
-	EndIf
-
-	If EnergyDrink1BathPro = 1 Then
-		If FromEnergyDrink1BathPro = 1 Then
-			SAVELOG "Adding Energy drink 1 Bath pro quota"
-			Var Param1 = ""
-			Var Param2 = ""
-			Var Param3 = ""
-
-			If IDNum = "" Then
-
-			Else
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-			EndIf
-
-			; clear id
-			Var IDNum = ""
-			Var FromEnergyDrink1BathPro = 0
-			Var AddData = 0
-			Var DisableFromPowerup = "true"
-		Else
-			Var DisableFromPowerup = ""
-		EndIf
-	EndIf
 
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index d4d52040..9aeb6a18 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -301,200 +301,7 @@
 	DEBUGVAR OriginalPrice
 	DEBUGVAR TOPPING_PRICE
 
-	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 FromRerunPro = 1 Then
-		Var PriceDiff = PriceDrink - PromoPriceDrink
-		Var Seeker.VendingCode = RerunProCode
-		Var Seeker.IntVendingCampaign = PriceDiff
-		Var Seeker.FreeVendingCampaign = 0
-		Var Seeker.CodeChannel = 1
-		Var Seeker.CodeNumber = "00000000"
-		Var Seeker.VendingCampaignRI3 = PriceDiff
-		Var Seeker.CampaignPPrice = PromoPriceDrink
-		
-		; reset
-		Var RerunProCode = ""
-	EndIf
-
-	If FromMondayBananaPro = 1 Then
-		Var PriceDiff = PriceDrink - PromotionPriceDrink
-		Var Seeker.VendingCode = "PMD10"
-		Var Seeker.IntVendingCampaign = PriceDiff
-		Var Seeker.FreeVendingCampaign = 0
-		Var Seeker.CodeChannel = 1
-		Var Seeker.CodeNumber = "00000000"
-		Var Seeker.VendingCampaignRI3 = PriceDiff
-		Var Seeker.CampaignPPrice = PromotionPriceDrink
-	EndIf
-
-	If FromWednesdayMelonPro = 1 Then
-		Var PriceDiff = PriceDrink - PromotionPriceDrink
-		Var Seeker.VendingCode = "PMD10"
-		Var Seeker.IntVendingCampaign = PriceDiff
-		Var Seeker.FreeVendingCampaign = 0
-		Var Seeker.CodeChannel = 1
-		Var Seeker.CodeNumber = "00000000"
-		Var Seeker.VendingCampaignRI3 = PriceDiff
-		Var Seeker.CampaignPPrice = PromotionPriceDrink
-	EndIf
-
-	If NightTime = 1 Then 
-		If SelectDrink = "12-99-03-0066" Then
-	    	Var PriceDrink = 60
-			Var Seeker.VendingCode = "PMX5"
-			Var Seeker.IntVendingCampaign = 30
-			Var Seeker.FreeVendingCampaign = 0
-			Var Seeker.CodeChannel = 1
-			Var Seeker.CodeNumber = "00000000"
-			Var Seeker.VendingCampaignRI3 = 30
-		EndIf
-	EndIf
-
-	If From15THBPro = 1 Then
-		Var PriceDiff = OriginalPrice - 15
-		Var Seeker.VendingCode = "Fix15"
-		Var Seeker.IntVendingCampaign = PriceDiff
-		Var Seeker.FreeVendingCampaign = 0
-		Var Seeker.CodeChannel = 1
-		Var Seeker.CodeNumber = "00000000"
-		Var Seeker.VendingCampaignRI3 = PriceDiff
-		Var Seeker.CampaignPPrice = PriceDrink - PriceDiff
-	EndIf
-
-	If FromPowerUpPro = 1 Then
-
-		If FreeEnergyDrink = 1 Then
-			If SelectDrink = "12-05-02-0035" Then
-				Var PriceDiff = PriceDrink - PromotionPriceDrink
-				Var Seeker.VendingCode = "FIX1"
-				Var Seeker.IntVendingCampaign = PriceDiff
-				Var Seeker.FreeVendingCampaign = 0
-				Var Seeker.CodeChannel = 1
-				Var Seeker.CodeNumber = "00000000"
-				Var Seeker.VendingCampaignRI3 = PriceDiff
-				Var Seeker.CampaignPPrice = 1
-			Else
-				If SelectDrink = "12-05-02-0034" Then
-					Var PriceDiff = PriceDrink - PromotionPriceDrink
-					Var Seeker.VendingCode = "FIX1"
-					Var Seeker.IntVendingCampaign = PriceDiff
-					Var Seeker.FreeVendingCampaign = 0
-					Var Seeker.CodeChannel = 1
-					Var Seeker.CodeNumber = "00000000"
-					Var Seeker.VendingCampaignRI3 = PriceDiff
-					Var Seeker.CampaignPPrice = 1
-				EndIf
-			EndIf
-		EndIf
-
-	EndIf
-
-	If FromEnergyDrink1BathPro = 1 Then
-		Var PriceDiff = PriceDrink - 1
-		Var Seeker.VendingCode = "FIX1"
-		Var Seeker.IntVendingCampaign = PriceDiff
-		Var Seeker.FreeVendingCampaign = 0
-		Var Seeker.CodeChannel = 1
-		Var Seeker.CodeNumber = "00000000"
-		Var Seeker.VendingCampaignRI3 = PriceDiff
-		Var Seeker.CampaignPPrice = 1
-	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
-
-	; fruit_raya
-	If FromFruityRaya = 1 Then
-		Var Seeker.VendingCode = "RAYA"
-		Var Seeker.FreeVendingCampaign = 0
-	EndIf
-
-	; mys pro thai tea
-	If FromProThaiTea = 1 Then
-		Var Seeker.VendingCode = "TT1F1"
-		Var Seeker.FreeVendingCampaign = 0
-	EndIf
-
-	; mys pro yuzu
-	If FromProYuzu = 1 Then
-		Var Seeker.VendingCode = "YZ1F1"
-		Var Seeker.FreeVendingCampaign = 0
-	EndIf
-
-	; mys mode pay later
-	If EnablePayLaterMode = 1 Then
-		Var PriceDiff = PriceDrink
-
-		Var Seeker.VendingCode = "PL"
-		Var Seeker.IntVendingCampaign = PriceDiff
-
-	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
+	TRY "ROOT/taobin_project/xml/process/discount_from_promotion.ev"
 	
 	DEBUGVAR PromotionIDCurrentOrder
 
diff --git a/xml/process/addpoint.ev b/xml/process/addpoint.ev
index ba9be432..d224b57a 100644
--- a/xml/process/addpoint.ev
+++ b/xml/process/addpoint.ev
@@ -39,66 +39,6 @@
 
 	DEBUGVAR Seeker.CodeChannel
 	DEBUGVAR Seeker.CollectPointMain
-	DEBUGVAR LipitPro
-	DEBUGVAR FromLipitPro
-	If LipitPro = 1 Then
-		If FromLipitPro = 1 Then
-			If Seeker.CodeChannel = 1 Then
-				If Seeker.CollectPointMain = 0 Then
-					Var AddData = 0
-				EndIf
-			EndIf
-		EndIf
-	EndIf
-
-	DEBUGVAR FromPowerUpPro
-	If FreeEnergyDrink = 1 Then
-		If FromPowerUpPro = 1 Then
-				; AddData
-
-			; +1 in quota in this id card
-			Var Param1 = ""
-			Var Param2 = ""
-			Var Param3 = ""
-
-			If IDNum = "" Then
-
-			Else
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-			EndIf
-
-			; clear id
-			Var IDNum = ""
-			Var FromPowerUpPro = 0
-			Var AddData = 0
-			Var DisableFromPowerup = "true"
-		Else
-			Var DisableFromPowerup = ""
-		EndIf
-	EndIf
-
-	If EnergyDrink1BathPro = 1 Then
-		If FromEnergyDrink1BathPro = 1 Then
-			SAVELOG "Adding Energy drink 1 Bath pro quota"
-			Var Param1 = ""
-			Var Param2 = ""
-			Var Param3 = ""
-
-			If IDNum = "" Then
-
-			Else
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-			EndIf
-
-			; clear id
-			Var IDNum = ""
-			Var FromEnergyDrink1BathPro = 0
-			Var AddData = 0
-			Var DisableFromPowerup = "true"
-		Else
-			Var DisableFromPowerup = ""
-		EndIf
-	EndIf
 
 	Var PointCrm = ""
 	If Seeker.FromConsent = 1 Then 
diff --git a/xml/process/discount_from_promotion.ev b/xml/process/discount_from_promotion.ev
new file mode 100644
index 00000000..7c519a09
--- /dev/null
+++ b/xml/process/discount_from_promotion.ev
@@ -0,0 +1,96 @@
+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 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
+
+; fruit_raya
+If FromFruityRaya = 1 Then
+    Var Seeker.VendingCode = "RAYA"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys pro thai tea
+If FromProThaiTea = 1 Then
+    Var Seeker.VendingCode = "TT1F1"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys pro yuzu
+If FromProYuzu = 1 Then
+    Var Seeker.VendingCode = "YZ1F1"
+    Var Seeker.FreeVendingCampaign = 0
+EndIf
+
+; mys mode pay later
+If EnablePayLaterMode = 1 Then
+    Var PriceDiff = PriceDrink
+
+    Var Seeker.VendingCode = "PL"
+    Var Seeker.IntVendingCampaign = PriceDiff
+
+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
\ No newline at end of file