diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml
index 74db17a5..f4ba671d 100644
--- a/xml/page_payment_cash-HKG.xml
+++ b/xml/page_payment_cash-HKG.xml
@@ -7,15 +7,6 @@
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
 
-	READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
-	DEBUGVAR str_sim_on
-
-	Var HKGSimMode = "Invisible"
-
-	If str_sim_on = "1" Then
-		Var HKGSimMode = "Enable"
-	EndIf
-
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable
@@ -23,9 +14,6 @@
 	SAVELOG "page_payment_cach-HKG.xml"
 
     Var  PreScaleCanculate = 100
-	DEBUGVAR VendingCashless
-	CashlessReq FAIL
-
 
 	Var CashlessPayFlag = 0
 	Var RemainAmountStrENG = ""
@@ -68,7 +56,6 @@
 	DEBUGVAR QRCODETMP
 
 	DEBUGVAR IsSmoRet
-	Var countClick2 = 0
 	;SAVELOG SelectDrink
 	;SAVELOG NameDrink
 	;SAVELOG NameDrinkTH
@@ -112,7 +99,8 @@
 	Var CoinInCounter = 0
 	Var CancelNumber = 3
 
-
+	Var CreditCardButtonState = "Disable"
+	Var QRCodeButtonState = "Disable"
 
 	Var PayAmount = PriceDrink
 	Var RemainAmount = PayAmount - Seeker.IntVendingCampaign
@@ -169,55 +157,50 @@
 
 	DEBUGVAR QRCODE99KBANK
 
-	If RoadShow = "true" Then
-		Var PayState1 = "Invisible"
-		Var PayState2 = "Invisible"
-		Var PayState3 = "Invisible"
-		Var PayState4 = "Invisible"
-		Var PayState5 = "Invisible"
-		Var PayState6 = "Invisible"
-		Var showRemaining = "Free"
+    If RoadShow = "true" Then
+        Var CreditCardButtonState = "Invisible"
+        Var QRCodeButtonState = "Invisible"
+        Var showRemaining = "Free"
 
 	Else
-		Var PayState1 = "Enable"
+		;Var PayState1 = "Enable"
 
-		If cash_disable = "1" Then
-			Var PayState1 = "Press"
-		EndIf
+		;If cash_disable = "1" Then
+		;	Var PayState1 = "Press"
+		;EndIf
 
-		If Seeker.IntVendingCampaign = 0 Then
-			Var PayState2 = "Enable"
-			Var PayState4 = "Enable"
-			Var PayState5 = "Enable"
-			Var PayState6 = "Enable"
-		Else
-			SAVELOG "Cash only IntVendingCampaign"
-			Var PayState2 = "Disable"
-			Var PayState4 = "Disable"
-			Var PayState5 = "Enable"
-			Var PayState6 = "Disable"
-		EndIf
-		Var PayState3 = "Enable"
+		Var CreditCardButtonState = "Enable"
+		Var QRCodeButtonState = "Enable"
+
+        ;If Seeker.IntVendingCampaign = 0 Then
+        ;    Var CreditCardButtonState = "Enable"
+        ;    Var QRCodeButtonState = "Enable"
+        ;Else
+        ;	SAVELOG "Cash only IntVendingCampaign"
+        ;	Var PayState2 = "Disable"
+        ;	Var PayState4 = "Disable"
+        ;	Var PayState5 = "Enable"
+        ;	Var PayState6 = "Disable"
+        ;EndIf
+
+		;Var PayState3 = "Enable"
 
 
 		DEBUGVAR CoinAmount
 		If CoinAmount > 0 Then
 			SAVELOG "Cash only CoinAmount"
-			Var PayState2 = "Disable"
-			Var PayState3 = "Disable"
-			Var PayState4 = "Disable"
-			Var PayState5 = "Disable"
-			Var PayState6 = "Disable"
+			Var CreditCardButtonState = "Disable"
+			Var QRCodeButtonState = "Disable"
 			Var CoinInFlag = 1
 		EndIf
 
