..

xml/page_back_to_main.xml

@@ -9,6 +9,22 @@
 
 	TopView "hide"
 
+	If TNumberTaobinMember = "" Then
+
+	Else
+		If PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		EndIf 	
+
+		Var BmiYear = PointTaobinStr
+		Var PointCrm = "pdpa1"
+		Var GetScore = VendingTSID
+		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		Var TNumberTaobinMember = ""
+		Var VendingTSID = ""
+
+	EndIf
+	
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
 
 

xml/page_board.xml

@@ -11,7 +11,7 @@
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
 	Var FileNumber = 1
 
-	Var taobin_version = "1.13"
+	Var taobin_version = "1.18"
 	; 1.00 is 
 
 	; On open
@@ -20,7 +20,6 @@
 	Var charOfBaht = "฿"
 	Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
 	Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
-
 	Var KanitBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Bold.ttf"
 
 	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
@@ -46,7 +45,7 @@
 	Var ShowButtonClick = "Enable"
 	Var ShowButtonClickFull = "Invisible"
 
-	SAVELOG DisplayType
+	;SAVELOG DisplayType
 
 	If DisplayType = "2" Then
 		Var XPosiShowCountDownBrew = 693
@@ -64,14 +63,17 @@
 
 	EndIf
 
+	If NeedUpgrade = "true" Then
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+	EndIf
 	
 
 	Var TestLoopMakeDrink = 0
 	Var TestLoopSuccess = 0
 	Var TestLoopFailed = 0
 
-	Var IgnoreNetCore = "false"
+	;Var IgnoreNetCore = "false"
-	SAVELOG SaleProfile
+	;SAVELOG SaleProfile
 
 	STRCONTAIN "whey" SaleProfile WheyShow 
 	STRCONTAIN "cocktail" SaleProfile CocktailShow 
@@ -83,13 +85,25 @@
 		Var ShowPrice = "Invisible"
 	EndIf
 
-	SAVELOG WheyShow
+	;SAVELOG WheyShow
-	SAVELOG CocktailShow
+	;SAVELOG CocktailShow
-	SAVELOG RoadShow
+	;SAVELOG RoadShow
-	SAVELOG ShowPrice
+	;SAVELOG ShowPrice
 
 
 	Var CountDownShowButton = 35
+	Var CountDownPauseVideo = 0
+	Var NextPage = "-"
+
+	If StartUpExt = "false" Then
+
+	Else
+		Machine Initial
+		Var StartUpExt = "false"
+	EndIf
+	
+	StopLongPlay
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -128,9 +142,15 @@
 	EndIf
 
 
+	If NeedUpgrade = "true" Then
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+	EndIf
+
+	If CountDownShowButton > 0 Then
 		Var CountDownShowButton = CountDownShowButton - 1
+	EndIf
 
-
+	;SAVELOG MachineStage
 	;SAVELOG CountDownShowButton
 	;SAVELOG ShowButtonClickFull
 	
@@ -147,13 +167,29 @@
 		Refresh
 	EndIf
 
+	If CountDownPauseVideo > 0 Then
+		; ignore
+		;Var CountDownPauseVideo = CountDownPauseVideo - 1
+		If CountDownPauseVideo  = 0 Then
+
+			Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml"
+			
+			TopView "show"
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+
+		EndIf
+	EndIf
 
 	TimerReset
 </EventTimeout> 
 
 <EventEnd> 
-	SAVELOG ShowButtonClick
+	;SAVELOG ShowButtonClick
 	Var CountDownShowButton = 35
+	Var CountDownPauseVideo = 6
 	Refresh
 </EventEnd> 
 
@@ -172,8 +208,8 @@
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
-;<Volume> 80 </Volume>
 <Loop>"true"</Loop>
+;<Volume> 80 </Volume>
 <Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
 </Video>
 
@@ -230,7 +266,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_board.xml" 
+
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml"
+	
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+	
 
 </EventClick>
 </Button>

xml/page_brewing3.xml

@@ -23,10 +23,20 @@
 		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
 	EndIf
 
+
+	Var waitAckPay = 0
+	Var VendingTSIDTmp = ""
+	If PayWithQR = 1 Then
+		Var VendingTSIDTmp = VendingTSID
+	EndIf
+
+
 </EventOpen>
 
 
 <EventActionOk>
+
+	
 	If ActionOKCase = 1 Then
 		If CodeChannel = 1 Then 
 			Var SessionID2 = SelectSlot + ":"
@@ -64,6 +74,7 @@
 			Var ActionOKCase = 2
 			
 		Else 
+
 			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
 		EndIf
        
@@ -74,6 +85,12 @@
 		EndIf
 
 	EndIf
+
+	If waitAckPay = 1 Then	
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	EndIf
+
+
 </EventActionOk>
 
 <EventActionError>
@@ -158,31 +175,56 @@
 		Var ChangeTimeout = ChangeTimeout + 1
 	EndIf
 
+	If  waitAckPay = 1 Then  
+		If Timeout > 60 Then
+			Var VendingTSID = ""
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
+		EndIf
+	EndIf
+
 
 	If  ChangeOK = 2 Then
 		If ActionOKCase = 0 Then
