Do

xml/menu_board.xml

@@ -28,23 +28,88 @@
 	Var countClick = 0
 
 	Var RoadShow = "false"
+	Var IgnorePoint = "true"
+
+	Var CountDownShowButton = 30
+
+	Var ShowButtonClick = "Enable"
+	Var ShowButtonClickFull = "Invisible"
 </EventOpen>
-<Timeout> 1000 </Timeout>
+
-<EventTimeout> 
+<Timeout> 800 </Timeout>
+<EventTimeout>
+	
+	Var CountDownShowButton = CountDownShowButton - 1
+	
+
+	SAVELOG CountDownShowButton
+	
+	If CountDownShowButton = 28 Then
+		Var ShowButtonClickFull = "Enable"
+		Var ShowButtonClick = "Invisible"
+		Refresh
+	EndIf
+
+	If CountDownShowButton = 10 Then
+		
+		Var ShowButtonClick = "Enable"
+		Var ShowButtonClickFull = "Invisible"	
+		Refresh
+	EndIf
+
+
 	TimerReset
-	Refresh
 </EventTimeout> 
 
-;<Image>
+<EventEnd> 
-;<X> 299 </X>
+	SAVELOG ShowButtonClick
-;<Y> 800 </Y>
+	Var CountDownShowButton = 30
-;<Filename> "ROOT/taobin_project/image/main_page/ad_main_2.jpg" </Filename>
+	Refresh
-;</Image>
+</EventEnd> 
+
+
+<EventNetDown>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDown>
+<EventNetDeactive>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDeactive>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
+</Video>
+
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 5 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 212 </X>
 <Y> 1481 </Y>
-<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_start.png" </Filename>
+<State> ShowButtonClick </State>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_start.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
@@ -60,7 +125,7 @@
 <Button>
 <X> 212 </X>
 <Y> 1695 </Y>
-<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_member.png" </Filename>
+<State> ShowButtonClick </State>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_member.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
@@ -73,7 +138,7 @@
 <Button>
 <X> 556 </X>
 <Y> 1695 </Y>
-<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_topup.png" </Filename>
+<State> ShowButtonClick </State>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_topup.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
@@ -82,38 +147,20 @@
 </EventClick>
 </Button>
 
-<GIF>
-<X> 127 </X>
-<Y> 607 </Y>
-<Filename> "ROOT/taobin_project/image/drink_main.gif" </Filename>
-</GIF>
-
-<EventNetDown>
-	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
-</EventNetDown>
-<EventNetDeactive>
-	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
-</EventNetDeactive>
-
 <Button>
-<X> 0 </X>
+<X> 2 </X>
-<Y> 1860 </Y>
+<Y> 2 </Y>
-<Width> 200 </Width>
+<State> ShowButtonClickFull </State>
-<Height> 50 </Height>
+<Width> 1076 </Width>
+<Height> 1308 </Height>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var countClick = countClick + 1
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_advert.xml"
-	If countClick = 3 Then
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_catalog.xml"
-		
+	
-	EndIf
+	TopView "show"
-
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_main_blank.xml"
-	If countClick = 5 Then
-		Var countClick = 0
-		MainMenu
-	EndIf
-	Refresh
-</EventClick>
 </Button>
 
 <Text>

xml/menu_board_0.xml

@@ -0,0 +1,135 @@
+<Page>
+<X> 0 </X>
+<Y> 608 </Y>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	TopView "hide"
+	; On open
+	Var menu_back_to_main = "ROOT/taobin_project/xml/menu_back_to_main.xml"
+
+	Var charOfBaht = "฿"
+	Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
+	Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
+
+	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
+	Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf"
+
+	Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
+	Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
+	Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf"
+	Var KanitLightTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
+	
+	Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
+
+	Var countClick = 0
+
+	Var RoadShow = "false"
+	Var IgnorePoint = "true"
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+<EventNetDown>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDown>
+<EventNetDeactive>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDeactive>
+
+;<Image>
+;<X> 299 </X>
+;<Y> 800 </Y>
+;<Filename> "ROOT/taobin_project/image/main_page/ad_main_2.jpg" </Filename>
+;</Image>
+
+<Button>
+<X> 212 </X>
+<Y> 1481 </Y>
+<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_start.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_start.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_advert.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_catalog.xml"
+	
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_main_blank.xml"
+</EventClick>
+</Button>
+
+<Button>
+<X> 212 </X>
+<Y> 1695 </Y>
+<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_member.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_member.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_board.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 556 </X>
+<Y> 1695 </Y>
+<Filename> "ROOT/taobin_project/image/main_page/bn_main_page_topup.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_topup.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/xml/service_menu.xml" 
+</EventClick>
+</Button>
+
+<GIF>
+<X> 127 </X>
+<Y> 607 </Y>
+<Filename> "ROOT/taobin_project/image/drink_main.gif" </Filename>
+</GIF>
+
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 5 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countClick </Value>
+</Text>
+
+
+
+</Page>

xml/menu_board_1.xml

@@ -0,0 +1,105 @@
+<Page>
+<X> 0 </X>
+<Y> 608 </Y>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	TopView "hide"
+	; On open
+	Var menu_back_to_main = "ROOT/taobin_project/xml/menu_back_to_main.xml"
+
+	Var charOfBaht = "฿"
+	Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
+	Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
+
+	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
+	Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf"
+
+	Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
+	Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
+	Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf"
+	Var KanitLightTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
+	
+	Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
+
+	Var countClick = 0
+
+	Var RoadShow = "false"
+	Var IgnorePoint = "true"
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+<EventNetDown>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDown>
+<EventNetDeactive>
+	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
+</EventNetDeactive>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
+</Video>
+
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 5 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 2 </X>
+<Y> 2 </Y>
+<Width> 1076 </Width>
+<Height> 1308 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_advert.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_catalog.xml"
+	
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_main_blank.xml"
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countClick </Value>
+</Text>
+
+
+
+</Page>

