Do

animation01/Menu Description - Sheet1.tsv

@@ -147,6 +147,20 @@ ESPRESSO BLUE DADDY	12-01-01-0020	1	2	36	3	4	5				24	66	1:06	32
 														
 Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 														
+OREO SMOOTHIE VOLCANO	12-03-03-0009	1	17	23							24	110	1:50	53
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
+														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
 double espresso	14-11-01-0001	1	2	3	4	5						116	1:56	28

animation01/Menu Description - Sheet1_.tsv

@@ -73,7 +73,6 @@ DRINKING WATER	12-05-02-0016	1	16								24	60	1:00	56
 Ice	12-05-02-0017	1	23								24	32	0:32	28
 Iced water	12-05-02-0018	1	23	16							24	62	1:02	29
 Hot Water	12-05-01-0002	1	16								24	55	0:55	51
-Coke	12-05-02-0019												0:00	#DIV/0!
 Sprite	12-05-02-0020	1	23	18							24	20	0:20	8
 7UP	12-05-02-0021	1	23	18							24	20	0:20	8
 MATCHA SHAKE	12-04-02-0001	1	25	26	9	6	7	23			24	181	3:01	30
@@ -142,10 +141,11 @@ Iced strawberrry tea	12-02-02-0022	1	10	19	23						24	85	1:25	27
 STRAWBERRY SHAKE	12-04-02-0013	1	25	26	19	17	23				24	178	2:58	35
 														
 ETHIOPAI BLUE DADDY DIRTY	12-01-02-0020	1	7	36	2	3	4	5			24	100	22:40	32
-HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	36	2	3	4	5	16			24	88	1:28	32
-ICED AMERICANO BLUE DADDY	12-01-02-0019	1	36	2	3	4	5	23	16		24	133	2:13	32
-ESPRESSO BLUE DADDY	12-01-01-0020	1	36	2	3	4	5				24	66	1:06	32
+HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	2	36	3	4	5	16			24	88	1:28	32
+ICED AMERICANO BLUE DADDY	12-01-02-0019	1	2	36	3	4	5	23	16		24	133	2:13	32
+ESPRESSO BLUE DADDY	12-01-01-0020	1	2	36	3	4	5				24	66	1:06	32
 														
+Coke	12-05-02-0019	1	23	37	13						24	49	0:49	23
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16

sheet/best_seller.tsv

@@ -1,4 +1,5 @@
 17/1/21	
+12-03-03-0009
 12-05-02-0019
 12-01-01-0019
 12-01-02-0019

xml/page_catalog.xml

@@ -72,6 +72,7 @@
 	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
 
 
+	Var countClick = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -311,8 +312,12 @@
 	DEBUGVAR countClick
 
 	If countClick = 5 Then
-		Var countClick = 0
-		Open "ROOT/taobin_project/xml/page_tel_number_mask.xml"
+		If ToppingNewEnable = "false" Then
+			Var ToppingNewEnable = "true"
+		Else
+			Var ToppingNewEnable = "false"
+		EndIf
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
 	EndIf
 
 	Refresh

xml/page_catalog_choose_drink4.pml

@@ -22,6 +22,7 @@
  product_code.append('12-03-02-0005')
  #product_code.append('12-03-02-0002')
  product_code.append('12-03-02-0007')
+ product_code.append('12-03-03-0009')
 
  menu_count = len( product_code)
 ?>

xml/page_catalog_choose_drink4.xml

@@ -1377,6 +1377,99 @@
 	<State> showengText </State>
 	<Value> $12-03-02-0007.descriptionE </Value>
 	</Text>
+</Block>
+	; button i=13 12-03-03-0009 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-03-03-0009.Button  </State> 
+	<Button>
+	<State> $12-03-03-0009.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-03-0009.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-03-0009.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-03-0009.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-03-03-0009.Self
+		Var NameDrink = $12-03-03-0009.NameE
+		Var NameDrinkTH = $12-03-03-0009.Name
+		Var DrinkDescriptionTH = $12-03-03-0009.description
+		Var DrinkDescription = $12-03-03-0009.descriptionE
+		Var PriceDrink = $12-03-03-0009.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-03-0009.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.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-03-03-0009.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-03-03-0009.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-03-03-0009.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-03-03-0009.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-03-03-0009.descriptionE </Value>
+	</Text>
 </Block>
 </FrameScroll>
 

xml/page_topping_select.xml

@@ -6,8 +6,13 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	Var y_topping_bg = 912
-	Open "ROOT/taobin_project/xml/page_topping_select2.xml"
-	
+
+	If ToppingNewEnable = "false" Then
+
+	Else
+		Open "ROOT/taobin_project/xml/page_topping_select2.xml"
+	EndIf
+
 	DEBUGVAR video_menu_0
 
 	Var DisableUsingCode = "false"

