diff --git a/image/collectiing/bd_pay_with_shoppy.png b/image/collectiing/bd_pay_with_shoppy.png
new file mode 100644
index 00000000..b0e492d1
Binary files /dev/null and b/image/collectiing/bd_pay_with_shoppy.png differ
diff --git a/image/collectiing/bd_pay_with_true.png b/image/collectiing/bd_pay_with_true.png
new file mode 100644
index 00000000..aa72a532
Binary files /dev/null and b/image/collectiing/bd_pay_with_true.png differ
diff --git a/image/collectiing_en/bd_pay_with_shoppy.png b/image/collectiing_en/bd_pay_with_shoppy.png
new file mode 100644
index 00000000..b0e492d1
Binary files /dev/null and b/image/collectiing_en/bd_pay_with_shoppy.png differ
diff --git a/image/collectiing_en/bd_pay_with_true.png b/image/collectiing_en/bd_pay_with_true.png
new file mode 100644
index 00000000..aa72a532
Binary files /dev/null and b/image/collectiing_en/bd_pay_with_true.png differ
diff --git a/xml/page_board.xml b/xml/page_board.xml
index e531b01b..27d6cd75 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -14,7 +14,9 @@
 	DEBUGVAR SoundVolume
 
 
-
+	Var eng_enable = "true"
+	Var thai_enable = "true"
+	
 	Var show_eng = "false"	
 	Var NextOrder = "false"
 	
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index e3c762f3..6792f912 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -262,14 +262,24 @@
 	If RoadShow = "true" Then
 		Var EnableSelectMenuBetweenBrewBlink = "Invisible"  
 	EndIf
-			
-	
+
+	If Seeker.CreditCard = 1 Then
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"  
+		Var EnableSelectMenuBetweenBrew = "Invisible"  
+	EndIf
+
+
+	Var CreditCardVoid = 0
 
 </EventOpen>
 
 
 <EventActionOk>
 
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+
 	
 	If ActionOKCase = 1 Then
 		If Seeker.CodeChannel = 1 Then 
@@ -567,27 +577,7 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
-
+			
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
 
@@ -650,26 +640,7 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
+			
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
@@ -835,21 +806,9 @@
 					Else
 
 						If Seeker.CreditCard = 1 Then
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + ""
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + "CC01"
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + SelectDrink
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + BoxID
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + "S"
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-							Var SessionID2 = SessionID2 + "/"
-
+					
 							CashlessReq SUCCESS
+							;CashlessReq FAIL
 
 						EndIf
 						
@@ -904,42 +863,51 @@
 
 
 			If Seeker.PayWithQR = 0 Then 
-				If Seeker.CodeChannel = 0 Then
-					If ChangeFlag = 0 Then
-						Var ChangeFlag = 1 
-
-						If Seeker.StoreCreditFlag = 1 Then
-							Var ChangeOK = 2
-						Else
-							If GetFreeFromError = 1 Then
-								Var ChangeOK = 2
-							Else
-								Change ServiceAmount2
-							EndIf
-							
-						EndIf
-							
-					EndIf
 
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
 				Else
 
-					If CoinAmount > 0 Then
-					
+					If Seeker.CodeChannel = 0 Then
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
-							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
 
 							If Seeker.StoreCreditFlag = 1 Then
 								Var ChangeOK = 2
 							Else
-								Change ServiceAmount3
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
 							EndIf
-							
+								
 						EndIf
-					Else
-						Var ChangeOK = 2
-					EndIf
 
+					Else
+
+						If CoinAmount > 0 Then
+						
+							If ChangeFlag = 0 Then
+								Var ChangeFlag = 1 
+								Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+								If Seeker.StoreCreditFlag = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount3
+								EndIf
+								
+							EndIf
+						Else
+							Var ChangeOK = 2
+						EndIf
+
+
+					EndIf
 
 				EndIf
 
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index 8f603cb8..52d9af21 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -142,11 +142,20 @@
 	Var StrawStateX = "Invisible"
 	Var LidStateX = "Invisible"
 
+	If Seeker.CreditCard = 1 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"  
+	EndIf
+
+	Var CreditCardVoid = 0
+
 </EventOpen>
 
 
 <EventActionOk>
 
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
 	
 	If ActionOKCase = 1 Then
 		If Seeker.CodeChannel = 1 Then 
@@ -416,26 +425,7 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
+			
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
@@ -490,26 +480,7 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
+			
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
@@ -670,21 +641,10 @@
 					Else
 
 						If Seeker.CreditCard = 1 Then
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + ""
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + "CC01"
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + SelectDrink
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + BoxID
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + "S"
-							Var SessionID2 = SessionID2 + "/"
-							Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-							Var SessionID2 = SessionID2 + "/"
+							
 
 							CashlessReq SUCCESS
