diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
index 6b5a3c91..2be7bd3b 100644
--- a/spiral/xml/page_catalog_vending_machine.xml
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -42,7 +42,11 @@
 
     EndIf
 
+<<<<<<< HEAD
     
+=======
+
+>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
     ; SpiralOnline
   
         Var MenuVSelected2 = "Invisible"
@@ -61,9 +65,15 @@
 
         Var MenuVSelected2 = "Invisible"
         If SpiralOnline = "true" Then 
+<<<<<<< HEAD
             If Seeker =  "curr" Then
                 Var MenuVSelected2 = "Enable"
             EndIf
+=======
+            If  Seeker = "curr" Then 
+            	Var MenuVSelected2 = "Enable"
+			EndIf
+>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
         EndIf 
         
         ; init default
@@ -220,7 +230,10 @@
 
 ;
 
+<<<<<<< HEAD
 ;
+=======
+>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
 
 <ListView1>
     <Width> 1080 </Width>
@@ -446,7 +459,7 @@
 	<State>  $03-02-01-0001.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0001.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0001.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0001.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0001.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -572,7 +585,7 @@
 	<State>  $03-02-01-0002.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0002.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0002.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0002.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0002.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -697,7 +710,7 @@
 	<State>  $03-02-01-0003.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0003.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0003.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0003.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0003.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -826,7 +839,7 @@
 	<State>  $03-02-01-0004.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0004.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0004.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0004.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0004.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -950,7 +963,7 @@
 	<State>  $03-02-01-0005.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $03-02-01-0005.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $03-02-01-0005.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0005.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $03-02-01-0005.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1074,7 +1087,7 @@
 	<State>  $01-00-00-0006.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0006.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0006.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0006.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0006.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1199,7 +1212,7 @@
 	<State>  $01-00-00-0007.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0007.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0007.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0007.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0007.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1325,7 +1338,7 @@
 	<State>  $01-00-00-0008.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0008.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0008.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0008.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0008.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1452,7 +1465,7 @@
 	<State>  $01-00-00-0009.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0009.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0009.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0009.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0009.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1576,7 +1589,7 @@
 	<State>  $01-00-00-0010.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0010.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0010.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0010.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0010.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1701,7 +1714,7 @@
 	<State>  $01-00-00-0011.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0011.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0011.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0011.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0011.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1828,7 +1841,7 @@
 	<State>  $01-00-00-0012.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0012.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0012.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0012.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0012.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1953,7 +1966,7 @@
 	<State>  $01-00-00-0013.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0013.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0013.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0013.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0013.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2080,7 +2093,7 @@
 	<State>  $01-00-00-0014.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0014.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0014.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0014.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0014.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2204,7 +2217,7 @@
 	<State>  $01-00-00-0015.Button </State> 
 	<Filename> Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0015.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0015.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0015.image ) " </FilenameDisable>
+	;<FilenameDisable> Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0015.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2337,8 +2350,4 @@
 </Button>
 
 
-
-
-
-
 </Popup>
diff --git a/spiral/xml/page_spiral_payment_credit.xml b/spiral/xml/page_spiral_payment_credit.xml
index b9b0f334..3fca4fd3 100644
--- a/spiral/xml/page_spiral_payment_credit.xml
+++ b/spiral/xml/page_spiral_payment_credit.xml
@@ -18,6 +18,7 @@
    
 	Var ShowTextNumber = "Enable"
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
 
 	Var GetCreditFlag = 0
@@ -156,9 +157,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "1"
@@ -197,9 +200,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "2"
@@ -238,9 +243,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "3"
@@ -279,9 +286,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "4"
@@ -320,9 +329,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "5"
@@ -361,9 +372,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "6"
@@ -402,9 +415,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "7"
@@ -443,9 +458,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "8"
@@ -484,9 +501,11 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "9"
@@ -522,13 +541,15 @@
 	Trim TelephoneNumber 10
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowTextNumber = "Invisible"
 
 	TimerReset
 	Refresh
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
 
 	If TelNumLen = 7 Then
 		Var number7 = "0"