xml/menu_brewing2.xml

@@ -25,11 +25,91 @@
 	EndIf
 
 	Var ShowCountDownBrewing = CountDownBrewing
-	
+
-	If MachineStage = "drink-success" Then
+	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/menu_closeMaintenance.xml" 
+			Var ActionOKCase = 1
+		EndIf
+	EndIf
+
+	If MachineState_Result = 1 Then
+		Var Timeout = 0
+	  	Var ProcessText = "" 
+
+		Var TelephoneNumber = "0899999999"
+		Var ServiceType = "coffee"
+		Var ServiceCredit = SelectDrink
+		Var SuggestID  = ""
+
+		If PayWithQR = 0 Then
+			If CodeChannel = 1 Then
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + CodeNumber
+				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
+
+		Var ServiceSuccess = "yes"
 		Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
 	EndIf
-	
+
+	If MachineState_Result = 2 Then
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			If PayWithQR = 0 Then
+				If CodeChannel = 0 Then
+					If ChangeFlag = 0 Then
+						Var ChangeFlag = 1 
+						Change ServiceAmount2
+						Var ChangeOK = 0
+					EndIf
+				Else
+					If CoinAmount > 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
+							Change ServiceAmount2
+							Var ChangeOK = 0
+						EndIf
+					Else
+						Var ChangeOK = 4
+					EndIf
+				EndIf
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/menu_drinkfail.xml"
+			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/menu_list.xml"
+			
+		EndIf
+	EndIf
+
 
 	If MachineStage = "show-menu" Then
 		Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
@@ -40,9 +120,13 @@
 	EndIf
 	
 	If MachineStage = "drink-success" Then
-		Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
+		Var MachineState_Result = 1
 	EndIf
-	
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+
 	Refresh
 	TimerReset
 
@@ -50,24 +134,35 @@
 
 <EventMachine>
 	
+	;If MachineStage = "drink-success" Then
+	;	Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
+	;EndIf
+	;If MachineStage = "drink-failed" Then
+	;	Open "ROOT/taobin_project/xml/menu_drinkfail.xml" 
+	;EndIf
 
 	If MachineStage = "drink-success" Then
-		Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
+		Var MachineState_Result = 1
-	EndIf
-	If MachineStage = "drink-failed" Then
-		Open "ROOT/taobin_project/xml/menu_drinkfail.xml" 
 	EndIf
 
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
 	
 </EventMachine>
-<EventEnd>
-		Open "ROOT/taobin_project/xml/menu_brewing2.xml"  
 
-</EventEnd>
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		Var ChangeOK = 2
+	EndIf
+</EventChangeStatus>
 
 <Video>
 <X> 0 </X>
 <Y> 380 </Y>
+<Width> 1080</Width>
+<Height> 606 </Height>
 <Loop> "true" </Loop>
 <Filename> "ROOT/taobin_project/video/taobin_brewing.mov" </Filename>
 </Video>

xml/menu_catalog.xml

@@ -11,15 +11,45 @@
 	
 
 	Var GetPayInfoFlag = 0
+	Var countDownRetrun = 30
 
+	CoinVending OFF
+	
 </EventOpen>
-<Timeout> 30000 </Timeout>
+<Timeout> 1000 </Timeout>
 <EventTimeout> 
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
 
+	If countDownRetrun = 0 Then
+		Open "ROOT/taobin_project/xml/menu_back_to_main.xml"
+	EndIf
+
+	
+
+	If CancelFlag = 1 Then
+		If ChangeOK = 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
+			Var ChangeOK = 0
+			Var CancelFlag = 0
+		EndIf
+	EndIf
+
+	Refresh
 	TimerReset
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
 </EventTimeout> 
 
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		Var ChangeOK = 1
+	EndIf
+</EventChangeStatus>
 
 <Image>
 <X> 0 </X>
@@ -146,5 +176,16 @@
 </EventClick>
 </Button>
 
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countDownRetrun </Value>
+</Text>
+
 
 </Popup>

xml/menu_catalog_choose_drink1.xml

@@ -388,15 +388,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -417,15 +426,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -446,15 +464,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -475,15 +502,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -504,15 +540,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -533,15 +578,24 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -562,15 +616,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -591,15 +654,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -620,15 +692,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -649,15 +730,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>

xml/menu_catalog_choose_drink2.xml

@@ -478,15 +478,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -507,15 +516,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -536,15 +554,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -565,15 +592,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -594,15 +630,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -623,15 +668,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -652,15 +706,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -681,15 +744,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -710,15 +782,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -739,15 +820,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -768,15 +858,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -797,15 +896,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -826,15 +934,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -855,15 +972,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>

xml/menu_catalog_choose_drink2_ext.xml

@@ -571,15 +571,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -600,15 +609,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -629,15 +647,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -658,15 +685,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -687,15 +723,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -716,15 +761,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -745,15 +799,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -774,15 +837,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -803,15 +875,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -832,15 +913,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -861,15 +951,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -890,15 +989,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -919,15 +1027,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -948,15 +1065,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
@@ -977,15 +1103,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 1252 </Y>
@@ -1006,15 +1141,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 1252 </Y>
@@ -1035,15 +1179,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1580 </Y>
@@ -1064,15 +1217,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1580 </Y>