-		If Seeker.IntVendingCredit > 0 Then
-			SAVELOG "Cash only IntVendingCredit"
-			Var PayState2 = "Disable"
-			Var PayState4 = "Disable"
-			Var PayState5 = "Disable"
-			Var PayState6 = "Disable"
-		EndIf
+		;If Seeker.IntVendingCredit > 0 Then
+		;	SAVELOG "Cash only IntVendingCredit"
+		;	Var PayState2 = "Disable"
+		;	Var PayState4 = "Disable"
+		;	Var PayState5 = "Disable"
+		;	Var PayState6 = "Disable"
+		;EndIf
 
 
 
@@ -237,14 +220,14 @@
 
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
-		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
-		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
 
-		EndIf
+    If show_eng = "true" Then
+    	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
+    	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
+    Else
+    	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
+    	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
+    EndIf
 
 	Var X_CASH = 216
 
@@ -366,11 +349,36 @@
 
 	EndIf
 
-	;If CoinInFlag = 0 Then
-	;	If CancelFlag = 0 Then
-    ;        Coin CARD
-    ;    EndIf
-	;EndIf
+	Var UserChoosePayment = ""
+
+	Var EnablingCountDown = 0
+	Var EnablingCreditCard = 0
+	Var EnablingQRCode = 0
+
+	Var RequestCreditCardCountDown = 0
+	Var RequestQRCodeCountDown = 0
+
+	Var SwitchingCreditCardToQRCode = 0
+	Var SwitchingQRCodeToCreditCard = 0
+	Var SwitchingContDown = 0
+
+	Var FirstTimeDelayEnableButton = 1
+	Var FirstTimeDelayEnableButtonCountDown = 5
+
+    If CoinInFlag = 0 Then
+        If CancelFlag = 0 Then
+            If CreditCardButtonState = "Enable" Then
+                Coin CARD
+                Var UserChoosePayment = "CreditCard"
+                Var CreditCardButtonState = "Disable"
+                Var QRCodeButtonState = "Disable"
+                Var LOADING_STATE = "Enable"
+                Var EnablingCreditCard = 1
+                Var EnablingCountDown = 5
+                Var RequestCreditCardCountDown = 1
+            EndIf
+        EndIf
+    EndIf
 
 	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@@ -496,12 +504,9 @@
 	EndIf
 
 
-	Var UserChoosePayment = ""
 
 	DEBUGVAR SettingDisableTaobinCredit
 	Var CancelContinue = 0
-
-	Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
 </EventOpen>
 
 <EventActionOk>
@@ -736,7 +741,7 @@
 		Var LOADING_STATE = "Invisible"
 
 		If ViewBill > 0 Then
-				CoinVending BILLREJECT
+			CoinVending BILLREJECT
 		EndIf
 
 		VendingQR OFF
@@ -744,7 +749,7 @@
 		Refresh
 
 		If Seeker = "curr" Then
-				MakeDrinkV1  SelectDrink SelectSugarID
+			MakeDrinkV1  SelectDrink SelectSugarID
 		EndIf
 		Var Seeker.CreditCard = 1
 		Var Seeker.CreditCardRef = CreditCardRef
@@ -814,66 +819,10 @@
 
 <EventCashlessCard>
 
-	Var CreditCardRef = ""
-	GenHashWithTimeStamp CreditCardRef
 	DEBUGVAR VendingCashless
 	DEBUGVAR UserChoosePayment
 	DEBUGVAR CoinInFlag
 
-
-
-	If CancelFlag = 0 Then
-
-		If CoinInFlag = 0 Then
-
-			DEBUGVAR UserChoosePayment
-			DEBUGVAR VendingCashless
-
-			If UserChoosePayment = "CreditCashless" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
-				EndIf
-			EndIf
-
-			If UserChoosePayment = "" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
-
-					Var UserChoosePayment = "CreditCashless"
-				EndIf
-			EndIf
-
-		EndIf
-
-	Else
-
-		If CancelFlag = 1 Then
-			DEBUGVAR CancelFlag
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-
-	EndIf
-
-
 	Refresh
 
 </EventCashlessCard>