@@ -569,6 +590,8 @@
 	EndIf
 
 	Var ShowErrorText = "Invisible"
+	Var ShowErrorText2 = "Invisible"
+
 	TimerReset
 	Refresh
 	
@@ -577,7 +600,7 @@
 
 
 <Button>
-<X> 218 </X>
+<X> 397 </X>
 <Y> 1607 </Y>
 
 <Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
@@ -671,6 +694,13 @@
 <Filename> Var( DirImage + "/text_show_notfound.png") </Filename>
 </Image>
 
+<Image>
+<X> 152 </X>
+<Y> 920 </Y>
+<State> ShowErrorText2 </State>
+<Refresh> "Enable" </Refresh>
+<Filename> Var( DirImage + "/text_show_error5.png") </Filename>
+</Image>
 
 ;<Image>
 ;<X> 0 </X>
@@ -686,13 +716,46 @@
 <Loop> "true" </Loop>
 <Filename> video_menu_0 </Filename>
 </Video>
-
-
 			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 
 </EventSecurity>
 
+<Function2>
+
+	Var Tel2DFlag = 0
+
+	Var Tel2D = TelephoneNumber 
+	Trim Tel2D 2
+
+	If Tel2D = "06" Then
+		Var Tel2DFlag = 1
+	EndIf
+	If Tel2D = "07" Then
+		Var Tel2DFlag = 1
+	EndIf
+	If Tel2D = "08" Then
+		Var Tel2DFlag = 1
+	EndIf
+	If Tel2D = "09" Then
+		Var Tel2DFlag = 1
+	EndIf
+	
+	If Tel2DFlag = 1 Then
+
+
+
+		Var GetAccFlag = 1
+		GETACCEXT TelephoneNumber 19
+	Else
+
+		Var ShowErrorText2 = "Enable"
+		;Var TelephoneNumber = ""
+		Var Tel_Confirm_State = "Invisible"
+		Refresh
+
+	EndIf
+</Function2>
 
 
 
diff --git a/spiral/xml/page_spiral_payment_credit2.xml b/spiral/xml/page_spiral_payment_credit2.xml
index 8561cddf..a0d31fac 100644
--- a/spiral/xml/page_spiral_payment_credit2.xml
+++ b/spiral/xml/page_spiral_payment_credit2.xml
@@ -258,7 +258,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -302,7 +303,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -345,7 +347,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -388,7 +391,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -431,7 +435,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -474,7 +479,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -517,7 +523,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -560,7 +567,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -603,7 +611,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -685,7 +694,8 @@
 	Trim PinNumber 4
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowTextNumber = "Invisible"
 
@@ -767,7 +777,7 @@
 
 
 <Button>