xml/menu_catalog_choose_drink3.xml

@@ -296,15 +296,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -325,15 +334,24 @@
 	<Value> $11-99-01-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0012.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -354,15 +372,24 @@
 	<Value> $11-99-01-0012.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -383,15 +410,24 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -412,15 +448,24 @@
 	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -441,15 +486,24 @@
 	<Value> $11-99-02-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>

xml/menu_catalog_choose_drink4.xml

@@ -252,15 +252,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -281,15 +290,24 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -310,15 +328,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0005.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -339,15 +366,24 @@
 	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0031.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>

xml/menu_catalog_choose_drink5.xml

@@ -344,15 +344,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0009.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -373,15 +382,24 @@
 	<Value> $11-99-01-0009.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0016.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -402,15 +420,24 @@
 	<Value> $11-99-02-0016.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -431,15 +458,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -460,15 +496,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0021.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -489,15 +534,24 @@
 	<Value> $11-99-02-0021.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0023.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -518,15 +572,24 @@
 	<Value> $11-99-02-0023.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0022.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -547,15 +610,24 @@
 	<Value> $11-99-02-0022.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>

xml/menu_catalog_choose_drink6.pml

@@ -11,6 +11,7 @@
  bt_pic.append('b#_iced_sprite.png')
  bt_pic.append('b#_soda.png')
  bt_pic.append('b#_iced_soda.png')
+ bt_pic.append('b#_iced.png')
 
 
  product_code = []
@@ -19,6 +20,7 @@
  product_code.append('11-99-02-0025')
  product_code.append('11-99-02-0032')
  product_code.append('11-99-02-0026')
+ product_code.append('11-99-02-0009')
 
 
  menu_count = len( bt_pic)

xml/menu_catalog_choose_drink6.xml

@@ -274,16 +274,48 @@
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
+	; button i=6 11-99-02-0009 
+	<Button>
+	<X> 301 </X> 
+	<Y> 382 </Y> 
+	<State> $11-99-02-0009.Button  </State> 
+	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/menu_drink_press/bn_iced.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/menu_drink_disable/bn_iced.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0009"
+		Var NameDrink = $11-99-02-0009.Name2
+		Var NameDrinkTH = $11-99-02-0009.Name
+		Var DrinkDescription = $11-99-02-0009.description
+		Var PriceDrink = $11-99-02-0009.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced.png"
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
+	</EventOnClick>
+	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -304,16 +336,25 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
+	<X> 483 </X>
+	<Y> 66 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0018.Price </Value>
+	</Text>
+	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -333,15 +374,24 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0025.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -362,15 +412,24 @@
 	<Value> $11-99-02-0025.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0032.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -391,15 +450,24 @@
 	<Value> $11-99-02-0032.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0026.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -419,6 +487,44 @@
 	<Color> 0x6F5F51 </Color>
 	<Value> $11-99-02-0026.description </Value>
 	</Text>
+	<Text>
+	<X> 483 </X>
+	<Y> 394 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0009.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 596 </Y>
+	<Size> 26 </Size>
+	<Width>220</Width>
+	<Mode> "bound" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<Value> $11-99-02-0009.Name2 </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 628 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<Value> $11-99-02-0009.description </Value>
+	</Text>
 </Frame>
 
 

xml/menu_drinkfail.xml

@@ -1,7 +1,9 @@
-<Popup>
+<Page>
+<X> 0 </X>
+<Y> 608 </Y>
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
-<Height> 1920 </Height>
+<Height> 1312 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
@@ -10,38 +12,80 @@
 	Var StarwState = "Enable"
 
 </EventOpen>
-<Timeout> 5000 </Timeout>
+<Timeout> 800 </Timeout>
 <EventTimeout> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml"  
+	
+	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/menu_closeMaintenance.xml" 
+			Var ActionOKCase = 1
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		Var Change3Timeout = Change3Timeout + 1
+		If  Change3Timeout > 3 Then
+			Open "ROOT/xml/menu_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>
+	If ChangeStatus = "payout-end" Then 
+		Var ChangeOK = 2
+	EndIf
+</EventChangeStatus>
 
 
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
-<Filename> "ROOT/taobin_project/image/page2/ad_blank1.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page2/img1.png" </Filename>
 </Image>
 
 
-<GIF>
+</Page>
-<X> 182 </X>
-<Y> 700 </Y>
-<Filename> GIFShowProcess </Filename>
-</GIF>
-
-
-<Button>
-<X> 217 </X>
-<Y> 1640 </Y>
-<Filename> "ROOT/taobin_project/image/complete/bn_goto_main.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/complete/bp_goto_main.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml"  
-</EventClick>
-</Button>
-
-
-</Popup>

xml/menu_drinkok.xml

@@ -33,7 +33,7 @@
 ; Old
 
 <Video>
-<X> 82 </X>
+<X> 36 </X>
 <Y> 621 </Y>
 <Width> 917 </Width>
 <Height> 917 </Height>

xml/menu_head.py

@@ -1,6 +1,6 @@
  
- RoadShow = True
+ RoadShow = False
- 
+
  default_dir = 'ROOT/taobin_project/image/menu_drink/'
  default_dir2 = 'ROOT/taobin_project/image/menu_drink_select/'
  default_dir_press = 'ROOT/taobin_project/image/menu_drink_press/'

xml/menu_lid_straw.xml

@@ -41,6 +41,15 @@
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 </Image>
 
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080</Width>
+<Height> 606 </Height>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_brewing.mov" </Filename>
+</Video>
+
 
 <Image>
 <X> 112 </X>
@@ -165,14 +174,27 @@
 </Text>
 
 