+
+			If TNumberTaobinCredit = "" Then
 				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
+			
 			Var VendingDiscount = 0
 			Var VendingCampaign = 0
 			Var ServiceType = "credit"
 			Var SessionID2 = SelectDrink
 			Var ServiceCredit = "coffee"
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-			;Open "ROOT/xml/page_closeMaintenance.xml" 
+			
 			Var ActionOKCase = 1
 		EndIf
 	EndIf
 
 	If  ChangeTimeout > 30 Then
 		If ActionOKCase = 0 Then
+			If TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
 			Var VendingDiscount = 0
 			Var VendingCampaign = 0
-			Var TelephoneNumber = "0899999999"
+			;Var TelephoneNumber = "0899999999"
 			Var ServiceType = "credit"
 			Var SessionID2 = SelectDrink
 			Var ServiceCredit = "coffee"
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-			;Open "ROOT/xml/menu_closeMaintenance.xml" 
+			
 			Var ActionOKCase = 1
 		EndIf
 	EndIf
@@ -229,10 +271,22 @@
 
 
 	If MachineState_Result = 1 Then
+
+		If  waitAckPay = 0 Then 
+
+			Var waitAckPay = 1 
 			Var Timeout = 0
 			Var ProcessText = "" 
 
+			If TNumberTaobinCredit = "" Then
 				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+			Else
+				Var TelephoneNumber = TNumberTaobinCredit
+				Var PayO2 = CoffeePinNumber
+			EndIf
+
+			
 			Var ServiceType = "coffee"
 			Var ServiceCredit = SelectDrink
 			Var SuggestID  = ""
@@ -286,13 +340,36 @@
 					Var SessionID2 = SelectDrink
 					Var ServiceCredit = "coffee"
 					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-			EndIf
+				Else
+
+					If StoreCreditFlag = 1 Then
+
+
+						Var VendingDiscount = 0
+						Var VendingCampaign = 0
+						Var ServiceType = "credit"
+						Var SessionID2 = SelectDrink
+						Var ServiceCredit = "coffee"
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+					Else
+
+						;no wait ack pay
+						Var waitAckPay = 0 
 
 					EndIf
 					
 					
+				EndIf
+				
+			EndIf
+		EndIf
+
 		Var ServiceSuccess = "yes"
+		If  waitAckPay = 0 Then
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		EndIf
 
 	EndIf
 
@@ -306,7 +383,12 @@
 				If CodeChannel = 0 Then
 					If ChangeFlag = 0 Then
 						Var ChangeFlag = 1 
+
+						If StoreCreditFlag = 1 Then
+							Var ChangeOK = 2
+						Else
 							Change ServiceAmount2
+						EndIf
 						
 					EndIf
 				Else
@@ -315,7 +397,12 @@
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
 							Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
+
+							If StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
 								Change ServiceAmount2
+							EndIf
 							
 						EndIf
 					Else
@@ -342,7 +429,11 @@
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
 							Var ServiceAmount2 = CoinAmount
-							Change CoinAmount
+							If StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount2
+							EndIf
 							
 						EndIf
 					Else
@@ -359,7 +450,11 @@
 						If ChangeFlag = 0 Then
 							Var ChangeFlag = 1 
 							Var ServiceAmount2 = CoinAmount
-							Change CoinAmount
+							If StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount2
+							EndIf
 							
 						EndIf
 					Else

xml/page_catalog.xml

@@ -223,7 +223,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	;Open "ROOT/xml/service_menu.xml" 
+	Open "ROOT/taobin_project/xml/page_check_member.xml" 
 	
 </EventClick>
 </Button>

xml/page_collect_point_1.xml

@@ -20,6 +20,11 @@
 		Var DirImage = "ROOT/taobin_project/image/collect_point1"
 	EndIf
 
+	Var number7 = ""
+	Var number8 = ""
+	Var number9 = ""
+	Var number10 = ""
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -86,6 +91,23 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "1"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "1"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "1"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "1"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -106,6 +128,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "2"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "2"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "2"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "2"
+	EndIf
 </EventClick>
 </Button>
 
@@ -126,6 +164,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "3"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "3"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "3"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "3"
+	EndIf
 </EventClick>
 </Button>
 
@@ -146,6 +200,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "4"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "4"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "4"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "4"
+	EndIf
 </EventClick>
 </Button>
 
@@ -166,6 +236,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "5"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "5"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "5"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "5"
+	EndIf
 </EventClick>
 </Button>
 
@@ -186,6 +272,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "6"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "6"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "6"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "6"
+	EndIf
 </EventClick>
 </Button>
 
@@ -206,6 +308,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "7"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "7"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "7"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "7"
+	EndIf
 </EventClick>
 </Button>
 
@@ -226,6 +344,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "8"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "8"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "8"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "8"
+	EndIf
 </EventClick>
 </Button>
 
@@ -246,6 +380,22 @@
 	If TelNumLen >= 10 Then 
 		Var Tel_Confirm_State = "Enable"
 	EndIf
+
+	If TelNumLen = 7 Then
+		Var number7 = "9"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "9"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "9"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "9"
+	EndIf
 </EventClick>
 </Button>
 
@@ -269,6 +419,21 @@
 	TimerReset
 	Refresh
 	