-<X> 218 </X>
+<X> 397 </X>
 <Y> 1607 </Y>
 <Filename> Var( DirImage + "/bn_back.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>
@@ -779,60 +789,60 @@
 </Button>
 
 
-<Button>
-<X> 577 </X>
-<Y> 1607 </Y>
-<Refresh> "Enable" </Refresh>
-<State> Tel_Confirm_State </State>
-<Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
-<FilenameDisable> Var( DirImage + "/bn_confirm.png" )</FilenameDisable>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-		Var ShowSentSmsText = "Invisible"
-		Var Timeout = 0
-
-		If PinNumberUser = PinNumber Then
-
-			Var SumCreditAmount = CoffeeCredit
-
-			If SumCreditAmount >= PayAmount Then 
-
-				If ReqAdddata22 = 0 Then 
-					Var BmiYear = PayAmount
-					Var GetScore = "useCredit"
-					AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
-					Var ReqAdddata22 = 1
-				EndIf
-
-				
-			Else
-				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit3.xml" 
-			EndIf
-
-		Else
-
-			Var ShowErrorText = "Enable"
-			Var PinNumber = ""
-			Var ShowTextNumber1 = "Invisible"
-			Var ShowTextNumber2 = "Invisible"
-			Var ShowTextNumber3 = "Invisible"
-			Var ShowTextNumber4 = "Invisible"
-
-		EndIf
-
-		;Var DataTmp = TelephoneNumber + "/"
-		;Var DataTmp = DataTmp + PinNumber
-		;GETACCEXT DataTmp 19
-		Var ReqFlag = 0
-
-		Refresh
-    
-	
-</EventClick>
-</Button>
+;<Button>
+;<X> 577 </X>
+;<Y> 1607 </Y>
+;<Refresh> "Enable" </Refresh>
+;<State> Tel_Confirm_State </State>
+;<Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
+;<FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
+;<FilenameDisable> Var( DirImage + "/bn_confirm.png" )</FilenameDisable>
+;<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;
+;		Var ShowSentSmsText = "Invisible"
+;		Var Timeout = 0
+;
+;		If PinNumberUser = PinNumber Then
+;
+;			Var SumCreditAmount = CoffeeCredit
+;
+;			If SumCreditAmount >= PayAmount Then 
+;
+;				If ReqAdddata22 = 0 Then 
+;					Var BmiYear = PayAmount
+;					Var GetScore = "useCredit"
+;					AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+;					Var ReqAdddata22 = 1
+;				EndIf
+;
+;				
+;			Else
+;				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit3.xml" 
+;			EndIf
+;
+;		Else
+;
+;			Var ShowErrorText = "Enable"
+;			Var PinNumber = ""
+;			Var ShowTextNumber1 = "Invisible"
+;			Var ShowTextNumber2 = "Invisible"
+;			Var ShowTextNumber3 = "Invisible"
+;			Var ShowTextNumber4 = "Invisible"
+;
+;		EndIf
+;
+;		;Var DataTmp = TelephoneNumber + "/"
+;		;Var DataTmp = DataTmp + PinNumber
+;		;GETACCEXT DataTmp 19
+;		Var ReqFlag = 0
+;
+;		Refresh
+;    
+;	
+;</EventClick>
+;</Button>
 
 <Image>
 <X> 242 </X>
@@ -928,6 +938,51 @@
 
 
 
+<Function2>
+
+		Var ShowSentSmsText = "Invisible"
+		Var Timeout = 0
+
+		If PinNumberUser = PinNumber Then
+
+			Var SumCreditAmount = CoffeeCredit
+
+			If SumCreditAmount >= PayAmount Then 
+
+				If ReqAdddata22 = 0 Then 
+					Var BmiYear = PayAmount
+					Var GetScore = "useCredit"
+					AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+					Var ReqAdddata22 = 1
+				EndIf
+
+				
+			Else
+				Open "ROOT/taobin_project/spiral/xml/page_spiral_payment_credit3.xml" 
+			EndIf
+
+		Else
+
+			Var ShowErrorText = "Enable"
+			Var PinNumber = ""
+			Var ShowTextNumber1 = "Invisible"
+			Var ShowTextNumber2 = "Invisible"
+			Var ShowTextNumber3 = "Invisible"
+			Var ShowTextNumber4 = "Invisible"
+
+		EndIf
+
+		;Var DataTmp = TelephoneNumber + "/"
+		;Var DataTmp = DataTmp + PinNumber
+		;GETACCEXT DataTmp 19
+		Var ReqFlag = 0
+
+		Refresh
+
+
+</Function2>
+
+
 
 
 </Popup>
diff --git a/spiral/xml/z_android.pml b/spiral/xml/z_android.pml
deleted file mode 100644
index cd5155c6..00000000
--- a/spiral/xml/z_android.pml
+++ /dev/null
@@ -1 +0,0 @@
-<?hurr #system=~/Library/Android/sdk/platform-tools/adb push ~/thai02/coffeevending/taobin_project/spiral/xml /mnt/sdcard/coffeevending/taobin_project/spiral/; ?>