...

xml/page_collect_point_2.xml

@@ -178,6 +178,19 @@
 				DEBUGVAR Seeker.PointTaobinStr
 				DEBUGVAR Seeker.TNumberTaobinMember
 				If TaobinPDPA = 0 Then
+
+					If CountryName = "Malaysia" Then
+						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					EndIf
+
+					If CountryName = "Indonesia" Then
+						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					EndIf 
+
+					If CountryName = "Australia" Then
+						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					EndIf 
+
 					Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 				EndIf
 

xml/page_payment_cashOther.xml

@@ -227,8 +227,8 @@
 
 
 <Button>
-<X> 441 </X>
+<X> 440 </X>
-<Y> 741 </Y>
+<Y> 965 </Y>
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress>
@@ -293,17 +293,19 @@
 
 
 <Button>
-<X> 208 </X>
+<X> 441 </X>
-<Y> 1189 </Y>
+<Y> 741 </Y>
+
+
 <State> WalletEnable </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_dolfin.png" </Filename>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_paotang.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_dolfin.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_paotang.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_dolfin.png" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_paotang.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	                Var QR_POPUP = "/img_popup5.png"
+	                Var QR_POPUP = "/img_popup1.png"
 					Var LOADING_STATE = "Enable"
 					
 					Var QRCODE99 = ""
@@ -330,7 +332,7 @@
 					Var ECommerceQR =	ECommerceQR + "/"
 					Var ECommerceQR =	ECommerceQR + SelectDrink 
 					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + "DOL:2/"
+					Var ECommerceQR =	ECommerceQR + "KBA:2/"
 
 					;If  IntVendingCampaign > 0 Then
 					;	Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
@@ -350,7 +352,7 @@
 					Var SessionID = ""
 
 					GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-					Var ReqPayInfoFlag = 4
+					Var ReqPayInfoFlag = 1
                     Var ReqPayInfoFromCashOther = 1
 					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 
@@ -455,8 +457,10 @@
 </Button>
 
 <Button>
-<X> 440 </X>
+<X> 675 </X>
-<Y> 965 </Y>
+<Y> 741 </Y>
+
+
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_lazpay.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_lazpay.png" </FilenamePress>
@@ -585,8 +589,10 @@
 </Button>
 
 <Button>
-<X> 675 </X>
+<X> 208 </X>
-<Y> 741 </Y>
+<Y> 1189 </Y>
+
+
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_wechat.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_wechat.png" </FilenamePress>

xml/page_payment_code.xml

@@ -791,6 +791,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeAIS.xml

@@ -595,6 +595,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeDtac.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeGLX.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeInfinyx.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeKBANK.xml

@@ -595,6 +595,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeLH.xml

@@ -595,6 +595,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeLotus.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeMCard.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeRabbit.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeSCG.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeThe1.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"

xml/page_payment_codeTrue.xml

@@ -598,6 +598,10 @@
 			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
+
+			Var ECommerce =	ECommerce + ":"
+			Var ECommerce =	ECommerce + PromotionIDCurrentOrder
+			
 			Var ServiceParameter = "max"
 			Var ServiceCharge = 0
 			Var AccountType = "new"