Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

2022-01-19 14:34:08 +07:00 · 2022-01-19 14:34:08 +07:00 · 8138624cb0
commit 8138624cb0
parent 56e3ebb80a b1744e1726
72 changed files with 723 additions and 408 deletions
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -34,7 +34,7 @@
 	Var web_readyOK = "false"

 	Var GetFreeFromError = 0
-	Var taobin_version = "2.00"
+	Var taobin_version = "2.03"
 	
 	Cart "DeleteMenuID" "ALL"
 	Var MultiPayEnable = "true"
@ -108,8 +108,8 @@
 	;Var IgnoreNetCore = "false"
 	;DEBUGVAR SaleProfile

-	STRCONTAIN "whey" SaleProfile WheyShow 
-	STRCONTAIN "cocktail" SaleProfile CocktailShow 
+	;STRCONTAIN "whey" SaleProfile WheyShow 
+	;STRCONTAIN "cocktail" SaleProfile CocktailShow 
 	;STRCONTAIN "roadshow" SaleProfile RoadShow

 	Var cock_tail_str = ""
@ -226,7 +226,7 @@

 	LED LedDoorLid Off 255 255 255 255

-	DEBUGVAR AdvertiseProfile
+

 	SPLIT   AdvertiseProfile    "/"   1   AdvertiseProfile1
 	SPLIT   AdvertiseProfile    "/"   2   AdvertiseProfile2
@ -378,6 +378,25 @@
 	
 	Machine CancelWepApp

+
+	;StrLen AdvertiseProfile AdvertiseProfileLen
+	;
+	;If AdvertiseProfileLen = 0 Then
+	;	CacheVarStr "get" AdvertiseProfile
+	;Else
+	;
+	;	STRCONTAIN "00/00" AdvertiseProfile advPro
+	;	
+	;	If advPro = "true" Then
+	;		CacheVarStr "get" AdvertiseProfile
+	;	Else
+	;		CacheVarStr "put" AdvertiseProfile
+	;	EndIf
+	;EndIf
+
+	DEBUGVAR AdvertiseProfile
+
+
 </EventOpen>

 <Timeout> 1000 </Timeout>
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@ -425,11 +425,18 @@
 			EndIf


-			Var PayDetail = "1/" + HURR_FOREVER
-			Var PayDetail = PayDetail + "/"  
-			Var PayDetail = PayDetail + SAMESALARY
-			Var PayDetail = PayDetail + "/"
-			Var PayDetail = PayDetail + NOBONUS
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+
+			EndIf



@ -471,11 +478,18 @@
 				Var PayO2 = Seeker.CoffeePinNumber
 			EndIf

-			Var PayDetail = "1/" + HURR_FOREVER
-			Var PayDetail = PayDetail + "/"  
-			Var PayDetail = PayDetail + SAMESALARY
-			Var PayDetail = PayDetail + "/"
-			Var PayDetail = PayDetail + NOBONUS
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+
+			EndIf

 			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"

@ -510,11 +524,19 @@
 				Var ACC = Seeker.TNumberTaobinMember
 			EndIf

-			Var PayDetail = "1/" + HURR_FOREVER
-			Var PayDetail = PayDetail + "/"  
-			Var PayDetail = PayDetail + SAMESALARY
-			Var PayDetail = PayDetail + "/"
-			Var PayDetail = PayDetail + NOBONUS
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+				
+			EndIf



--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@ -14,6 +14,7 @@
 product_code.append('12-01-01-0022')
 product_code.append('12-01-01-0026')
 product_code.append('12-01-01-0024')
+ product_code.append('12-01-01-0028')

 # Normal esp
 product_code.append('12-11-01-0001')
@ -25,6 +26,7 @@
 product_code.append('12-01-01-0021')
 product_code.append('12-01-01-0025')
 product_code.append('12-01-01-0023')
+ product_code.append('12-01-01-0027')
 
 # End
 product_code.append('12-01-01-0004')
@ -44,6 +46,7 @@
 product_code.append('12-01-02-0022')
 product_code.append('12-01-02-0026')
 product_code.append('12-01-02-0024')
+ product_code.append('12-01-02-0028')

 # End
 product_code.append('12-11-02-0001')
@ -55,6 +58,7 @@
 product_code.append('12-01-02-0021')
 product_code.append('12-01-02-0025')
 product_code.append('12-01-02-0023')