-<GIF>
-<X> 182 </X>
-<Y> 700 </Y>
-<Filename> GIFShowProcess </Filename>
-</GIF>
 
+;<GIF>
+;<X> 182 </X>
+;<Y> 700 </Y>
+;<Filename> GIFShowProcess </Filename>
+;</GIF>
 
+<EventMachine>
+	
+	If MachineStage = "drink-failed" Then
+		Open "ROOT/taobin_project/xml/menu_brewing2.xml" 
+	EndIf
 
+	
+</EventMachine>
+
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		Var ChangeOK = 2
+	EndIf
+</EventChangeStatus>
 
 
 </Popup>

xml/menu_payment.xml

@@ -1,51 +1,95 @@
-<Page>
+<Popup>
-
+<Cache> "Enable" </Cache>
 <Width> 1080 </Width>
-<Height> 1288 </Height>
+<Height> 1920 </Height>
-<Background> "ROOT/ui/bg_main_menu.png" </Background>
+<Background> "0xeae6e1" </Background>
 <EventOpen>
 	; On open
-	Var payment = "cash"
+	Var GetPayInfoFlag = 0
+	Var SessionID2 = ""
+	Var testservice = "kbank"
+	Var QRCODE99 = ""
+	Var QRCODETMP = ""
+
+	Var QRChannel = 0
+	Var MachineStage = "-"
+	Var HaveCup = "true"
+
+	;Var PriceDrink = 5
+
+	Var DiscountDrink = 0
+	Var SelectSlot = "1"
+
+	Var QRCODE1 = "A000000677010112"
+    Var QRCODE2 = "010755600066301"
+    Var QRCODE3 = "VDGN"
+    Var QRCODE4 = BoxID
+    Var QRCODE5 = SelectSlot
+    Var QRCODE6 = ServiceCredit                
+    Var QRCODE7 = ServiceAmount2 
+    Var QRCODE8 = ""
+
+	If GetPayInfoFlag = 0 Then
+
+		Var RemainAmount = 0
+	
+		;PrepareDrink SelectDrink SelectSugarID
+
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + "00"
+		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 + "KBA"
+		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 GetPayInfoFlag = 1
+		Var ReqPayInfoFlag = 1
+
+	EndIf
+
+	; Reset
+	Var MachineState_Result = 0
+
+	Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
 	
 </EventOpen>
-
+<Timeout> 2000 </Timeout>
-<Timeout> 10000 </Timeout>
 <EventTimeout> 
-	Open "ROOT/xml/menu_board.xml" 
+	Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
+	TimerReset
+	Refresh
 </EventTimeout> 
+<EventActionOk>
+	Var CreditAmount = 0
+	Var QRCODE99 = SessionID
+	Var QRCODE99 = QRCODE99 + Ext1a
+	SAVELOG QRCODE99
+	Var QRCODE99 = QRCODE99 + Ext21
+	Var QRCODETMP = QRCODE99
+	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+</EventActionOk>
 
-
+</Popup>
-<Button>
-<X> 265 </X>
-<Y> 110 </Y>
-<Filename> nMenuBar </Filename>
-<FilenamePress> pMenuBar </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Open "ROOT/xml/menu_payment_qr.xml" 
-</EventClick>
-</Button>
-<Text>
-<X> 265 </X>
-<Y> 130 </Y>
-<Width> 550 </Width>
-<Align> Center </Align>
-<Size> 40 </Size>
-<Color> 0xFFFFFF </Color>
-<Value> "Payment QR" </Value>
-</Text>
-
-
-<GIF>
-<X> 405 </X>
-<Y> 200 </Y>
-<Filename> "ROOT/ui/page_04_make_a_payment/make_payment.gif" </Filename>
-</GIF>
-			
-<EventSecurity> 
-	Open "/media/bt/xml/security_alarm.xml" 
-</EventSecurity>
-
-
-</Page>

xml/menu_payment_cash.xml

@@ -6,17 +6,17 @@
 <Volume> SoundVolume </Volume>
 <Sound> "ROOT/sounds/selectPayment.wav" </Sound>
 <EventOpen>
-	SAVELOG SelectDrink
+	;SAVELOG SelectDrink
-	SAVELOG NameDrink
+	;SAVELOG NameDrink
-	SAVELOG NameDrinkTH
+	;SAVELOG NameDrinkTH
-	SAVELOG DrinkDescription
+	;SAVELOG DrinkDescription
 	SAVELOG PriceDrink
-	SAVELOG topping1
+	;SAVELOG topping1
-	SAVELOG topping2
+	;SAVELOG topping2
-	SAVELOG topping3
+	;SAVELOG topping3
+
 
 	Var PayAmount = PriceDrink
-	Var showRemaining = charOfBaht + RemainAmountStr
 	
 	; Below original 
 	; On open
@@ -36,6 +36,8 @@
 	Var ChangeOK = 0
 	Var CoinInOK = 0
 	
+	Var showRemaining = charOfBaht + RemainAmountStr
+	
 	Var VendingREFID = ""
 	
 	Var TelephoneNumber = "0899999999"
@@ -51,58 +53,19 @@
 	Var VendingDiscount = DiscountDrink
 	Var VendingCampaign = 0
 
-	Var QRCODE1 = "A000000677010112"
-    Var QRCODE2 = "010755600066301"
-    Var QRCODE3 = "VDGN"
-    Var QRCODE4 = BoxID
-    Var QRCODE5 = SelectSlot
-    Var QRCODE6 = ServiceCredit                
-    Var QRCODE7 = ServiceAmount2 
-    Var QRCODE8 = ""
-
 	Var CashTextWarning = "" 
 	Var QRErrorState = "Invisible"
 
