Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/page_payment_cash-SGP.xml

@@ -473,6 +473,7 @@
 	Var UserChoosePayment = ""
 
 	DEBUGVAR SettingDisableTaobinCredit
+	Var CancelContinue = 0
 
 	Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
 </EventOpen>
@@ -957,10 +958,20 @@
 		If Seeker = "curr" Then
 			DEBUGVAR UserChoosePayment
 			Var UserChoosePayment = ""
+
+			If CancelContinue = 2 Then
+		        Open "ROOT/taobin_project/xml/page_payment.xml"
+			EndIf
+
 			Open "ROOT/taobin_project/xml/page_catalog.xml"
 		Else
 			DEBUGVAR UserChoosePayment
 			Var UserChoosePayment = ""
+
+			If CancelContinue = 2 Then
+		        Open "ROOT/taobin_project/xml/page_payment.xml"
+			EndIf
+
 			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
 		EndIf
 	EndIf
@@ -1108,6 +1119,11 @@
 					Var ActionOKCase = 1
 					Var PayInfoCFlag = 1
 				EndIf
+
+				If CancelContinue = 1 Then
+				    Var CancelContinue = 2
+				EndIf
+
 			EndIf
 
 			VendingQR OFF
@@ -1520,6 +1536,8 @@
 			DEBUGVAR UserChoosePayment
 			Var UserChoosePayment = ""
 
+			Var CancelContinue = 0
+
         EndIf
 	EndIf
 
@@ -2085,6 +2103,8 @@ EndIf
 	DEBUGVAR UserChoosePayment
 	Var UserChoosePayment = ""
 
+	Var CancelContinue = 1
+
 	Var alphaState2 = "Invisible"
 	Refresh
 
@@ -2206,6 +2226,8 @@ EndIf
 					DEBUGVAR UserChoosePayment
 					Var UserChoosePayment = ""
 
+					Var CancelContinue = 0
+
 				EndIf
 			EndIf
 
@@ -2290,6 +2312,8 @@ EndIf
 					DEBUGVAR UserChoosePayment
 					Var UserChoosePayment = ""
 
+					Var CancelContinue = 1
+
 				EndIf
 			EndIf