+	If TelNumLen = 7 Then
+		Var number7 = "0"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "0"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "0"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "0"
+	EndIf
 </EventClick>
 </Button>
 
@@ -364,7 +529,7 @@
 <Image>
 <X> 236 </X>
 <Y> 699 </Y>
-<Filename> Var( DirImage + "/text_1.png") </Filename>
+<Filename> Var( DirImage + "/text_2.png") </Filename>
 </Image>
 
 ; Advertise

xml/page_collect_point_2.xml

@@ -16,30 +16,23 @@
 		Open "ROOT/taobin_project/xml/page_show_consent.xml"
 	EndIf
 
+	Var TaobinLevel = 0
+		
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	Var CountDownBrewing = CountDownBrewing - 1
 	
-	; run test;
-	;If CountDownBrewing = 40 Then 
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
-	;EndIf
-	;If CountDownBrewing = 0 Then
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	;EndIf
-
 	Var ShowCountDownBrewing = CountDownBrewing
 
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-        ;Var CoffeePoint = 1 
-		;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
       
 		If StepGetPoint = 0 Then
 			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		Else
+			Var TaobinLevel = 0
 			Var CoffeePoint = 1 
 			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 		EndIf
@@ -65,22 +58,57 @@
 			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		Else
 			Var StepGetPoint = 1
-    		GETACCEXT TelephoneNumber 5
+    		GETACCEXT TelephoneNumber 14
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 		EndIf
 	Else
 		If Ext1a = "" Then
-			Var CoffeePoint = 1 
+			Var CoffeePoint = 0 
 			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 			
 		Else
 
-			Var CoffeePoint1 = Ext27
+			If Ext1a = "ok" Then
+
+				Var TaobinName = Ext1d
+				Var TaobinCoupons = Ext1g
+				Var TaobinExpire = Ext1f
+
+				Var TNumberTaobinMemberXXX = TelephoneNumber
+
+				Trim TNumberTaobinMemberXXX 3
+				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-"
+				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7
+				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8
+				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9
+				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
+
+
+				Var PointTaobin = PayAmount / 20
+
+
+				Var PointTaobinStr = "" + PointTaobin
+				Var PointTaobinStr = PointTaobinStr + "/"
+				Var PointTaobinStr = PointTaobinStr + PointTaobin
+				
+
+				Var CoffeePointRank = Ext1b
+				INT CoffeePointRank
+
+				Var CoffeePoint1 = Ext1c
 				INT CoffeePoint1
 			
-			Var CoffeePoint = 1 + CoffeePoint1
+				Var CoffeePoint = PointTaobin + CoffeePoint1
 				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 
+			Else
+				Var CoffeePoint = 0 
+				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+			EndIf
+			
+	
+			
+
 		EndIf
 	EndIf
 

xml/page_collect_point_3.xml

@@ -10,12 +10,13 @@
 
 	Var Timeout = 0
 	;CoffeePoint
-	;Var CoffeePoint = 5
+	;Var CoffeePoint = 30
     Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
     Var PointCrm = "pdpa1"
     Var GetScore = ""
-	AddData 4 TelephoneNumber  BmiYear PointCrm GetScore
+	Var TNumberTaobinMember = TelephoneNumber
-
+	;AddData 4 TelephoneNumber  BmiYear PointCrm GetScore
+	;Add after pay
 
     Var CoffeePointStr = CoffeePoint
 
@@ -30,78 +31,120 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 	
-	Var stamp1 = "ROOT/taobin_project/image/display_point_en/btp_stamp_1.png"
+	Var CoffeePointTmp = CoffeePoint
 
-	If CoffeePoint >= 2 Then
+	If CoffeePoint > 29 Then
-		Var stamp2  = "ROOT/taobin_project/image/display_point_en/btp_stamp_2.png"
+		Var Timeout = 18
-	Else
+		Var CoffeePointTmp = 30
-		Var stamp2  = "ROOT/taobin_project/image/display_point/btn_stamp_2.png"
-	EndIf
-	
-	If CoffeePoint >= 3 Then
-		Var stamp3  = "ROOT/taobin_project/image/display_point_en/btp_stamp_3.png"
-	Else
-		Var stamp3  = "ROOT/taobin_project/image/display_point/btn_stamp_3.png"
-	EndIf
-	
-	If CoffeePoint >= 4 Then
-		Var stamp4  = "ROOT/taobin_project/image/display_point_en/btp_stamp_4.png"
-	Else
-		Var stamp4  = "ROOT/taobin_project/image/display_point/btn_stamp_4.png"
-	EndIf
-	
-	If CoffeePoint >= 5 Then
-		Var stamp5  = "ROOT/taobin_project/image/display_point_en/btp_stamp_5.png"
-	Else
-		Var stamp5  = "ROOT/taobin_project/image/display_point/btn_stamp_5.png"
-	EndIf
-	
-	If CoffeePoint >= 6 Then
-		Var stamp6  = "ROOT/taobin_project/image/display_point_en/btp_stamp_6.png"
-	Else
-		Var stamp6  = "ROOT/taobin_project/image/display_point/btn_stamp_6.png"
-	EndIf
-	
-	If CoffeePoint >= 7 Then
-		Var stamp7  = "ROOT/taobin_project/image/display_point_en/btp_stamp_7.png"
-	Else
-		Var stamp7  = "ROOT/taobin_project/image/display_point/btn_stamp_7.png"
-	EndIf
-
-	If CoffeePoint >= 8 Then
-		Var stamp8  = "ROOT/taobin_project/image/display_point_en/btp_stamp_8.png"
-	Else
-		Var stamp8  = "ROOT/taobin_project/image/display_point/btn_stamp_8.png"
-	EndIf
-	
-	If CoffeePoint >= 9 Then
-		Var stamp9  = "ROOT/taobin_project/image/display_point_en/btp_stamp_9.png"
-	Else
-		Var stamp9  = "ROOT/taobin_project/image/display_point/btn_stamp_9.png"
 	EndIf
 
 	