+
+	SAVELOG QRChannel
+	SAVELOG QRCODE99
+
 	If QRChannel = 0 Then
 		;Var VendingQRCode = "ERROR"
 		VendingQR ON
 		CoinVending ON
-		Var QRCODE99 = ""
+		;Var QRCODE99 = ""
 		
-		Var TextBill = ""
-		Var BillFlag = 0
-
-		If Bill20 = "true" Then
-			Var TextBill = TextBill + " 20 "
-			Var BillFlag = BillFlag + 1
-		EndIf
-		If Bill50 = "true" Then
-			Var TextBill = TextBill + " 50 "
-			Var BillFlag = BillFlag + 1
-		EndIf
-		If Bill100 = "true" Then
-			Var TextBill = TextBill + " 100 "
-			Var BillFlag = BillFlag + 1
-		EndIf
-
-		If BillFlag = 3 Then
-			Var CashTextWarning = "" 
-		Else
-			If BillFlag = 0 Then
-				Var TextBill = "ไม่รับแบงค์"
-				Var CashTextWarning = "จำนวนเงินไม่พอทอน! กรุณาใส่เงินให้พอดี " + TextBill
-			Else
-				Var TextBill = "รับเฉพาะแบงค์ " + TextBill
-				Var CashTextWarning = "จำนวนเงินไม่พอทอน! กรุณาใส่เงินให้พอดี " + TextBill
-			EndIf
-		EndIf
-
-		
-
-		
-
-
-
 
 	Else
 		;Var VendingQRCode = "OK"
@@ -143,75 +106,64 @@
 		Var showRemaining = charOfBaht + RemainAmountStr
 	EndIf
 
-	If GetPayInfoFlag = 0 Then
 
-		Var BG_Menu_Page4 =  "ROOT/image/BG_Cash_Page4.bmp"
-		;Var PayState1 = "PressForever"
-		;Var PayState2 = "Enable"
-		;Var PayState3 = "Enable"
-		Var RemainAmount = 0
-		PrepareDrink SelectDrink SelectSugarID
-
-		Var SessionID2 = SelectSlot + ":"
-		Var SessionID2 = SessionID2 + "00"
-		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 + "KBA"
-		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 GetPayInfoFlag = 1
-	EndIf
 	
+	PrepareDrink SelectDrink SelectSugarID
+
 
-	Var ProcessText = "กำลังดำเนินการ..."
-	;Var GIFShowProcess ="ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 	Var PayWithQR = 0
+	Var NoGotoMenupage = "false"
 	
 
 </EventOpen>
 
 <EventActionOk>
-	
+	If VendingREFID = "" Then
+		SAVELOG "menu_page4-QR.xml > ActOK_REFID"
+		Refresh
+	Else
+		SAVELOG "menu_page4-QR.xml > ActOK_make"
+		;Var VendingQRCode = "ERROR"
+		;Coin STANDBY
+		VendingQR OFF
+		
+		;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
+		MakeDrinkV1  SelectDrink SelectSugarID
+		Var PayWithQR = 1
+		;Open "/media/bt/xml/menu_page4-1.xml" 
+
+		Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+		Var BrewingTextThai = "เตรียมแก้ว"
+		Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
+			
+	EndIf
+
+	If ReqPayInfoFlag = 1 Then	
+		Var QRCODE99 = SessionID
+		Var QRCODE99 = QRCODE99 + Ext1a
+		SAVELOG QRCODE99
+		Var QRCODE99 = QRCODE99 + Ext21
+		Var QRCODETMP = QRCODE99
+		Var ReqPayInfoFlag = 0
+
+	EndIf
 </EventActionOk>
 
+
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 
 	Var Timeout = Timeout + 1
 	If Timeout > 120 Then
+	    ;
 		If PayOK = 1 Then
 			
 			If ChangeOK = 1 Then	
-				;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				MakeDrinkV1  SelectDrink SelectSugarID
 				Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 
 			Else 
 				If Timeout > 180 Then
-					;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 					MakeDrinkV1  SelectDrink SelectSugarID
 					Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 				EndIf
@@ -250,6 +202,7 @@
 		EndIf
 	EndIf
 
+	; This copy in file menu_catalog.xml
 	If CancelFlag = 1 Then
 		If ChangeOK = 1 Then
 			Var VendingDiscount = 0
@@ -258,13 +211,17 @@
 			Var SessionID2 = SelectDrink
 			Var ServiceCredit = "coffee"
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-			Open "ROOT/taobin_project/xml/menu_catalog.xml"  
+			If NoGotoMenupage = "false" Then
+
+				Open "ROOT/taobin_project/xml/menu_catalog.xml" 
+			EndIf
+
 		EndIf
 	EndIf
 
 	Var CoinInCounter = CoinInCounter + 1
 	If CoinInOK = 1 Then
-		If CoinInCounter = 3 Then
+		If CoinInCounter = 1 Then
 
 			Var RemainAmount = PayAmount - CoinAmount
 			If CoinAmount >= PayAmount Then 
@@ -278,6 +235,10 @@
 				Var Timeout = 118
 				Var PayOK = 1
 
+				MakeDrinkV1 SelectDrink SelectSugarID
+				
+				Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
+		
 			EndIf
 		EndIf
 	EndIf
@@ -288,17 +249,13 @@
 
 <EventChangeStatus>
 	If ChangeStatus = "payout-end" Then 
-	Var ChangeOK = 1
+		Var ChangeOK = 1
 	EndIf
 </EventChangeStatus>
 
 <EventCoin>
 	TimerReset
 