+							;CashlessReq FAIL
 							
 						EndIf
 						
@@ -743,43 +703,52 @@
 
 
 			If Seeker.PayWithQR = 0 Then 
-				If Seeker.CodeChannel = 0 Then
-					If ChangeFlag = 0 Then
-						Var ChangeFlag = 1 
-
-						If Seeker.StoreCreditFlag = 1 Then
-							Var ChangeOK = 2
-						Else
-							If GetFreeFromError = 1 Then
-								Var ChangeOK = 2
-							Else
-								Change ServiceAmount2
-							EndIf
-							
-						EndIf
-							
-					EndIf
 
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
 				Else
+				
 
-					If CoinAmount > 0 Then
-					
+					If Seeker.CodeChannel = 0 Then
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
-							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
 
 							If Seeker.StoreCreditFlag = 1 Then
 								Var ChangeOK = 2
 							Else
-								Change ServiceAmount3
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
 							EndIf
-							
+								
 						EndIf
+
 					Else
-						Var ChangeOK = 2
+
+						If CoinAmount > 0 Then
+						
+							If ChangeFlag = 0 Then
+								Var ChangeFlag = 1 
+								Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+								If Seeker.StoreCreditFlag = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount3
+								EndIf
+								
+							EndIf
+						Else
+							Var ChangeOK = 2
+						EndIf
+
+
 					EndIf
-
-
 				EndIf
 
 			Else
diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml
index 7857ca3e..b1cd4e1d 100644
--- a/xml/page_cannotConti.xml
+++ b/xml/page_cannotConti.xml
@@ -226,11 +226,17 @@
 
 	DEBUGVAR VendingCampaign
 
+	Var CreditCardVoid = 0
+
 
 </EventOpen>
 
 <EventActionOk>
 
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+
 	
 	If ActionOKCase = 1 Then
 		If Seeker.CodeChannel = 1 Then 
@@ -463,27 +469,6 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
-
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
@@ -551,27 +536,6 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
-			If Seeker.CreditCard = 1 Then
-				Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + ""
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "CC01"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + SelectDrink
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + BoxID
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + "S"
-				Var SessionID2 = SessionID2 + "/"
-				Var SessionID2 = SessionID2 + Seeker.CreditCardRef
-				Var SessionID2 = SessionID2 + "/"
-
-				CashlessReq FAIL
-							
-			EndIf
-
 
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 
@@ -666,43 +630,52 @@
 
 
 			If Seeker.PayWithQR = 0 Then 
-				If Seeker.CodeChannel = 0 Then
-					If ChangeFlag = 0 Then
-						Var ChangeFlag = 1 
-
-						If Seeker.StoreCreditFlag = 1 Then
-							Var ChangeOK = 2
-						Else
-							If GetFreeFromError = 1 Then
-								Var ChangeOK = 2
-							Else
-								Change ServiceAmount2
-							EndIf
-							
-						EndIf
-							
-					EndIf
 
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
 				Else
+				
 
-					If CoinAmount > 0 Then
-					
+					If Seeker.CodeChannel = 0 Then
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
-							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
 
 							If Seeker.StoreCreditFlag = 1 Then
 								Var ChangeOK = 2
 							Else
-								Change ServiceAmount3
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
 							EndIf
-							
+								
 						EndIf
+
 					Else
-						Var ChangeOK = 2
+
+						If CoinAmount > 0 Then
+						
+							If ChangeFlag = 0 Then
+								Var ChangeFlag = 1 
+								Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+								If Seeker.StoreCreditFlag = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount3
+								EndIf
+								
+							EndIf
+						Else
+							Var ChangeOK = 2
+						EndIf
+
+
 					EndIf
-
-
 				EndIf
 
 			Else
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index aaef3137..b4a723a1 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -20,12 +20,12 @@
 
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
-		Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collect_point1"
-		Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
@@ -69,6 +69,13 @@
 		Var number10 = ""
 
 		If web_telnumOK = "" Then
+
+			If show_eng = "true" Then 
+				Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+			Else
+				Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+			EndIf
+
 		Else
 			Var TelephoneNumber = web_telnumOK
 			Var StepGetPoint = 1
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 0db0e627..799ceba5 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -179,7 +179,7 @@
 			SAVELOG "Cash only IntVendingCampaign"
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
-			Var PayState5 = "Disable"
+			Var PayState5 = "Enable"
 			Var PayState6 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
@@ -204,6 +204,8 @@
 			Var PayState6 = "Disable"
 		EndIf
 
+		
+
 
 		Var showRemaining = charOfBaht + RemainAmountStr
 
diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml
index 6c2ad76f..c3d90645 100644
--- a/xml/page_payment_cashOther.xml
+++ b/xml/page_payment_cashOther.xml
@@ -14,7 +14,7 @@
 	Var Timeout = 0
    
     Var GetPayInfoFlag = 0
-    Var Seeker.CodeChannel = 0
+    ;Var Seeker.CodeChannel = 0
 
 	;Var VendingQRCode = "ERROR"
 	;VendingQR ON
@@ -36,6 +36,24 @@
 	Var TelephoneNumber# = ""
 
 	Var PlaySoundLag = ""
+
+	Var InvisibleCCard = "Invisible"
+	If Seeker = "next" Then
+
+		Var SeekerCurr = "curr"
+		If SeekerCurr.CreditCard = 1 Then
+			Var InvisibleCCard = "Enable"
+		EndIf
+
+	EndIf
+
+	Var WalletEnable = "Enable"
+	If Seeker.IntVendingCampaign > 0 Then
+		DEBUGVAR "Discount Disable Wallet"
+		Var WalletEnable = "Disable"
+	EndIf
+
+	Var InvisibleCCard = "Enable"
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -51,8 +69,8 @@
 
 		Var PayState1 = "PressForever"
 		Var PayState2 = "Enable"
-		Var QRChannel = 0
-		Var Seeker.CodeChannel = 0
+		;Var QRChannel = 0
+		;Var Seeker.CodeChannel = 0
 		If CART_COUNT >= 1 Then 
 			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
 		Else
@@ -133,10 +151,10 @@
 <Button>
 <X> 209 </X>
 <Y> 888 </Y>
-<State> "Enable" </State>
+<State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_true.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_true.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bp_pay_with_true.png" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_true.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -200,10 +218,10 @@
 <Button>
 <X> 441 </X>
 <Y> 888 </Y>
-<State> "Enable" </State>
+<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>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -266,10 +284,10 @@
 <Button>
 <X> 673 </X>
 <Y> 888 </Y>
-<State> "Enable" </State>
+<State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_dolfin.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_dolfin.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bp_pay_with_dolfin.png" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_dolfin.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -331,7 +349,7 @@
 <Button>
 <X> 209 </X>
 <Y> 1112 </Y>
-<State> "Enable" </State>
+<State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_linepay.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_linepay.png" </FilenamePress>
 <FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_linepay.png" </FilenameDisable>
@@ -396,7 +414,7 @@
 <Button>
 <X> 209 </X>
 <Y> 1112 </Y>
-<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>
@@ -432,7 +450,7 @@
 <Button>
 <X> 441 </X>
 <Y> 1112 </Y>
-<State> "Enable" </State>
+<State>  InvisibleCCard </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>
@@ -471,8 +489,8 @@
 <EventClick> 
 	Var PayState1 = "PressForever"
 	Var PayState2 = "Enable"
-	Var QRChannel = 0
-	Var Seeker.CodeChannel = 0
+	;Var QRChannel = 0
+	;Var Seeker.CodeChannel = 0
 	If CART_COUNT >= 1 Then 
 			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
 	Else
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 943645a9..45ef23cc 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -172,22 +172,42 @@
 		
 		 If Seeker.PayWithQR = 0 Then
             If Seeker.FreeVendingCampaign = 0 Then
-                    If Seeker.IntVendingCampaign < PayAmount Then 
-                        Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
-						Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
 
-                        If SumCoinAmount >= PayAmount Then 
-                            Var Canout = SumCoinAmount - PayAmount
-                            If Canout > 0 Then
-                                
-                                    ;Change Canout	
-                                    ;Var ChangeFlag2 = 1
-									Var GotoStoreCredit0 = 1
-									Var StoreCreditAmount = Canout
-                                
-                            EndIf
-                        EndIf
-                    EndIf
+
+					If Seeker.CreditCard = 1 Then
+
+						DEBUGVAR CoinAmount
+					
+						If CoinAmount > 0 Then
+							DEBUGVAR "Change Canout"
+							Change CoinAmount	
+                            Var ChangeFlag2 = 1
+						EndIf
+
+					Else
+
+						If Seeker.IntVendingCampaign < PayAmount Then 
+							Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+							Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
+
+							If SumCoinAmount >= PayAmount Then 
+								Var Canout = SumCoinAmount - PayAmount
+								If Canout > 0 Then
+									
+										;Change Canout	
+										;Var ChangeFlag2 = 1
+										Var GotoStoreCredit0 = 1
+										Var StoreCreditAmount = Canout
+									
+								EndIf
+							EndIf
+						EndIf
+
+					EndIf
+
+
+
+                   
             Else
 
                     Var Canout = CoinAmount