@@ -1070,24 +1019,10 @@
 				Var CancelFlag = 1
 				Var cancelState = "Enable"
 
-				If CashlessPayFlag = 0 Then
-
-					If UserChoosePayment = "CreditCashless" Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-					If UserChoosePayment = "" Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-				EndIf
-
 				If CashlessPayFlag = 1 Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
+                    CashlessReq VENDINGCANCEL
+                    SAVELOG "Cashless called VENDINGCANCEL"
+                EndIf
 
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
@@ -1209,6 +1144,121 @@
 
 	EndIf
 
+    If FirstTimeDelayEnableButton = 1 Then
+        If FirstTimeDelayEnableButtonCountDown = 0 Then
+            Var CreditCardButtonState = "Enable"
+            Var QRCodeButtonState = "Enable"
+            Var LOADING_STATE = "Invisible"
+            Var FirstTimeDelayEnableButton = 0
+        Else
+            Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
+        EndIf
+    EndIf
+
+    If EnablingCreditCard = 1 Then
+
+        If RequestCreditCardCountDown = 0 Then
+
+            GenHashWithTimeStamp CreditCardRef
+
+            ; 65535 mean Credit card
+            Var CreditCardRef = CreditCardRef + "/65535"
+
+           	DEBUGVAR CreditCardRef
+
+
+            Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+            CashlessPay RemainAmountX CreditCardRef
+            Var CashlessPayFlag = 1
+            Var RequestCreditCardCountDown = -1
+        Else
+            Var RequestCreditCardCountDown = RequestCreditCardCountDown - 1
+        EndIf
+
+        If EnablingCountDown = 0 Then
+            Var Timeout = 0
+            Var UserChoosePayment = "CreditCard"
+            Var QRErrorState = "Invisible"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+            Var VendingCashless = "-"
+            If FirstTimeDelayEnableButton = 0 Then
+                Var LOADING_STATE = "Invisible"
+            EndIf
+            Var EnablingCountDown = 0
+            Var EnablingCreditCard = 0
+        Else
+            Var EnablingCountDown = EnablingCountDown - 1
+        EndIf
+
+    EndIf
+
+    If EnablingQRCode = 1 Then
+
+        If RequestQRCodeCountDown = 0 Then
+
+            GenHashWithTimeStamp CreditCardRef
+
+            ; 0 mean QR code
+            Var CreditCardRef = CreditCardRef + "/0"
+            DEBUGVAR CreditCardRef
+
+
+            Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+            CashlessPay RemainAmountX CreditCardRef
+            Var CashlessPayFlag = 1
+            Var RequestQRCodeCountDown = -1
+        Else
+            Var RequestQRCodeCountDown = RequestQRCodeCountDown - 1
+        EndIf
+
+        If EnablingCountDown = 0 Then
+            Var Timeout = 0
+            Var UserChoosePayment = "QRCode"
+            Var QRErrorState = "Invisible"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+            Var VendingCashless = "-"
+            Var LOADING_STATE = "Invisible"
+            Var EnablingQRCode = 0
+            Var EnablingCountDown = 0
+        Else
+            Var EnablingCountDown = EnablingCountDown - 1
+        EndIf
+
+    EndIf
+
+    If SwitchingCreditCardToQRCode = 1 Then
+        If SwitchingContDown = 0 Then
+            Coin CARD
+            Var EnablingQRCode = 1
+            Var EnablingCountDown = 5
+            Var RequestCreditCardCountDown = 1
+            Var SwitchingCreditCardToQRCode = 0
+        Else
+            Var SwitchingContDown = SwitchingContDown - 1
+        EndIf
+    EndIf
+
+    If SwitchingQRCodeToCreditCard = 1 Then
+        If SwitchingContDown = 0 Then
+            Coin CARD
+            Var EnablingCreditCard = 1
+            Var EnablingCountDown = 5
+            Var RequestQRCodeCountDown = 1
+            Var SwitchingQRCodeToCreditCard = 0
+        Else
+            Var SwitchingContDown = SwitchingContDown - 1
+        EndIf
+    EndIf
+
+    If CashlessClosingPopup = 1 Then
+        If CashlessClosingPopupCountDown = 0 Then
+            Var alphaState = "Invisible"
+            Var LOADING_STATE = "Invisible"
+            Var CashlessClosingPopup = 0
+        Else
+            Var CashlessClosingPopupCountDown = CashlessClosingPopupCountDown - 1
+        EndIf
+    EndIf
 
 	Refresh
 	TimerReset