-	If CoinInFlag = 0 Then
-		VendingQR OFF
-	EndIf
-
 	Var CoinInFlag = 1
 
 	If CoinInOK = 0 Then
@@ -308,13 +265,20 @@
 			;Var VendingQRCode = "ERROR"
 			CoinVending OFF
 			Var Canout = CoinAmount - PayAmount
-			Var RemainAmountStr = "ทอน " + Canout
+			If Canout = 0 Then
+			
+				Var RemainAmountStr = 0
+			Else
+				Var RemainAmountStr = "ทอน " + Canout
+			EndIf
 
 			
 			Var CancleState = "Disable"
 			Var CoinInOK = 1
 			Var CoinInCounter = 0
 
+
+
 		Else
 			Var RemainAmountStr = "" + RemainAmount
 		EndIf
@@ -335,6 +299,9 @@
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
+			Var showRemaining = "คืนเงิน"
+			Open "ROOT/taobin_project/xml/menu_catalog.xml"
+
         EndIf 
 	EndIf
 	VendingQR OFF
@@ -350,7 +317,6 @@
 	Var MachineStage = "make-drink"
 	Var BrewingTextThai = "เตรียมแก้ว"
 	;MakeDrinkV1  SelectDrink SelectSugarID
-	;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 	Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 </EventClick>
 </Image>
@@ -394,8 +360,8 @@
 <X> 287 </X>
 <Y> 1282 </Y>
 <State> PayState1</State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_cash_2.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/bn_cash.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cash_2.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cash.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -409,8 +375,9 @@
 		Var MachineStage = "make-drink"
 		Var BrewingTextThai = "เตรียมแก้ว"
 		MakeDrinkV1  SelectDrink SelectSugarID
-		;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 		Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
+		;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		
 	EndIf
 </EventClick>
 </Button>
@@ -418,7 +385,7 @@
 <Button>
 <X> 287 </X>
 <Y> 1430 </Y>
-<State> PayState2</State>
+<State> "Disable"</State>
 <Filename> "ROOT/taobin_project/image/page_payment/bn_pay_with_code.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page_payment/bp_pay_with_code.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -445,8 +412,19 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var alphaState = "Enable"
+	CoinVending OFF
+	VendingQR ON
 	Refresh
 
+	If CoinAmount > 0 Then
+		Change CoinAmount
+		Var ChangeOK = 0
+		Var CancelFlag = 1
+		Var CancelCounter = 0
+		Var NoGotoMenupage = "true"
+				
+	EndIf
+
 ;	If CoinInFlag = 0 Then
 ;		Var BG_Menu_Page4 =  "ROOT/image/BG_PromptPay_Page4.bmp"
 ;		Var PayState1 = "Enable"
@@ -464,20 +442,26 @@
 <State>CancleState</State>
 <Filename> "ROOT/taobin_project/image/page_payment/bn_cancel.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cancel.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/page_payment/bp_cancel.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	If CoinInOK = 0 Then
+
-        If CancelFlag = 0 Then
-            CoinVending OFF
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-        EndIf
-       
-        
-	EndIf
 	VendingQR OFF
 
+	CoinVending OFF
+
+	  
+	If CoinAmount > 0 Then
+		Change CoinAmount
+		Var ChangeOK = 0
+		Var CancelFlag = 1
+		Var CancelCounter = 0
+				
+	Else
+		Var ChangeOK = 1
+	EndIf
+
 	Open "ROOT/taobin_project/xml/menu_catalog.xml"  
 	 
 </EventClick>
@@ -541,6 +525,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	  Var alphaState = "Invisible"
+	  CoinVending ON
+	  VendingQR OFF
 	  Refresh
 </EventClick>
 </Button>
@@ -549,8 +535,10 @@
 <QRCode>
 <X> 399 </X>
 <Y> 912 </Y>
+<Width> 185 </Width>
+<Height> 185 </Height>
 <State> alphaState </State>
-<Service> "Herr" </Service>
+<Service> testservice </Service>
 </QRCode>
 
 
@@ -561,7 +549,7 @@
 <Text>
 <X> 0 </X>
 <Y> 1880 </Y>
-<Size> 30 </Size>
+<Size> 14 </Size>
 <Align> "Left" </Align>
 <Width> 1080 </Width>
 <Font> KanitThinTTF </Font>

xml/menu_payment_code.xml

@@ -261,21 +261,6 @@
 </Button>
 
 
-<Button>
-<X> 44 </X>
-<Y> 1783 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_back.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back.png" </FilenamePress>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var PayState1 = "PressForever"
-	Var PayState2 = "Enable"
-	Var QRChannel = 0
-	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
-</EventClick>
-</Button>
-
 <Button>
 <X> 620 </X>
 <Y> 1517 </Y>
@@ -300,13 +285,30 @@
 </EventClick>
 </Button>
 
+
 <Button>
-<X> 600 </X>
+<X> 44 </X>
-<Y> 779 </Y>
+<Y> 1783 </Y>
+<Filename> "ROOT/taobin_project/image/enter_point/bn_cancel.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_cancel.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var PayState1 = "PressForever"
+	Var PayState2 = "Enable"
+	Var QRChannel = 0
+	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 751 </X>
+<Y> 1783 </Y>
 <State> Tel_Confirm_State </State>
-<Filename> "ROOT/taobin_project/image/BN_Confirm.bmp" </Filename>
+<Filename> "ROOT/taobin_project/image/enter_point/bn_confirm.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/BP_Confirm.bmp" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_confirm.bmp" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/BD_Confirm.bmp" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/enter_point/bn_confirm.bmp" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -372,8 +374,8 @@
 </Image>
 
 <Image>
