Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

xml/page_payment_cash-SGP.xml

@@ -221,10 +221,8 @@
 		Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
 
 	EndIf
-
 	
 
-
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
 		If show_eng = "true" Then 
@@ -370,7 +368,7 @@
 
 			Var ShowNetworkProblem = "Enable"
 			Var ShowButtonClick2 = "Invisible"
-			Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+			
 
 	Else
 		Var PayOfflineMode = 0
@@ -462,6 +460,15 @@
 		Var PayState4 = "Invisible"
 	EndIf
 
+	If SettingDisableTaobinCode = "true" Then
+		Var PayState2 = "Invisible"
+	EndIf
+
+
+	Var PayState5 = "Invisible"
+	
+	
+
 
 	DEBUGVAR SettingDisableTaobinCredit
 </EventOpen>
@@ -832,8 +839,12 @@
 
 	  If RoadShow = "true" Then
 	  Else
-		Var PayState3 = "Disable"
-	  	Var PayState5 = "Disable"
+	  	If PayState3 = "Enable" Then
+			Var PayState3 = "Disable"
+		EndIf
+		If PayState5 = "Enable" Then
+		  	Var PayState5 = "Disable"
+	  	EndIf
 	  EndIf 
 
 	  Var LOADING_STATE = "Invisible"
@@ -1623,7 +1634,7 @@ EndIf
 <Y> 938 </Y>
 <Width> 1080</Width>
 <Align> Center </Align>
-<Size> 72 </Size>
+<Size> 66 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
 <Value> showname </Value>