add maxme and 1get1Free songkran

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
+	If PromotionIDCurrentOrder = 2 Then
-        Var img_popup6 = "/img_popup6F.png"
+		Var img_popup6 = "/img_popup6.png"
-    EndIf
+		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>

xml/page_payment_cashOther.xml

@@ -609,8 +609,7 @@
 <Button>
 <X> 673 </X>
 <Y> 1112 </Y>
-;<State>  "InvisibleCCard" </State>
+<State>  "Invisible" </State>
-<State>  "Enable" </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>

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"

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 + "/"