-<X> 213 </X>
+<X> 378 </X>
-<Y> 606 </Y>
+<Y> 874 </Y>
 <State> ShowTextNumber </State>
 <Filename> "ROOT/taobin_project/image/enter_point/text3.png" </Filename>
 </Image>
@@ -388,14 +390,13 @@
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
 <Value> TelephoneNumber </Value>
-<Format> Telnum </Format>
 </Text>
 
 	
 
 <Image>
-<X> 112 </X>
+<X> 240 </X>
-<Y> 593 </Y>
+<Y> 606 </Y>
 <Filename> "ROOT/taobin_project/image/enter_point/text2.png" </Filename>
 </Image>
 

xml/menu_thankyou.xml

@@ -56,6 +56,11 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		Var ChangeOK = 2
+	EndIf
+</EventChangeStatus>
 
 
 </Popup>

xml/menu_topping_alter.xml

@@ -101,7 +101,7 @@
 			Var BugFlag = 1
 			Refresh
 		Else
-			Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
+			Open "ROOT/taobin_project/xml/menu_payment.xml"
 		EndIf
 		
 	EndIf
@@ -168,15 +168,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If BaristaMenu = "PressForever" Then
-		Var SelectDrink = SubMenuProductCode1
-		Var NameDrink = SubMenuName11
-		Var NameDrinkTH = SubMenuName21
-		Var DrinkDescription = SubMenuDescript1
-		Var PriceDrink = SubMenuPrice1
-	EndIf
 
-	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+	Open "ROOT/taobin_project/xml/menu_payment.xml" 
 </EventClick>
 </Button>
 

xml/menu_topping_with_barista.xml

@@ -22,8 +22,8 @@
 	Var BaristaMenu = "Invisible"
 
 	Var BGSubmenu = "Enable"
-	Var BaristaMenu = "Enable"
+	Var BaristaMenu = "PressForever"
-	Var NormalMenu = "PressForever"
+	Var NormalMenu = "Enable"
 
 	Var y_topping_bg = y2_topping_bg
 	Var y_topping = y2_topping
@@ -61,8 +61,20 @@
 		Var SugarState5 = "Enable"
 		Var BGSugar = "Enable"
 	EndIf
-	
 
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+		Var SugarState3 = "PressForever"
+		Var SugarState4 = "Enable"
+		Var SugarState5 = "Enable"
+		Var BGSugar = "Enable"
+		;SAVELOG SubMenuPrice1
+		Var PriceShowValue = charOfBaht + SubMenuPrice1
+		Var topping1 = toppingID1Default
+		Refresh
+	EndIf
+	
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 
@@ -87,7 +99,7 @@
 <Button>
 <X> 550 </X>
 <Y> 963 </Y>
-<State> NormalMenu </State>
+<State> "Disable" </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew1.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew1.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -105,7 +117,7 @@
 <Button>
 <X> 774 </X>
 <Y> 963 </Y>
-<State> BaristaMenu </State>
+<State> "PressForever" </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew2.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -131,7 +143,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open PreviseXMLFileName2
+	Open PreviseOfPreviseXMLFileName
 	;Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
@@ -234,15 +246,15 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If BaristaMenu = "PressForever" Then
+	;If BaristaMenu = "PressForever" Then
-		Var SelectDrink = SubMenuProductCode1
+	;	Var SelectDrink = SubMenuProductCode1
-		Var NameDrink = SubMenuName11
+	;	Var NameDrink = SubMenuName11
-		Var NameDrinkTH = SubMenuName21
+	;	Var NameDrinkTH = SubMenuName21
-		Var DrinkDescription = SubMenuDescript1
+	;	Var DrinkDescription = SubMenuDescript1
-		Var PriceDrink = SubMenuPrice1
+	;	Var PriceDrink = SubMenuPrice1
-	EndIf
+	;EndIf
 
-	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+	Open "ROOT/taobin_project/xml/menu_payment.xml" 
 </EventClick>
 </Button>
 

xml/page_collect_point_1.xml

@@ -0,0 +1,358 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	TopView "hide"
+
+	Var Timeout = 0
+	Var TelephoneNumber = ""
+    
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+
+	
+
+	Var Timeout = Timeout + 1
+	If Timeout > 20 Then
+        Open "ROOT/taobin_project/xml/menu_lid_straw.xml"  
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<Button>
+<X> 333 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "1"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "2"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "3"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "4"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "5"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "6"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "7"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "8"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "9"
+	Trim TelephoneNumber 10
+	TimerReset
+	Refresh
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "0"
+	Trim TelephoneNumber 10
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 44 </X>
+<Y> 1783 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_back.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var PayState1 = "PressForever"
+	Var PayState2 = "Enable"
+	Var QRChannel = 0
+	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Trim TelephoneNumber  -1
+	Var Tel_Confirm_State = "Disable"
+	
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen = 0 Then 
+		Var ShowTextNumber = "Enable"
+	EndIf
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 750 </X>
+<Y> 1783 </Y>
+<Filename> "ROOT/taobin_project/image/bn_ignore.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bp_ignore.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_lid_straw.xml"  
+</EventClick>
+</Button>
+
+;<Button>
+;<X> 600 </X>
+;<Y> 779 </Y>
+;<State> Tel_Confirm_State </State>
+;<Filename> "ROOT/image/BN_Confirm.bmp" </Filename>
+;<FilenamePress> "ROOT/image/BP_Confirm.bmp" </FilenamePress>
+;<FilenameDisable> "ROOT/image/BD_Confirm.bmp" </FilenameDisable>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;
+;	Var StepGetPoint = 0
+;
+;	;GETACCEXT TelephoneNumber 5
+;	Var PdpaAsk = 0
+;	
+;	Var OperatorTemp = ""
+;	Var CreditAmount = 0
+;	Var OperatorStatus = ""
+;	Var AccountType = ""
+;	GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+;	Open "/media/bt/xml/menu_CollectPoint_Page2.xml"  
+;	
+;	
+;</EventClick>
+;</Button>
+
+;<Text>
+;<X> 310 </X>
+;<Y> 380 </Y>
+;<Width> 474 </Width>
+;<Align> Center </Align>
+;<Size> 50 </Size>
+;<Font> fontType1 </Font>
+;<Color> 0xF0E000 </Color>
+;<Value> TelephoneNumber </Value>
+;<Format> Telnum </Format>
+;</Text>
+
+<Text>
+<X> 0 </X>
+<Y> 873 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum </Format>
+</Text>
+
+	
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 1
+	EndIf
+</EventMachine>
+
+
+
+
+</Popup>