@@ -1539,31 +1589,15 @@
 
 			SAVELOG "ButtonCancleMain  > Cancle Order."
 			Machine CancelWepApp
-            CoinVending OFF
+            ;CoinVending OFF
 			Var CancelFlag = 1
 			Var cancelState = "Enable"
 			Var CancelCounter = 0
 
-			If FlagQROpened = 1 Then
-				Var CancelNumber = 12
-			EndIf
-
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
 			If CashlessPayFlag = 1 Then
-				Var CashlessPayFlag = 0
-				CashlessReq FAIL
-			EndIf
+                CashlessReq VENDINGCANCEL
+                SAVELOG "Cashless called VENDINGCANCEL"
+            EndIf
 
 
 
@@ -1609,37 +1643,37 @@
 <Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 </Image>
 
-<Button>
-<X>  664 </X>
-<Y>  1276</Y>
-<State> PayState2</State>
-<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
-<FilenameDisable> pay_with_code_image </FilenameDisable>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-	If alphaState = "Invisible" Then
-
-		If CoinInFlag = 0 Then
-			If CancelFlag = 0 Then
-			Var TelephoneNumber = ""
-			Var Tel_Confirm_State = "Disable"
-
-			Var UserChoosePayment = "Code"
-			Open "ROOT/taobin_project/xml/page_payment_code.xml"
-			EndIf
-		EndIf
-
-	EndIf
-</EventClick>
-</Button>
+;<Button>
+;<X>  664 </X>
+;<Y>  1276</Y>
+;<State> PayState2</State>
+;<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
+;<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
+;<FilenameDisable> pay_with_code_image </FilenameDisable>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick>
+;
+;	If alphaState = "Invisible" Then
+;
+;		If CoinInFlag = 0 Then
+;			If CancelFlag = 0 Then
+;			Var TelephoneNumber = ""
+;			Var Tel_Confirm_State = "Disable"
+;
+;			Var UserChoosePayment = "Code"
+;			Open "ROOT/taobin_project/xml/page_payment_code.xml"
+;			EndIf
+;		EndIf
+;
+;	EndIf
+;</EventClick>
+;</Button>
 
 <Button>
 <X> X_CASH </X>
-<Y> 1276 </Y>
-<State> PayState5 </State>
+<Y> TopRowY </Y>
+<State> CreditCardButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card_ezlink.png") </Filename>
 <FilenamePress> Var( CountryRootPath + "/image/page_payment/bd_credit_card_ezlink.png") </FilenamePress>
 <FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_credit_card_ezlink.png") </FilenameDisable>
@@ -1648,19 +1682,74 @@
 <EventClick>
 
 If alphaState = "Invisible" Then
-	If CoinInFlag = 0 Then
-		If CancelFlag = 0 Then
-
-			Var UserChoosePayment = "CreditCashless"
-
+    If CoinInFlag = 0 Then
+        If CancelFlag = 0 Then
+            Var QRCODE99 = ""
+            Var QRErrorState = "Invisible"
             Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
-			DEBUGVAR QR_POPUP
-			Refresh
             Var alphaState = "Enable"
-            Coin CARD
-        EndIf
-	EndIf
 