+ product_code.append('12-01-02-0027')

 # End
 product_code.append('12-01-02-0002')
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@ -930,7 +930,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=7 12-11-01-0001 
+	; button i=7 12-01-01-0028 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0028.Button  </State> 
+	<Button>
+	<State> $12-01-01-0028.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0028.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0028.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0028.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0028.Self
+		Var NameDrink = $12-01-01-0028.NameE
+		Var NameDrinkTH = $12-01-01-0028.Name
+		Var DrinkDescriptionTH = $12-01-01-0028.description
+		Var DrinkDescription = $12-01-01-0028.descriptionE
+		Var PriceDrink = $12-01-01-0028.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0028.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0028.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0028.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0028.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0028.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0028.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0028.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-01-0028.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=8 12-11-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1036,7 +1142,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=8 12-01-01-0003 
+	; button i=9 12-01-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1142,7 +1248,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=9 12-01-01-0014 
+	; button i=10 12-01-01-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1248,7 +1354,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=10 12-01-01-0019 
+	; button i=11 12-01-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1354,7 +1460,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=11 12-01-01-0021 
+	; button i=12 12-01-01-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1460,7 +1566,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=12 12-01-01-0025 
+	; button i=13 12-01-01-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1566,7 +1672,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=13 12-01-01-0023 
+	; button i=14 12-01-01-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1672,7 +1778,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=14 12-01-01-0004 
+	; button i=15 12-01-01-0027 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0027.Button  </State> 
+	<Button>
+	<State> $12-01-01-0027.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0027.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0027.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0027.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0027.Self
+		Var NameDrink = $12-01-01-0027.NameE
+		Var NameDrinkTH = $12-01-01-0027.Name
+		Var DrinkDescriptionTH = $12-01-01-0027.description
+		Var DrinkDescription = $12-01-01-0027.descriptionE
+		Var PriceDrink = $12-01-01-0027.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0027.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-01-0027.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0027.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0027.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0027.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0027.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0027.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-01-0027.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=16 12-01-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1778,7 +1990,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=15 12-01-01-0005 
+	; button i=17 12-01-01-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1884,7 +2096,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=16 12-01-01-0006 
+	; button i=18 12-01-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1990,7 +2202,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=17 12-01-01-0007 
+	; button i=19 12-01-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2096,7 +2308,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=18 12-01-01-0009 
+	; button i=20 12-01-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2202,7 +2414,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=19 12-01-01-0010 
+	; button i=21 12-01-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2308,7 +2520,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=20 12-01-01-0011 
+	; button i=22 12-01-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2414,7 +2626,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=21 12-01-01-0012 
+	; button i=23 12-01-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2520,7 +2732,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=22 12-01-01-0017 
+	; button i=24 12-01-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2626,7 +2838,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=23 12-01-02-0018 
+	; button i=25 12-01-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2732,7 +2944,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=24 12-01-02-0020 
+	; button i=26 12-01-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2838,7 +3050,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=25 12-01-02-0022 
+	; button i=27 12-01-02-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2944,7 +3156,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=26 12-01-02-0026 
+	; button i=28 12-01-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3050,7 +3262,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=27 12-01-02-0024 
+	; button i=29 12-01-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3156,7 +3368,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=28 12-11-02-0001 
+	; button i=30 12-01-02-0028 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0028.Button  </State> 
+	<Button>
+	<State> $12-01-02-0028.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0028.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0028.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0028.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0028.Self
+		Var NameDrink = $12-01-02-0028.NameE
+		Var NameDrinkTH = $12-01-02-0028.Name
+		Var DrinkDescriptionTH = $12-01-02-0028.description
+		Var DrinkDescription = $12-01-02-0028.descriptionE
+		Var PriceDrink = $12-01-02-0028.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0028.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0028.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0028.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0028.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0028.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0028.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0028.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-02-0028.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=31 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3262,7 +3580,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=29 12-01-02-0001 
+	; button i=32 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3368,7 +3686,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=30 12-01-02-0011 
+	; button i=33 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3474,7 +3792,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=31 12-01-02-0019 
+	; button i=34 12-01-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3580,7 +3898,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=32 12-01-02-0021 
+	; button i=35 12-01-02-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3686,7 +4004,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=33 12-01-02-0025 
+	; button i=36 12-01-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3792,7 +4110,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=34 12-01-02-0023 
+	; button i=37 12-01-02-0023 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3898,7 +4216,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=35 12-01-02-0002 
+	; button i=38 12-01-02-0027 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0027.Button  </State> 
+	<Button>
+	<State> $12-01-02-0027.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0027.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0027.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0027.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0027.Self
+		Var NameDrink = $12-01-02-0027.NameE
+		Var NameDrinkTH = $12-01-02-0027.Name
+		Var DrinkDescriptionTH = $12-01-02-0027.description
+		Var DrinkDescription = $12-01-02-0027.descriptionE
+		Var PriceDrink = $12-01-02-0027.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0027.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-01-02-0027.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0027.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0027.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0027.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0027.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0027.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-01-02-0027.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=39 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4004,7 +4428,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=36 12-11-02-0002 
+	; button i=40 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4110,7 +4534,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=37 12-01-02-0003 
+	; button i=41 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4216,7 +4640,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=38 12-01-02-0004 
+	; button i=42 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4322,7 +4746,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=39 12-01-02-0005 
+	; button i=43 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4428,7 +4852,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=40 12-01-02-0007 
+	; button i=44 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4534,7 +4958,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=41 12-01-02-0008 
+	; button i=45 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4640,7 +5064,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=42 12-01-02-0009 
+	; button i=46 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4746,7 +5170,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=43 12-01-02-0017 
+	; button i=47 12-01-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4852,7 +5276,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=44 12-01-02-0006 
+	; button i=48 12-01-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -249,6 +249,7 @@

 								TransferVar "next" "curr"
 								Var Seeker = "curr"