xml/page_collect_point_2.xml

@@ -0,0 +1,119 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	TopView "hide"
+
+	Var Timeout = 0
+	Var TelephoneNumber = ""
+    
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+        ;Var CoffeePoint = 1 
+		;Open "/media/bt/xml/page_collect_point_3.xml" 
+		If StepGetPoint = 0 Then
+			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+		Else
+			Var CoffeePoint = 1 
+			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+		EndIf
+		
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+<Text>
+<X> 310 </X>
+<Y> 380 </Y>
+<Width> 474 </Width>
+<Align> Center </Align>
+<Size> 50 </Size>
+<Font> fontType1 </Font>
+<Color> 0xF0E000 </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum </Format>
+</Text>
+
+<Text>
+<X> 310 </X>
+<Y> 550 </Y>
+<Width> 474 </Width>
+<Align> Center </Align>
+<Size> 50 </Size>
+<Font> fontType1 </Font>
+<Color> 0xF0E000 </Color>
+<Value> "กรุณารอซักครู่..." </Value>
+</Text>
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+<EventActionOk>
+
+	If StepGetPoint = 0 Then
+		If PdpaAsk = 0 Then
+			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+		Else
+			Var StepGetPoint = 1
+    		GETACCEXT TelephoneNumber 5
+			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+		EndIf
+	Else
+		If Ext1a = "" Then
+			Var CoffeePoint = 1 
+			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+			
+		Else
+	
+			Var CoffeePoint1 = Ext21
+			INT CoffeePoint1
+		
+			Var CoffeePoint = 1 + CoffeePoint1
+			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+
+		EndIf
+	EndIf
+
+</EventActionOk>
+
+<EventActionError> 
+
+
+	If StepGetPoint = 0 Then
+		Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+	Else
+		Var CoffeePoint = 1 
+		Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+	EndIf
+
+</EventActionError> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 1
+	EndIf
+</EventMachine>
+
+
+</Popup>
+	

xml/page_show_consent.xml

@@ -0,0 +1,77 @@
+<Page>
+
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Background> "ROOT/image/BG_Consent.bmp" </Background>
+
+
+<EventOpen>
+	; On open
+	
+
+	Var Timeout = 0
+
+	
+    
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	;Open "ROOT/xml/menu_board.xml" 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 20 Then
+        Open "ROOT/xml/menu_page5.xml" 
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 1
+	EndIf
+</EventMachine>
+
+
+
+
+<Button>
+<X> 397 </X>
+<Y> 802 </Y>
+<Filename> "ROOT/image/BN_accept.bmp" </Filename>
+<FilenamePress> "ROOT/image/BP_accept.bmp" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+   
+    Var StepGetPoint = 1
+    GETACCEXT TelephoneNumber 5
+	Open "/media/bt/xml/menu_CollectPoint_Page2.xml"  
+</EventClick>
+</Button>
+
+<Button>
+<X> 576 </X>
+<Y> 802 </Y>
+<Filename> "ROOT/image/BN_decline.bmp" </Filename>
+<FilenamePress> "ROOT/image/BP_decline.bmp" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Open "ROOT/xml/menu_page5.xml" 
+</EventClick>
+</Button>
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>

xml/test_video_loop.xml

@@ -2,22 +2,9 @@
 <Scale> "ALL" </Scale>
 <Width> HeadScreenWidth </Width>
 <Height> HeadScreenHeight </Height>
-<Video> AdvFilename </Video>
+<Video> "/mnt/sdcard/coffeevending/video/adv_2020_2.mp4" </Video>
 <EventOpen>
-	Var Count = Count + 1
-	If VendingClass = "coffeeInthanin01" Then
-		If Count > 1 Then
-			Var Count = 1
-		EndIf
-	Else
-		If Count > 3 Then
-			Var Count = 1
-		EndIf
-	EndIf
 	
-	Var AdvFilename = "/mnt/sdcard/coffeevending/video/adv_main_0"
-	Var AdvFilename = AdvFilename + Count
-	Var AdvFilename = AdvFilename + ".mp4"
 	
 </EventOpen>
 
@@ -26,7 +13,7 @@
 	Open "/mnt/sdcard/coffeevending/xml/startup_head.xml" 
 </EventTimeout> 
 <EventEnd> 
-	Open "/mnt/sdcard/coffeevending/xml/test_video_loop.xml" 
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" 
 </EventEnd>
 <EventSecurity> 
 	Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"