+            If UserChoosePayment = "CreditCard" Then
+                Var Timeout = 0
+                Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+                If EnablingCreditCard = 1 Then
+                    Var LOADING_STATE = "Enable"
+                EndIf
+            Else
+                If UserChoosePayment = "QRCode" Then
+                    CashlessReq VENDINGCANCEL
+                    Var LOADING_STATE = "Enable"
+                    Var SwitchingQRCodeToCreditCard = 1
+                    Var SwitchingContDown = 1
+                Else
+                    Coin CARD
+                    Var UserChoosePayment = "CreditCard"
+                    Var LOADING_STATE = "Enable"
+                    Var EnablingCreditCard = 1
+                    Var EnablingCountDown = 5
+                    Var RequestCreditCardCountDown = 1
+                EndIf
+            EndIf
+        EndIf
+    EndIf
+EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 439 </X>
+<Y> TopRowY </Y>
+<State> QRCodeButtonState </State>
+<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_prompt_pay.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+If alphaState = "Invisible" Then
+    If CoinInFlag = 0 Then
+        If CancelFlag = 0 Then
+            Var QRCODE99 = ""
+            Var QRErrorState = "Invisible"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+            Var LOADING_STATE = "Enable"
+            Var alphaState = "Enable"
+
+            If UserChoosePayment = "CreditCard" Then
+                CashlessReq VENDINGCANCEL
+                Var SwitchingCreditCardToQRCode = 1
+                Var SwitchingContDown = 1
+            Else
+                Coin CARD
+                Var LOADING_STATE = "Enable"
+                Var EnablingQRCode = 1
+                Var EnablingCountDown = 5
+                Var RequestQRCodeCountDown = 1
+            EndIf
+        EndIf
+    EndIf
 EndIf
 
 </EventClick>
@@ -1668,90 +1757,53 @@ EndIf
 
 
 
-<Button>
-<X> 439 </X>
-<Y> 1276 </Y>
-<State> PayState4</State>
-<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
-<FilenameDisable> pay_with_credit_image </FilenameDisable>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-
-	If alphaState = "Invisible" Then
-
-		If CoinInFlag = 0 Then
-			If CancelFlag = 0 Then
-			Var TelephoneNumber = ""
-			Var Tel_Confirm_State = "Disable"
-
-			Var UserChoosePayment = "Credit"
-			Open "ROOT/taobin_project/xml/page_payment_credit.xml"
-			EndIf
-		EndIf
-
-	EndIf
-
-
-</EventClick>
-</Button>
-
-; cash Singapore
-<Button>
-<X> 439 </X>
-<Y> eval(
-	If SettingDisableTaobinCredit = "true" Then
-		Var return = TopRowY
-	Else
-		Var return = BotRowY
-	EndIf
-) </Y>
-<State> PayState1</State>
-<Filename>  FilenameShowbuttonCashBN </Filename>
-<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
-<FilenameDisable> FilenameShowbuttonCashBP </FilenameDisable>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-	If alphaState = "Invisible" Then
-
-		Var UserChoosePayment = "Coin"
-
-		If EnoughChange = "yes" Then
-
-			Var alphaState2 = "Enable"
-			Var alphaState2t = alphaState2
-
-			If RoadShow = "true" Then
-				Var MachineStage = "make-drink"
-				Var BrewingTextThai = "เตรียมแก้ว"
-				MakeDrinkV1  SelectDrink SelectSugarID
-				Open "ROOT/taobin_project/xml/page_thankyou.xml"
-				;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-			EndIf
-		Else
-
-			If SELLONLINE = 1 Then
-				Var alphaState3 = "Enable"
-			Else
-				Var alphaState3_offline = "Enable"
-			EndIf
-			Refresh
-
-		EndIf
-	EndIf
-</EventClick>
-</Button>
+;<Button>
+;<X> 439 </X>
+;<Y> 1276 </Y>
+;<State> PayState4</State>
+;<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
+;<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
+;<FilenameDisable> pay_with_credit_image </FilenameDisable>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick>
+;
+;
+;	If alphaState = "Invisible" Then
+;
+;		If CoinInFlag = 0 Then
+;			If CancelFlag = 0 Then
+;			Var TelephoneNumber = ""
+;			Var Tel_Confirm_State = "Disable"
+;
+;			Var UserChoosePayment = "Credit"
+;			Open "ROOT/taobin_project/xml/page_payment_credit.xml"
+;			EndIf
+;		EndIf
+;
+;	EndIf
+;
+;
+;</EventClick>
+;</Button>
 
 
 <Button>
 <X> 360 </X>
 <Y> 1781 </Y>