+								SAVELOG "Make next order by take-cup"
 								
 								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
 							EndIf
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -71,6 +71,9 @@

 	SAVELOG MachineStage

+
+	READ_FILE "/mnt/sdcard/can_sell" ReadyForBrew
+
 	If ReadyForBrew = "false" Then
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 		Var ReadyForBrew = "false"
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -370,6 +370,8 @@

 	EndIf

+	__CMD "prepar-cup-from-order" 0 "-" "-"
+
 </EventOpen>

 <EventActionOk>
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@ -213,7 +213,11 @@
 					Else
 						Var CART_INDEX = 0

-						MakeDrinkV1  SelectDrink SelectSugarID
+						If Seeker = "curr" Then
+							MakeDrinkV1  SelectDrink SelectSugarID
+						Else
+							DEBUGVAR Seeker
+						EndIf
 						Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 					EndIf
 				EndIf
--- a/xml/page_payment_storeCredit3.xml
+++ b/xml/page_payment_storeCredit3.xml
@ -60,7 +60,12 @@
 			Else
 				Var CART_INDEX = 0

-				MakeDrinkV1  SelectDrink SelectSugarID
+				If Seeker = "curr" Then
+					MakeDrinkV1  SelectDrink SelectSugarID
+				Else
+					DEBUGVAR Seeker
+				EndIf
+				
 				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 		EndIf
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -125,7 +125,7 @@

 		If 	CART_INDEX = 0  Then   
 			DEBUGVAR Seeker.selected_a_drink
-			If NextOrderStatus = "fail" Then
+			If NextOrderStatus = "Disable" Then
 				Var LastMakeDrinkResult = "fail"
 			Else
 				
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@ -12,6 +12,7 @@
 	
 	DEBUGVAR EnableSelectMenuBetweenBrew
 	
+	
 	If JXMLVersionInt >= 369 Then
 		If EnableSelectMenuBetweenBrew = "Enable" Then
 			Open "ROOT/taobin_project/xml/page_topping_select4.xml"
--- a/xml/page_topping_select3.xml
+++ b/xml/page_topping_select3.xml
@ -650,7 +650,16 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
-		If TOPPING2 = "add-show-1010" Then
+		If TOPPING2 = "add-show-1101" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
+		If TOPPING2 = "add-show-1102" Then
 	
 			Var ShotCoffeePremium = "Enable"
 			Var showShotEnable = "Enable"
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@ -13,6 +13,14 @@

 	DEBUGVAR SelectDrink
 	DEBUGVAR PictureDrink
+
+	If SelectDrinkLen = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+
+	If PriceDrink = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
 	
 	Var SaveProductCodeSelect = SelectDrink
 	Var UserSelectProductCode = SelectDrink
@ -641,6 +649,32 @@
 			Refresh
 		EndIf

+		If TOPPING2 = "add-show-1009" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+		If TOPPING2 = "add-show-1101" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
+		If TOPPING2 = "add-show-1102" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
 ;-END
 		If TOPPING3 = "Collagen" Then
 			Var CollagenState = "Enable"
@ -1554,8 +1588,12 @@

 	;Var Seeker = "curr"

-
-	Var Seeker.PriceDrink = PriceDrinkTmp
+	DEBUGVAR PriceDrinkTmp
+	
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	Var PriceDrink = PriceDrinkTmp
+	
 	SAVELOG "USER press next ( topping ) - new"

 	Var Seeker.topping1 = topping1
--- a/xml/video_loop2.xml
+++ b/xml/video_loop2.xml
@ -12,7 +12,7 @@
 	Var ClickCountMainTe = 0
 </EventOpen>

-<Timeout> 14000 </Timeout>
+<Timeout> 33000 </Timeout>
 <EventTimeout> 
 	Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
 	Var AdvImageFile = AdvImageFile + FileNumber