-	If CoffeePoint >= 10 Then
+	Var pImage = CoffeePointTmp * 20
-		Var stamp10  = "ROOT/taobin_project/image/display_point_en/btp_stamp_10.png"
+	Var pImage = pImage / 30
-	Else
+	Var pImageStr = "/taobinP" 
-		Var stamp10  = "ROOT/taobin_project/image/display_point/btn_stamp_10.png"
+	Var pImageStr = pImageStr + pImage
+	
+	Var pImageStr = pImageStr + ".png"
+
+	Var pointStr = ""
+	Var pointStr = pointStr + CoffeePointTmp
+	Var pointStr = pointStr + "/"
+	Var pointStr = pointStr + "30"
+
+
+	Var PointDiff = 400 - CoffeePointRank
+
+	Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเดิน จนถึง "
+	Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " 
+
+	Var TaobinLevelDesc2 = TaobinLevelDesc2 +  PointDiff
+	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง ก่อน "
+
+
+	Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ "
+	Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
+	Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ"
+
+
+	Var TaobinExpireDay = ""
+	Var TaobinExpireMonth = ""
+	Var TaobinExpireYear = ""
+
+	
+
+	SPLIT  TaobinExpire "/"  1  TaobinExpireDay
+	SPLIT  TaobinExpire "/"  2  TaobinExpireMonth
+	SPLIT  TaobinExpire "/"  3  TaobinExpireYear
+
+	If TaobinExpireMonth = "01" Then
+		Var TaobinExpireMonth = "ม.ค."
 	EndIf
 
-	If CoffeePoint >= 11 Then
+	If TaobinExpireMonth = "02" Then
-		Var stamp11  = "ROOT/taobin_project/image/display_point_en/btp_stamp_11.png"
+		Var TaobinExpireMonth = "ก.พ."
-	Else
-		Var stamp11  = "ROOT/taobin_project/image/display_point/btn_stamp_11.png"
 	EndIf
 
-
+	If TaobinExpireMonth = "03" Then
-	Var stamp_free = "ROOT/taobin_project/image/display_point/btp_stamp_free.png"
+		Var TaobinExpireMonth = "มี.ค."
-
-	If CoffeePoint == 11 Then
-		Var Timeout = 8
 	EndIf
 
-	; for test
+	If TaobinExpireMonth = "04" Then
-	;Var CoffeePoint = CoffeePoint + 1
+		Var TaobinExpireMonth = "เม.ย."
+	EndIf
+
+	If TaobinExpireMonth = "05" Then
+		Var TaobinExpireMonth = "พ.ค."
+	EndIf
+
+	If TaobinExpireMonth = "06" Then
+		Var TaobinExpireMonth = "มิ.ย."
+	EndIf
+
+	If TaobinExpireMonth = "07" Then
+		Var TaobinExpireMonth = "ก.ค."
+	EndIf
+
+	If TaobinExpireMonth = "08" Then
+		Var TaobinExpireMonth = "ส.ค."
+	EndIf
+
+	If TaobinExpireMonth = "09" Then
+		Var TaobinExpireMonth = "ก.ย."
+	EndIf
+
+	If TaobinExpireMonth = "10" Then
+		Var TaobinExpireMonth = "ต.ค."
+	EndIf
+
+	If TaobinExpireMonth = "11" Then
+		Var TaobinExpireMonth = "พ.ย."
+	EndIf
+
+	If TaobinExpireMonth = "12" Then
+		Var TaobinExpireMonth = "ธ.ค."
+	EndIf
+
+	INT TaobinExpireYear
+	INT TaobinExpireDay
+
+	Var TaobinExpireYear = TaobinExpireYear + 543
+
+
+	Var ExpireStrTmp = ""
+	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
+	Var ExpireStrTmp = ExpireStrTmp + " "
+	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth
+	Var ExpireStrTmp = ExpireStrTmp + " "
+	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
+
+	Var TaobinLevelDesc1 = TaobinLevelDesc1 + ExpireStrTmp
+	Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp
+	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " เพื่อเลื่อนขั้นเป็นเต่าบิน"
+
+	
+
+
+	
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -109,22 +152,19 @@
 
 	Var CountDownBrewing = CountDownBrewing - 1
 	
-	; run test;
+	
-	;If CountDownBrewing = 40 Then 
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
-	;EndIf
-	;If CountDownBrewing = 0 Then
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	;EndIf
 
 	Var ShowCountDownBrewing = CountDownBrewing
 