xml/page_topping_select2.xml

@@ -9,8 +9,12 @@
 	
 	DEBUGVAR video_menu_0
 
+	DEBUGVAR SelectDrink
+	
 	Var SaveProductCodeSelect = SelectDrink
-	DEBUGVAR SaveProductCodeSelect
+	Var UserSelectProductCode = SelectDrink
+	
+	DEBUGVAR UserSelectProductCode
 
 	Var blendedState = "Invisible"
 	Var DisableUsingCode = "false"
@@ -65,7 +69,6 @@
 		Var showdesc = DrinkDescription
 
 
-		Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" 
 
 	Else
 	
@@ -124,7 +127,7 @@
 	Var ToppingGotoPayment = "true"
 
 	DEBUGVAR backGroundAddExtra
-	
+	DEBUGVAR backGroundAddShotPremium
 	
 </EventOpen>
 <Timeout> 2000 </Timeout>
@@ -285,6 +288,9 @@
 			Var blendedState = "Enable"
 			Var blendedStateShow = "Enable"
 
+			Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop
+ 
+
 		EndIf
 
 		If IgnoreLidStraw = "true" Then
@@ -392,6 +398,7 @@
 		If TOPPING1 = "Sugar Premix 25" Then
 			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 2
+			Var SugarState1 = "Disable"
 			Var SugarState2 = "Enable"
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
@@ -631,7 +638,7 @@
 	
 <Width> 986 </Width>
 <Height> 160 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> blendedStateShow </State> 
 
 <Image>
@@ -651,27 +658,26 @@
 	
 	SAVELOG "Press Smoothies"
 
- 
 	DEBUGVAR PriceDrinkNoTop
 
 	If blendedState = "Press" Then
-		Var PriceDrinkTmp = PriceDrinkNoTop
+		Var PriceDrinkTmp = PriceDrinkTmp - PriceDiff
 		Var blendedState = "Enable"
 		Var UserSelectProductCode = SaveProductCodeSelect
 	Else
 		Var blendedState = "Press"
-		Var PriceDrinkTmp = SubMenuPrice1
+		Var PriceDrinkTmp = PriceDrinkTmp + PriceDiff
 		Var UserSelectProductCode = SubMenuProductCode1
 	
 	EndIf
 
 	DEBUGVAR UserSelectProductCode
+	Var PriceDrinkNoTop = PriceDrinkTmp
 
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 
-
-	Refresh
-</EventClick>
+	SAVELOG PriceDrinkTmp
+	Refresh</EventClick>
 </Button>
 
 <Button>
@@ -702,7 +708,7 @@
 
 <Width> 988 </Width>
 <Height> 156 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> "Enable" </State> 
 ;<State> BGSugar </State> 
 ; sugar layout
@@ -722,6 +728,7 @@
 <State> SugarState1 </Stage>
 <Filename> Var( DirImage + "/bn_sugar1.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_sugar1.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugar1.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -748,6 +755,7 @@
 <State> SugarState2 </Stage>
 <Filename> Var( DirImage + "/bn_sugar2.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_sugar2.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugar2.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -922,7 +930,7 @@
 <Block>	
 <Width> 986 </Width>
 <Height> 164 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> ShotCoffeePremium </State>
 <Image>
 <Filename> backGroundAddShotPremium </Filename>
@@ -942,13 +950,13 @@
 	
 	If showShotEnable = "Press" Then
 		Var showShotEnable = "Enable"
-		Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2
+		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
 		Var topping2 = toppingID2index1
 		Var DisableUsingCode = "false"
 		SAVELOG "Deselect add premium shot"
 	Else
 		Var showShotEnable = "Press"
-		Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
+		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
 		Var topping2 = toppingID2index2
 		Var DisableUsingCode = "true"
 		SAVELOG "Select add premium shot"
@@ -1023,7 +1031,7 @@
 <Block>	
 <Width> 986 </Width>
 <Height> 157 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> ShotCoffeeBG </State>
 <Image>
 <Filename> backGroundAddExtra </Filename>
@@ -1125,7 +1133,7 @@
 <Block>
 <Width> 987 </Width>
 <Height> 188 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> ShowLidOnly </State> 
 <Image>
 <State> "Enable" </State>
@@ -1184,7 +1192,7 @@
 <Block>
 <Width> 987 </Width>
 <Height> 188 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> ShowStrawOnly </State> 
 <Image>
 <State> "Enable" </State>
@@ -1244,7 +1252,7 @@
 <Block>
 <Width> 986 </Width>
 <Height> 240 </Height>
-<MarginTop> 10 </MarginTop>
+<MarginTop> 20 </MarginTop>
 <State> ShowLidStraw </State> 
 <Image>
 <Filename> bg_strawlid </Filename>