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

xml/page_board.xml

@@ -35,7 +35,7 @@
 
 	Var countClick = 0
 
-	Var RoadShow = "true"
+	Var RoadShow = "false"
 	Var IgnorePoint = "true"
 
 	Var CountDownShowButton = 30

xml/page_brewing2.xml

@@ -244,14 +244,47 @@
 				Var SessionID2 = SessionID2 + CodeNumber
 				Var SessionID2 = SessionID2 + "/"
 
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			Else
+				If CodeChannel = 2 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + ""
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + VendingCode
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + SelectDrink
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + BoxID
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + "S"
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				Else
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				EndIf
 			EndIf
 
+			
+		Else
+			If ChangeFlag2 = 1 Then
+				Var TelephoneNumber = "0899999999"
+				Var VendingDiscount = 0
+				Var VendingCampaign = 0
+				Var ServiceType = "credit"
+				Var SessionID2 = SelectDrink
+				Var ServiceCredit = "coffee"
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			EndIf
+			
+		EndIf
+
+
 		Var ServiceSuccess = "yes"
 		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
 	EndIf
 
 	If MachineState_Result = 2 Then
@@ -278,7 +311,16 @@
 						EndIf
 					Else
 
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
+						Else
+							If CodeChannel = 1 Then
 								Var ChangeOK = 4
+							Else
+								Var ChangeOK = 3
+							EndIf 
+							
+						EndIf
 					EndIf
 
 					
@@ -294,9 +336,13 @@
 							Change CoinAmount
 							
 						EndIf
+					Else
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
 						Else
 							Var ChangeOK = 3
 						EndIf
+					EndIf
 
 				Else
 
@@ -307,9 +353,13 @@
 							Change CoinAmount
 							
 						EndIf
+					Else
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
 						Else
 							Var ChangeOK = 4
 						EndIf
+					EndIf
 
 				EndIf
 

xml/page_payment.xml

@@ -28,8 +28,8 @@
     Var QRCODE3 = "VDGN"
     Var QRCODE4 = BoxID
     Var QRCODE5 = SelectSlot
-    Var QRCODE6 = ServiceCredit                
+    Var QRCODE6 = SelectDrink                
-    Var QRCODE7 = ServiceAmount2 
+    Var QRCODE7 = PriceDrink 
     Var QRCODE8 = ""
    
     Var CountStepPackPayment = 0

xml/page_payment_cash.xml

@@ -220,6 +220,7 @@
 			;Var VendingQRCode = "ERROR"
 			;Coin STANDBY
 			VendingQR OFF
+			CoinVending OFF
 			
 			;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 			MakeDrinkV1  SelectDrink SelectSugarID
@@ -336,7 +337,7 @@
 	If CancelFlag = 1 Then
 
 		Var CancelCounter = CancelCounter + 1
-		If CancelCounter = 3 Then
+		If CancelCounter = 2 Then
 			;Change CoinAmount
 			If CoinAmount > 0 Then
 				Change CoinAmount
@@ -414,7 +415,7 @@
 	TimerReset
 
 	If CoinInFlag = 0 Then
-		VendingQR OFF
+		;VendingQR OFF
 	EndIf
 
 	Var CoinInFlag = 1
@@ -427,6 +428,7 @@
 		If SumCoinAmount >= PayAmount Then 
 			;Var VendingQRCode = "ERROR"
 			CoinVending OFF
+			VendingQR OFF
 			Var Canout = SumCoinAmount - PayAmount
 			If Canout = 0 Then
 				Var RemainAmountStr = 0
@@ -461,9 +463,9 @@
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
-			If CoinAmount = 0 Then
+			;If CoinAmount = 0 Then
-				Open "ROOT/taobin_project/xml/page_catalog.xml"  
+			;	Open "ROOT/taobin_project/xml/page_catalog.xml"  
-			EndIf
+			;EndIf
 
 			Var showRemaining = "คืนเงิน"
 			;Open "ROOT/taobin_project/xml/page_catalog.xml"
@@ -553,11 +555,11 @@
 <EventClick> 
 	
 	If CoinInFlag = 0 Then
-
+		If CancelFlag = 0 Then
 		Var TelephoneNumber = ""
 		Var Tel_Confirm_State = "Disable"
     	Open "ROOT/taobin_project/xml/page_payment_code.xml" 
-
+		EndIf
 	EndIf
 </EventClick>
 </Button>
@@ -573,6 +575,7 @@
 <EventClick> 
 
 	If CoinInFlag = 0 Then
+		If CancelFlag = 0 Then
 		Var alphaState = "Enable"
 		;CoinVending OFF
 		VendingQR ON
@@ -587,6 +590,7 @@
 					
 		EndIf
 		EndIf
+	EndIf
 
 ;	If CoinInFlag = 0 Then
 ;		Var BG_Menu_Page4 =  "ROOT/image/BG_PromptPay_Page4.bmp"
@@ -618,11 +622,7 @@
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
-			If CoinAmount = 0 Then
+			
-				If IntVendingCampaign = 0 Then
-					Open "ROOT/taobin_project/xml/page_catalog.xml"  
-				EndIf
-			EndIf
         EndIf
 	EndIf
 
@@ -655,6 +655,8 @@
 <Value> showRemaining </Value>
 </Text>
 
+
+
 <Text>
 <X> 0 </X>
 <Y> 938 </Y>

xml/page_payment_code.xml

