diff --git a/image/display_get_free/img_popup7.png b/image/display_get_free/img_popup7.png
new file mode 100644
index 00000000..7afbec95
Binary files /dev/null and b/image/display_get_free/img_popup7.png differ
diff --git a/image/display_get_free/img_popup7F.png b/image/display_get_free/img_popup7F.png
new file mode 100644
index 00000000..698b4095
Binary files /dev/null and b/image/display_get_free/img_popup7F.png differ
diff --git a/image/display_get_free_en/img_popup7.png b/image/display_get_free_en/img_popup7.png
new file mode 100644
index 00000000..72e0e125
Binary files /dev/null and b/image/display_get_free_en/img_popup7.png differ
diff --git a/image/display_get_free_en/img_popup7F.png b/image/display_get_free_en/img_popup7F.png
new file mode 100644
index 00000000..fb6ef119
Binary files /dev/null and b/image/display_get_free_en/img_popup7F.png differ
diff --git a/xml/page_display_Promo1Get1Free.xml b/xml/page_display_Promo1Get1Free.xml
index ba9b7fe2..38bc18a7 100644
--- a/xml/page_display_Promo1Get1Free.xml
+++ b/xml/page_display_Promo1Get1Free.xml
@@ -30,10 +30,22 @@
     Var GetScore = "1"
 	AddData Cid Seeker.TNumberTaobinMember  promoTxt PointCrm GetScore
 
-    Var img_popup6 = "/img_popup6.png"
-    If Seeker.TaobinErrorNetwork = 1 Then
-        Var img_popup6 = "/img_popup6F.png"
-    EndIf
+
+	If PromotionIDCurrentOrder = 2 Then
+		Var img_popup6 = "/img_popup6.png"
+		If Seeker.TaobinErrorNetwork = 1 Then
+			Var img_popup6 = "/img_popup6F.png"
+		EndIf
+	EndIf
+
+    
+
+	If PromotionIDCurrentOrder = 3 Then
+		Var img_popup6 = "/img_popup7.png"
+		If Seeker.TaobinErrorNetwork = 1 Then
+			Var img_popup6 = "/img_popup7F.png"
+		EndIf
+	EndIf
 
 	 
 </EventOpen>
diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml
index 4ad61f5a..b54bae79 100644
--- a/xml/page_payment_cashOther.xml
+++ b/xml/page_payment_cashOther.xml
@@ -609,8 +609,7 @@
 <Button>
 <X> 673 </X>
 <Y> 1112 </Y>
-;<State>  "InvisibleCCard" </State>
-<State>  "Enable" </State>
+<State>  "Invisible" </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
 <FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 04de0ebb..41fea3ce 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -62,6 +62,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
@@ -765,6 +769,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml
index fff5fcb8..4f3d8d16 100644
--- a/xml/page_payment_codeAIS.xml
+++ b/xml/page_payment_codeAIS.xml
@@ -573,6 +573,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml
index 239e363b..932594dc 100644
--- a/xml/page_payment_codeDtac.xml
+++ b/xml/page_payment_codeDtac.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeGLX.xml b/xml/page_payment_codeGLX.xml
index 10333b0d..23913513 100644
--- a/xml/page_payment_codeGLX.xml
+++ b/xml/page_payment_codeGLX.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeInfinyx.xml b/xml/page_payment_codeInfinyx.xml
index 29a27647..ded023c3 100644
--- a/xml/page_payment_codeInfinyx.xml
+++ b/xml/page_payment_codeInfinyx.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeKBANK.xml b/xml/page_payment_codeKBANK.xml
index 71940f4f..dd6de927 100644
--- a/xml/page_payment_codeKBANK.xml
+++ b/xml/page_payment_codeKBANK.xml
@@ -573,6 +573,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeLH.xml b/xml/page_payment_codeLH.xml
index bc2def07..8ac873a6 100644
--- a/xml/page_payment_codeLH.xml
+++ b/xml/page_payment_codeLH.xml
@@ -573,6 +573,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml
index 08a7241e..8ace6089 100644
--- a/xml/page_payment_codeLotus.xml
+++ b/xml/page_payment_codeLotus.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeMCard.xml b/xml/page_payment_codeMCard.xml
index 7919f2ea..604af095 100644
--- a/xml/page_payment_codeMCard.xml
+++ b/xml/page_payment_codeMCard.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeRabbit.xml b/xml/page_payment_codeRabbit.xml
index aaece748..64429712 100644
--- a/xml/page_payment_codeRabbit.xml
+++ b/xml/page_payment_codeRabbit.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeSCG.xml b/xml/page_payment_codeSCG.xml
index 2a3d1bfd..634a40ce 100644
--- a/xml/page_payment_codeSCG.xml
+++ b/xml/page_payment_codeSCG.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml
index c2b701e3..1e856e21 100644
--- a/xml/page_payment_codeThe1.xml
+++ b/xml/page_payment_codeThe1.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"
diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml
index 295be408..9e46dd01 100644
--- a/xml/page_payment_codeTrue.xml
+++ b/xml/page_payment_codeTrue.xml
@@ -576,6 +576,10 @@
 			Var ServiceType = "coffee"
 			Var ECommerce = ""
 			Var ECommerce = ECommerce + PriceDrink
+
+			Var ECommerce = ECommerce + ":"
+			Var ECommerce = ECommerce + TOPPING_PRICE
+			
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + DiscountDrink 
 			Var ECommerce =	ECommerce + "/"