-<State>CancleState</State>
+<State>
+eval(
+    If CancleState = "Enable" Then
+        If LOADING_STATE = "Enable" Then
+            Var return = "Disable"
+        Else
+            Var return = CancelState
+        EndIf
+    Else
+        Var return = CancleState
+    EndIf
+)
+</State>
 <Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
 <FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
@@ -1768,31 +1820,17 @@ EndIf
 			If ViewBill > 0 Then
 					CoinVending BILLREJECT
 			EndIf
-            CoinVending OFF
+            ;CoinVending OFF
 			Var CancelFlag = 1
 			Var cancelState = "Enable"
 			Var CancelCounter = 0
 
-			If FlagQROpened = 1 Then
-				Var CancelNumber = 12
-			EndIf
+            If CashlessPayFlag = 1 Then
+                CashlessReq VENDINGCANCEL
+                SAVELOG "Cashless called VENDINGCANCEL"
+            EndIf
 
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
-			If CashlessPayFlag = 1 Then
-				Var CashlessPayFlag = 0
-				CashlessReq FAIL
-			EndIf
+            Var UserChoosePayment = ""
 
         EndIf
 	EndIf
@@ -1868,42 +1906,44 @@ EndIf
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
-<State> alphaState </State>
+<State>
+eval(
+    If alphaState = "Enable" Then
+        If LOADING_STATE = "Enable" Then
+            Var return = "Disable"
+        Else
+            Var return = alphaState
+        EndIf
+    Else
+        Var return = alphaState
+    EndIf
+)
+</State>
 <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
+<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
 <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	  Var LOADING_STATE = "Invisible"
-	  Var QRErrorState = "Invisible"
-	  Var alphaState = "Invisible"
-	  Var QRCODE99 = ""
-	  ;CoinVending ON
-	  ;VendingQR OFF
+    SAVELOG "Button cancel popup pressed."
 
-	  CashlessReq OFF
+    If CashlessPayFlag = 1 Then
+        CashlessReq VENDINGCANCEL
+        Var LOADING_STATE = "Enable"
+        Var CashlessClosingPopup = 1
+        Var CashlessClosingPopupCountDown = 1
+        Var UserChoosePayment = ""
+        Var CashlessPayFlag = 0
+        SAVELOG "Cashless closing popup"
+    Else
+        Var QRCODE99 = ""
+        Var LOADING_STATE = "Invisible"
+        Var QRErrorState = "Invisible"
+        Var alphaState = "Invisible"
+    EndIf
 
-	If CashlessPayFlag = 0 Then
-		If UserChoosePayment = "CreditCashless" Then
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-
-		If UserChoosePayment = "" Then
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-	EndIf
-
-
-	  If CashlessPayFlag = 1 Then
-		Var CashlessPayFlag = 0
-		CashlessReq FAIL
-	  EndIf
-
-
-	  Refresh
+    Refresh
 </EventClick>
 </Button>
 
@@ -1991,7 +2031,7 @@ EndIf
 			EndIf
 
 			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
+				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
 					CashlessReq FAIL
 				EndIf
@@ -2060,7 +2100,7 @@ EndIf
 			EndIf
 
 			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
+				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
 					CashlessReq FAIL
 				EndIf
@@ -2114,7 +2154,7 @@ EndIf
 			EndIf
 
 			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
+				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
 					CashlessReq FAIL
 				EndIf
@@ -2240,7 +2280,7 @@ EndIf
 					EndIf
 
 					If CashlessPayFlag = 0 Then
-						If UserChoosePayment = "CreditCashless" Then
+						If UserChoosePayment = "CreditCard" Then
 							Var CashlessPayFlag = 0
 							CashlessReq FAIL
 						EndIf
@@ -2327,7 +2367,7 @@ EndIf
 					EndIf
 
 					If CashlessPayFlag = 0 Then
-						If UserChoosePayment = "CreditCashless" Then
+						If UserChoosePayment = "CreditCard" Then
 							Var CashlessPayFlag = 0
 							CashlessReq FAIL
 						EndIf