@@ -16,7 +16,7 @@
     Var CodeChannel = 0
 
 	;Var VendingQRCode = "ERROR"
-	VendingQR ON
+	;VendingQR ON
 	;Var QRCODE99 = ""
 	
 	;CoinVending OFF
@@ -38,14 +38,41 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		VendingQR OFF
+		;VendingQR OFF
-        Open menu_back_to_main 
+        ;Open menu_back_to_main 
+
+		Var PayState1 = "PressForever"
+		Var PayState2 = "Enable"
+		Var QRChannel = 0
+		Var CodeChannel = 0
+		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+
 	EndIf
 
 	TimerReset
 	Refresh
 </EventTimeout> 
 
+<EventIDCard>
+	
+
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "START" Then
+			CoinVending OFF
+			Open "ROOT/taobin_project/xml/page_show_consent2.xml" 
+			EndIf
+		EndIf
+	EndIf
+
+
+	
+
+
+
+</EventIDCard>
+
+
 <EventActionOk>
 	
 
@@ -64,10 +91,18 @@
 			Var QRChannel = 0
 
 			If IntVendingCampaign >= PayAmount Then 
-				Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+				;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+				Var FreeVendingCampaign = 1
+				CoinVending OFF
+            	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
+		    	MakeDrinkV1  SelectDrink SelectSugarID
+		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 
 
+			
+			
+
 			Var SessionID2 = SelectSlot + ":"
 			Var SessionID2 = SessionID2 + ExtendData
 
@@ -109,24 +144,28 @@
 			Var FreeVendingCampaign = 1
 
 			If VendingCode = "C13" Then
+				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 
 			If VendingCode = "C24" Then
+				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 
 			If VendingCode = "C25" Then
+				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 
 			If VendingCode = "C30" Then
+				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 

xml/page_show_consent2.xml

@@ -0,0 +1,209 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	
+
+	Var Timeout = 0
+	SAVELOG show_eng
+	
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/consent_en/"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/consent/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+
+    Var AcceptFlag = 0 
+	Var AcceptState = "Disable"
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+        ; goto lid straw
+		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<EventMachine>
+</EventMachine>
+
+<EventActionOk>
+
+        Var IDValid = ""
+
+        SPLIT  Ext1a "|"  1  IDValid
+
+		If IDValid = "ok" Then
+
+            Var FreeVendingCampaign = 1
+            Var VendingCode = "C31"
+            Var CodeChannel = 2
+            Var CodeNumber = IDNum
+		    MakeDrinkV1  SelectDrink SelectSugarID
+		   	Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			
+		Else
+            
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+		EndIf
+	
+    Refresh
+</EventActionOk>
+
+<EventIDCard>
+	
+
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "DONE" Then
+			Var AcceptState = "Enable"
+			EndIf
+		EndIf
+	EndIf
+
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "ERROR" Then
+			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+			EndIf
+		EndIf
+	EndIf
+
+
+	
+
+
+
+</EventIDCard>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup1.png") </Filename>
+</Image>
+
+
+<Button>
+<X> 577 </X>
+<Y> 1679 </Y>
+<State> AcceptState</State>
+<Filename> Var( DirImage + "/bn_accept.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+    If AcceptFlag = 0 Then
+
+        Var AcceptFlag = 1
+
+        Var ACCID = IDNum + "|" 
+		Var ACCID = ACCID + ""
+		Var ACCID = ACCID + "|"
+		Var ACCID = ACCID + IDFullNameEng
+		Var ACCID = ACCID + "|"
+		Var ACCID = ACCID + IDFullNameThai
+		Var ACCID = ACCID + "|"
+		Var ACCID = ACCID + IDGender
+		Var ACCID = ACCID + "|"
+		Var ACCID = ACCID + IDBirthdate
+		Var ACCID = ACCID + "|"
+		Var ACCID = ACCID + IDAddress
+
+		GETACCEXT ACCID 12
+
+        Var Timeout = 0
+
+    EndIf
+			
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 218 </X>
+<Y> 1679 </Y>
+<Filename> Var( DirImage + "/bn_decline.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_decline.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; goto lid straw
+	Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+</EventClick>
+</Button>
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+		
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+</Image>
+;
+
+			
+
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+</Image>
+;
+;
+
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> AcceptFlag </Value>
+</Text>
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>

xml/page_thankyou.xml

@@ -15,6 +15,7 @@
 	Var ErrTimeout = 0
 	Var ActionOKCase = 0
 	Var ChangeTimeout = 0
+	Var ChangeFlag2 = 0
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -24,6 +25,7 @@
 
 	Var Timeout = Timeout + 1 
 	If Timeout = 3 Then
+		If PayWithQR = 0 Then
 			If FreeVendingCampaign = 0 Then
 				If IntVendingCampaign < PayAmount Then 
 					Var SumCoinAmount = CoinAmount + IntVendingCampaign
@@ -31,6 +33,7 @@
 						Var Canout = SumCoinAmount - PayAmount
 						If Canout > 0 Then
 							Change Canout	
+							Var ChangeFlag2 = 1
 						EndIf
 					EndIf
 				EndIf
@@ -39,6 +42,16 @@
 				Var Canout = CoinAmount
 				If Canout > 0 Then
 					Change Canout	
+					Var ChangeFlag2 = 1
+				EndIf
+
+			EndIf
+		Else
+
+			Var Canout = CoinAmount
+			If Canout > 0 Then
+				Change Canout	
+				Var ChangeFlag2 = 1
 			EndIf
 
 		EndIf