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

xml/page_payment_cash.xml

@@ -100,6 +100,8 @@
 	
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
+	Var FlagalphaState2 = 0
+	Var alphaState2t = alphaState2
 	Var alphaState3 = "Invisible"
 
 	
@@ -303,6 +305,7 @@
 					Var RemainAmountStr = "Change " + Canout
 					Var RemainAmountStr = RemainAmountStr + "###size=90"
 				Else
+					Var FlagalphaState2 = 1
 					Var RemainAmountStr = "ทอน " + Canout
 				EndIf
 			EndIf
@@ -434,6 +437,7 @@
 
 		If web_payment = "CASH" Then
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 		EndIf
 
 		If web_payment = "QR" Then
@@ -753,7 +757,7 @@
 	EndIf
 
 
-	;Open "ROOT/taobin_project/xml/page_page_camera.xml" 
+	DEBUGVAR MenuCautionImageStage0
 
 </EventOpen>
 
@@ -1626,6 +1630,7 @@
 						Var RemainAmountStr = "Change " + Canout
 						Var RemainAmountStr = RemainAmountStr + "###size=90"
 					Else
+						Var FlagalphaState2 = 1
 						Var RemainAmountStr = "ทอน " + Canout
 					EndIf
 				EndIf
@@ -1647,6 +1652,10 @@
 			;Var RemainAmount = 0
 			Var showRemaining = charOfBaht + RemainAmountStr
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
+			If FlagalphaState2 = 1 Then
+				Var alphaState2t = "Invisible"
+			EndIf
 
 		
 		EndIf
@@ -1811,6 +1820,7 @@
 		If EnoughChange = "yes" Then
 
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 
 			If RoadShow = "true" Then
 				Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
@@ -2534,7 +2544,7 @@
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
-<State> alphaState2 </State>
+<State> alphaState2t </State>
 <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -2563,6 +2573,7 @@
 	EndIf
 	
 	Var alphaState2 = "Invisible"
+	Var alphaState2t = alphaState2
 	Refresh