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

xml/page_brewing3.xml

@@ -227,7 +227,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -288,7 +288,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -406,7 +406,7 @@
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + SelectDrink 
 				Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + "C00"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + Seeker.CodeNumber
 				Var ECommerce =	ECommerce + "/"

xml/page_brewing3Conti.xml

@@ -130,7 +130,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -191,7 +191,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -309,7 +309,7 @@
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + SelectDrink 
 				Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + "C00"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + Seeker.CodeNumber
 				Var ECommerce =	ECommerce + "/"

xml/page_brewing3Multi.xml

@@ -226,7 +226,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -285,7 +285,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"
@@ -396,7 +396,7 @@
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + SelectDrink 
 				Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + "C00"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + Seeker.CodeNumber
 				Var ECommerce =	ECommerce + "/"

xml/page_payment_cash.xml

@@ -627,7 +627,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"

xml/page_payment_cashMore.xml

@@ -543,7 +543,7 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ECommerce =	ECommerce + "/"

xml/page_payment_code.xml

@@ -91,11 +91,17 @@
 
 	EndIf
 
+	Var Mode# = 0
+	Var Str# = ""
+	Var TelephoneNumber# = ""
+	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	;Open "ROOT/xml/page_board.xml" 
 
+	
+
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
 		;VendingQR OFF
@@ -166,7 +172,11 @@
 			Var Seeker.VendingCode = "C00" 
 		EndIf
 
-		If Seeker.VendingCode = "AIR" Then
+		If Seeker.VendingCode = "AIR:2" Then
+			Var Seeker.VendingCode = "C00" 
+		EndIf
+
+		If Seeker.VendingCode = "TWN:2" Then
 			Var Seeker.VendingCode = "C00" 
 		EndIf
 
@@ -366,6 +376,9 @@
 	Var TelephoneNumber = TelephoneNumber + "1"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -388,6 +401,9 @@
 	Var TelephoneNumber = TelephoneNumber + "2"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -410,6 +426,9 @@
 	Var TelephoneNumber = TelephoneNumber + "3"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -432,6 +451,9 @@
 	Var TelephoneNumber = TelephoneNumber + "4"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -454,6 +476,9 @@
 	Var TelephoneNumber = TelephoneNumber + "5"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -476,6 +501,9 @@
 	Var TelephoneNumber = TelephoneNumber + "6"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -498,6 +526,9 @@
 	Var TelephoneNumber = TelephoneNumber + "7"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -520,6 +551,9 @@
 	Var TelephoneNumber = TelephoneNumber + "8"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -542,6 +576,9 @@
 	Var TelephoneNumber = TelephoneNumber + "9"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	TimerReset
 	Refresh
 	StrLen TelephoneNumber TelNumLen
@@ -563,6 +600,9 @@
 	Var Timeout = 0
 	Var TelephoneNumber = TelephoneNumber + "0"
 	Trim TelephoneNumber 8
+
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 8 Then 
 		Var Tel_Confirm_State = "Enable"
@@ -575,6 +615,32 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 333 </X>
+<Y> 1432 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_sh.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_sh.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	;Var TelephoneNumber = TelephoneNumber + "0"
+	Trim TelephoneNumber 8
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen = 0 Then 
+		Var ShowTextNumber = "Invisible"
+		Var Mode# = 1
+		Var Str# = "#"
+
+		Var TelephoneNumber# = Str# + TelephoneNumber
+	EndIf
+	
+	TimerReset
+	Refresh
+	Var ShowErrorText = "Invisible"
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 620 </X>
@@ -586,14 +652,18 @@
 <EventClick> 
 	Var Timeout = 0
 	Trim TelephoneNumber  -1
-	Var Tel_Confirm_State = "Disable"
+	Var Tel_Confirm_State = "Invisible"
 	
 	StrLen TelephoneNumber TelNumLen
 	
 	If TelNumLen = 0 Then 
 		Var ShowTextNumber = "Enable"
+		Var Mode# = 0
+		Var Str# = ""
 	EndIf
 
+	Var TelephoneNumber# = Str# + TelephoneNumber
+
 	;Var ShowErrorText = "Invisible"
 	TimerReset
 	Refresh
@@ -630,7 +700,7 @@
 <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>
+<FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -677,7 +747,15 @@
 			Var ECommerce =	ECommerce + "/"
 			Var ECommerce =	ECommerce + SelectDrink 
 			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
+
+
+			If Mode# = 1 Then
+				Var ECommerce =	ECommerce + "S04"
+			Else
+				Var ECommerce =	ECommerce + "C00"
+			EndIf
+
+			
 	        Var ECommerce =	ECommerce + "/"
 	        Var ECommerce =	ECommerce + Seeker.CodeNumber
 			Var ServiceParameter = "max"
@@ -730,7 +808,7 @@
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
 <Refresh> "Enable" </Refresh>
-<Value> TelephoneNumber </Value>
+<Value> TelephoneNumber# </Value>
 </Text>