-	;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+	
 
 	Var Timeout = Timeout + 1
-	If Timeout > 10 Then
+	If Timeout > 30 Then
+
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
     	; goto lid straw
-    	If CoffeePoint == 11 Then
+    	If CoffeePoint > 29 Then
 			Open "ROOT/taobin_project/xml/page_display_get_free.xml"
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -144,8 +184,7 @@
 </EventSecurity>
 
 <EventActionOk>
-	;
+	;Open "ROOT/taobin_project/xml/page_check_member2.xml"
-
 </EventActionOk>
 
 
@@ -182,91 +221,53 @@
 
 
 ;
+
+
+
 <Image>
 <X> 158 </X>
 <Y> 665 </Y>
 <Filename> Var( DirImage + "/img_popup1.png" )</Filename>
 </Image>
 
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup3.png" )</Filename>
+</Image>
+
+
+<Image>
+<X> 243 </X>
+<Y> 722 </Y>
+<Filename> Var( DirImage + "/text5.png" )</Filename>
+</Image>
+
+<Image>
+<X> 243 </X>
+<Y> 857 </Y>
+<Filename> Var( DirImage + "/text4.png" )</Filename>
+</Image>
+
+
+<Image>
+<X> 624 </X>
+<Y> 734 </Y>
+<Filename> Var( DirImage + "/taoLevel1.png" )</Filename>
+</Image>
 ;
-<Image>
+
-<X> 253 </X>
-<Y> 992 </Y>
-<Filename> stamp1 </Filename>
-</Image>
 
 <Image>
-<X> 445 </X>
+<X> 252 </X>
-<Y> 992 </Y>
+<Y> 1341 </Y>
-<Filename> stamp2 </Filename>
+<Filename> Var( DirImage + pImageStr )</Filename>
 </Image>
 
-<Image>
-<X> 637 </X>
-<Y> 992 </Y>
-<Filename> stamp3 </Filename>
-</Image>
-
-;
-<Image>
-<X> 253 </X>
-<Y> 1152 </Y>
-<Filename> stamp4 </Filename>
-</Image>
-
-<Image>
-<X> 445 </X>
-<Y> 1152 </Y>
-<Filename> stamp5 </Filename>
-</Image>
-
-<Image>
-<X> 637 </X>
-<Y> 1152 </Y>
-<Filename> stamp6 </Filename>
-</Image>
-
-;
-<Image>
-<X> 253 </X>
-<Y> 1322 </Y>
-<Filename> stamp7 </Filename>
-</Image>
-
-<Image>
-<X> 445 </X>
-<Y> 1322 </Y>
-<Filename> stamp8 </Filename>
-</Image>
-
-<Image>
-<X> 637 </X>
-<Y> 1322 </Y>
-<Filename> stamp9 </Filename>
-</Image>
-
-;
-<Image>
-<X> 253 </X>
-<Y> 1463 </Y>
-<Filename> stamp10 </Filename>
-</Image>
-
-<Image>
-<X> 445 </X>
-<Y> 1463 </Y>
-<Filename> stamp11 </Filename>
-</Image>
-
-<Image>
-<X> 637 </X>
-<Y> 1463 </Y>
-<Filename> stamp_free </Filename>
-</Image>
 
 
 <Button>
-<X> 397 </X>
+<X> 560 </X>
 <Y> 1680 </Y>
 <Filename> Var( DirImage + "/bn_close.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
@@ -274,11 +275,32 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 253 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_check.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_check.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+
+	AddData 11 "0617944956"  "3330/3330" "" ""
+
+	;GETACCEXT TelephoneNumber 15
+	
+
+</EventClick>
+</Button>
+
 ;<Text>
 ;<X> 420 </X>
 ;<Y> 638 </Y>
@@ -301,6 +323,80 @@
 ;<Value> CoffeePoint </Value>
 ;</Text>
 
+<Text>
+<X> 250 </X>
+<Y> 1241 </Y>
+<Width> 434 </Width>
+<Size> 64 </Size>
+<Font> KanitSemiBoldTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> pointStr </Value>
+</Text>
+
+
+
+<Text>
+<X> 250 </X>
+<Y> 745 </Y>
+<Size> 35 </Size>
+<Width> 1000 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> TaobinName </Value>
+</Text>
+
+<Text>
+<X> 250 </X>
+<Y> 800 </Y>
+<Size> 20 </Size>
+<Width> 1000 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> TNumberTaobinMemberXXX </Value>
+</Text>
+
+<Text>
+<X> 250 </X>
+<Y> 890 </Y>
+<Size> 50 </Size>
+<Width> 120 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> CoffeePointRank </Value>
+</Text>
+
+<Text>
+<X> 250 </X>
+<Y> 990 </Y>
+<Size> 25 </Size>
+<Width> 1000 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> TaobinLevelDesc1 </Value>
+</Text>
+
+<Text>
+<X> 250 </X>
+<Y> 1020 </Y>
+<Size> 20 </Size>
+<Width> 1000 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> TaobinLevelDesc2 </Value>
+</Text>
+
+<Text>
+<X> 300 </X>
+<Y> 1500 </Y>
+<Size> 25 </Size>
+<Width> 1000 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> TaobinLevelDesc3 </Value>
+</Text>
+
+
+
 ;
 <Image>
 <X> 751 </X>
@@ -320,5 +416,7 @@
 </Text>
 
 
+
+
 </Popup>
 	

xml/page_display_get_free.xml

@@ -16,23 +16,22 @@
 		Var DirImage = "ROOT/taobin_project/image/display_get_free"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
+
+	Var TaobinLevel = 0
+
+	Var MemberState1 = "Enable"
+	Var MemberState2 = "Invisible"
+	 
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 
 	Var CountDownBrewing = CountDownBrewing - 1
 	
-	; run test;
-	;If CountDownBrewing = 40 Then 
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
-	;EndIf
-	;If CountDownBrewing = 0 Then
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	;EndIf
 	
 	Var ShowCountDownBrewing = CountDownBrewing
 
-	;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+	
 
 	Var Timeout = Timeout + 1
 	If Timeout > 10 Then
@@ -93,14 +92,22 @@
 <Image>
 <X> 158 </X>
 <Y> 665 </Y>
+<State> MemberState1 </State>
 <Filename> Var( DirImage + "/img_popup1.png" )</Filename>
 </Image>
 
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> MemberState2 </State>
+<Filename> Var( DirImage + "/img_popup2.png" )</Filename>
+</Image>
+
 
 <Button>
 <X> 397 </X>
 <Y> 1680 </Y>
-<Filename> Var( DirImage + "/bp_accept.png" ) </Filename>
+<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>
@@ -112,22 +119,22 @@
 </Button>
 
 ;
-<Image>
+;<Image>
-<X> 751 </X>
+;<X> 751 </X>
-<Y> 413 </Y>
+;<Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+;<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
-</Image>
+;</Image>
 ;
-<Text>
+;<Text>
-<X> XPosiShowCountDownBrew </X>
+;<X> XPosiShowCountDownBrew </X>
-<Y> 470 </Y>
+;<Y> 470 </Y>
-<Align> End </Align>
+;<Align> End </Align>
-<Width> 153 </Width>
+;<Width> 153 </Width>
-<Size> 88 </Size>
+;<Size> 88 </Size>
-<Font> RobotoBold </Font>
+;<Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+;<Color> 0x513C2F </Color>
-<Value> ShowCountDownBrewing </Value>
+;<Value> ShowCountDownBrewing </Value>
-</Text>
+;</Text>
 
 
 </Popup>

xml/page_drinkfail.xml

@@ -23,63 +23,7 @@
 <Timeout> 800 </Timeout>
 <EventTimeout> 
 	
-	If  ChangeOK = 2 Then
-		If ActionOKCase = 0 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
-			;Open "ROOT/xml/page_closeMaintenance.xml" 
-			Var ActionOKCase = 1
-		EndIf
-	EndIf
 	 
-	If ChangeOK = 3 Then
-		Var Change3Timeout = Change3Timeout + 1
-		If  Change3Timeout > 3 Then
-			Open "ROOT/xml/page_closeMaintenance.xml" 
-		EndIf
-	EndIf
-
-	If ChangeOK = 4 Then
-		If ActionOKCase = 0 Then
-			Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + sugarID
-			Var SessionID2 = SessionID2 + "000"
-			Var CreditAmount1 = ""
-			Var ServiceAmountFlow = ""
-			Var TelephoneNumber = "0899999999"
-			Var ServiceType = "coffee"
-			Var ECommerce = ""
-			Var ECommerce = ECommerce + PriceDrink
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + DiscountDrink 
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SessionID2 
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + SelectDrink 
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C00"
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + CodeNumber
-			Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "C"
-			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
-			Var AccountType = "new"
-			Var testservice = "kbank"
-			Var tc = ""
-			Var GetScore = ""
-			Var OperatorName = ""
-			Var SessionID = ""
-			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-			;Var Timeout = 0
-			Var ActionOKCase = 2
-		EndIf
-	EndIf
 </EventTimeout> 
 
 <EventChangeStatus>

xml/page_drinkok.xml

@@ -23,6 +23,22 @@
 	Var VideoPlayFile = VideoPlayFile + "24"
 	Var VideoPlayFile = VideoPlayFile + VideoFileEnd
 	Var Timeout = 0
+
+	If TNumberTaobinMember = "" Then
+
+	Else
+		If PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		EndIf 	
+
+		Var BmiYear = PointTaobinStr
+		Var PointCrm = "pdpa1"
+		Var GetScore = VendingTSID
+		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		Var TNumberTaobinMember = ""
+		Var VendingTSID = ""
+	EndIf
+
 </EventOpen>
 <Timeout> 500 </Timeout>
 <EventTimeout> 

xml/page_payment.xml

@@ -38,6 +38,12 @@
 	Var CodeChannel = 0
 	Var CoinVendingOnFlag = 0 
 	
+	Var StoreCreditFlag = 0
+	Var pageStoreCredit0 = 0
+	Var TNumberTaobinCredit = ""
+	Var TNumberTaobinMember = ""
+	Var VendingTSIDTmp = ""
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
@@ -67,11 +73,14 @@
 	Var CountStepPackPayment = CountStepPackPayment + 1
 	If CountStepPackPayment = 1 Then
 
+		Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+
 		SAVELOG ExtendData
 
 		If GetPayInfoFlag = 0 Then
 			If RoadShow = "false" Then
-				CoinVending ON
+				;CoinVending ON
+				CoinVending XBILL
 			EndIf
 
 			

xml/page_payment_cash.xml

@@ -29,6 +29,7 @@
 	; On open
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
+	Var alphaState3 = "Invisible"
 
 	
 	Var CoinInFlag = 0
@@ -47,6 +48,8 @@
 	Var ChangeOK = 0
 	Var CoinInOK = 0
 
+	Var RemainAmountKeep = 0
+	
 	Var showRemaining = charOfBaht + RemainAmountStr
 	
 	Var VendingREFID = ""
@@ -59,7 +62,7 @@
 	Var ServiceCharge = 0
 	Var	Donate = "" 
 	Var SuggestID  = ""
-	Var CancleState = "Enable"
+	Var CancleState = "Invisible"
 
 	Var VendingDiscount = DiscountDrink
 	
@@ -114,6 +117,7 @@
 		Var PayState1 = "Enable"
 		Var PayState2 = "Invisible"
 		Var PayState3 = "Invisible"
+		Var PayState4 = "Invisible"
 		Var showRemaining = "Free"
 	
 	Else
@@ -124,10 +128,12 @@
 			Var PayState2 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
+		Var PayState4 = "Enable"
 
 		If CoinAmount > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
+			Var PayState4 = "Disable"
 			Var CoinInFlag = 1
 		EndIf
 		Var showRemaining = charOfBaht + RemainAmountStr
@@ -219,6 +225,9 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	
+	Var EnoughChange = "yes"
+
 </EventOpen>
 
 <EventActionOk>
@@ -372,7 +381,12 @@
 		If CancelCounter = CancelNumber Then
 			;Change CoinAmount
 			If CoinAmount > 0 Then
+				If StoreCreditFlag = 1 Then
+					Var ChangeOK = 1 
+				Else
 					Change CoinAmount
+				EndIf
+				
 			Else
 				If ActionOKCase = 0 Then
 					Var ActionOKCase = 1
@@ -391,6 +405,15 @@
 	
 		If ChangeOK = 1 Then
 			If ActionOKCase = 0 Then
+
+				If TNumberTaobinCredit = "" Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+				Else
+					Var TelephoneNumber = TNumberTaobinCredit
+					Var PayO2 = CoffeePinNumber
+				EndIf
+				
 				Var VendingDiscount = 0
 				Var VendingCampaign = 0
 				Var ServiceType = "credit"
@@ -452,6 +475,30 @@
 		Var alphaState = "Invisible"
 	EndIf
 
+	;If StoreCreditFlag = 1 Then
+	;	Var ViewBill = 0
+	;EndIf
+
+	If ViewBill > 0 Then
+
+
+		Var RemainAmount = PayAmount - CoinAmount
+		Var RemainAmount = RemainAmount - IntVendingCampaign
+
+
+		If ViewBill > RemainAmount Then
+			Var RemainAmountKeep = ViewBill - RemainAmount
+		Else
+			Var RemainAmountKeep = ViewBill
+		EndIf
+
+
+		
+		 
+		Var alphaState3 = "Enable"
+		
+
+	Else
 		Var CoinInFlag = 1
 
 		If CoinInOK = 0 Then
@@ -490,6 +537,10 @@
 		
 		EndIf
 
+	EndIf
+
+	
+
 	
 	Refresh
 </EventCoin>
@@ -579,10 +630,9 @@
 <EventClick> 
 
 	If alphaState = "Invisible" Then
-		;Var PayState1 = "PressForever"
+
-		;Var PayState2 = "Enable"
+		If EnoughChange = "yes" Then
-		;Var QRChannel = 0
+
-		;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 			Var alphaState2 = "Enable"
 
 			If RoadShow = "true" Then
@@ -593,6 +643,12 @@
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 				;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				
+			EndIf
+		Else
+
+			Var alphaState3 = "Enable"
+			Refresh
+
 		EndIf
 	EndIf
 </EventClick>
@@ -600,7 +656,7 @@
 
 <Button>
 <X> 287 </X>
-<Y>  1549</Y>
+<Y>  1696</Y>
 <State> PayState2</State>
 <Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@@ -624,7 +680,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1400 </Y>
+<Y> 1401 </Y>
 <State> PayState3</State>
 <Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
@@ -666,6 +722,33 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 287 </X>
+<Y> 1548 </Y>
+<State> PayState4</State>
+<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+
+	If alphaState = "Invisible" Then
+	
+		If CoinInFlag = 0 Then
+			If CancelFlag = 0 Then
+			Var TelephoneNumber = ""
+			Var Tel_Confirm_State = "Disable"
+			Open "ROOT/taobin_project/xml/page_payment_credit.xml" 
+			EndIf
+		EndIf
+
+	EndIf
+
+
+</EventClick>
+</Button>
+
 <Button>
 <X> 438 </X>
 <Y> 1786 </Y>
@@ -803,7 +886,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	;VendingQR OFF
+
+	
 	
 
 	If CoinInOK = 0 Then
@@ -821,9 +905,13 @@
 	Var alphaState2 = "Invisible"
 	Refresh
 
+	
+
 </EventClick>
 </Button>
 
+
+
 <Text>
 <X> 0 </X>
 <Y> 1041 </Y>
@@ -837,6 +925,65 @@
 </Text>
 ; end case popup
 
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> alphaState3 </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 182 </X>
+<Y> 748 </Y>
+<State> alphaState3 </State>
+<Filename> Var( DirImage2 + "/img_popup12.png" )</Filename>
+</Image>
+
+<Button>
+<X> 327 </X>
+<Y> 1208 </Y>
+<State> alphaState3 </State>
+<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
+<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 327 </X>
+<Y> 1335 </Y>
+<State> alphaState3 </State>
+<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
+<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	CoinVending BILLREJECT
+	Var alphaState3 = "Invisible"
+	Refresh
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1041 </Y>
+<Size> 100 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> KanitRegularTTF </Font>
+<State> alphaState3 </State>
+<Color> 0xDE794E </Color>
+<Value> RemainAmountKeep </Value>
+</Text>
+
+
+
+
 
 <QRCode>
 <X> 399 </X>

xml/page_payment_code.xml

@@ -92,6 +92,7 @@
 
 			If IntVendingCampaign >= PayAmount Then 
 				;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+				Var VendingCampaign = PayAmount
 				Var FreeVendingCampaign = 1
 				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
@@ -145,7 +146,9 @@
 			
 
 			
+
 			If VendingCode = "C24" Then
+				Var VendingCampaign = PayAmount
 				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
@@ -153,6 +156,7 @@
 			EndIf
 
 			If VendingCode = "C25" Then
+				Var VendingCampaign = PayAmount
 				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
@@ -160,6 +164,7 @@
 			EndIf
 
 			If VendingCode = "C30" Then
+				Var VendingCampaign = PayAmount
 				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID
@@ -167,6 +172,7 @@
 			EndIf
 
 			If VendingCode = "C32" Then
+				Var VendingCampaign = PayAmount
 				CoinVending OFF
             	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 		    	MakeDrinkV1  SelectDrink SelectSugarID

xml/page_show_consent.xml

@@ -27,13 +27,8 @@
 <EventTimeout> 
 	Var CountDownBrewing = CountDownBrewing - 1
 	
-	; run test;
+	
-	;If CountDownBrewing = 40 Then 
+	
-	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
-	;EndIf
-	If CountDownBrewing = 0 Then
-		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
-	EndIf
 
 	Var ShowCountDownBrewing = CountDownBrewing
 
@@ -71,7 +66,7 @@
 <Image>
 <X> 158 </X>
 <Y> 665 </Y>
-<Filename> Var( DirImage + "/img_popup1.png") </Filename>
+<Filename> Var( DirImage + "/img_popup2.png") </Filename>
 </Image>
 
 

xml/page_thankyou.xml

@@ -19,6 +19,10 @@
 	Var ChangeTimeout = 0
 	Var ChangeFlag2 = 0
 
+	Var GotoStoreCredit0 = 0
+	Var StoreCreditAmount = 0
+	
+
 	If show_eng = "true" Then 
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
@@ -40,6 +44,7 @@
 
 	Var Timeout = Timeout + 1 
 	If Timeout = 2 Then
+		
 		 If PayWithQR = 0 Then
             If FreeVendingCampaign = 0 Then
                     If IntVendingCampaign < PayAmount Then 
@@ -47,8 +52,12 @@
                         If SumCoinAmount >= PayAmount Then 
                             Var Canout = SumCoinAmount - PayAmount
                             If Canout > 0 Then
-							Change Canout	
+                                
-							Var ChangeFlag2 = 1
+                                    ;Change Canout	
+                                    ;Var ChangeFlag2 = 1
+									Var GotoStoreCredit0 = 1
+									Var StoreCreditAmount = Canout
+                                
                             EndIf
                         EndIf
                     EndIf
@@ -56,8 +65,10 @@
 
                     Var Canout = CoinAmount
                     If Canout > 0 Then
-					Change Canout	
+                        ;Change Canout	
-					Var ChangeFlag2 = 1
+                        ;Var ChangeFlag2 = 1
+						Var GotoStoreCredit0 = 1
+						Var StoreCreditAmount = Canout
                     EndIf
 
             EndIf
@@ -65,11 +76,14 @@
 
             Var Canout = CoinAmount
             If Canout > 0 Then
-				Change Canout	
+                ;Change Canout	
-				Var ChangeFlag2 = 1
+                ;Var ChangeFlag2 = 1
+				Var GotoStoreCredit0 = 1
+				Var StoreCreditAmount = Canout
             EndIf
 
         EndIf
+		
 	EndIf
 
 
@@ -90,7 +104,16 @@
 		If RoadShow = "true" Then
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
+			If StoreCreditFlag = 1 Then
 				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+			Else
+				If GotoStoreCredit0 = 1 Then
+					Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" 
+				Else
+					Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				EndIf
+				
+			EndIf
 		EndIf
 		 
 	EndIf