AUS: Added Energy drink catalog

inter/aus/animation01/play_list.tsv

@@ -851,3 +851,11 @@ Hot Coconut Matcha tea	51-02-01-0061	1	8	9	62						24	120	17:00	23
 Frappe Vanilla Caramel Latte	51-21-03-0079	1	2	3	4	5	63	22	23	41	24	120	17:00	23
 Hot strawberry matcha	51-02-01-0071	1	8	9	19	70					24	120	17:00	23
 Frappe strawberry matcha latte	51-02-03-0071	1	8	9	19	70	23	41			24	120	17:00	23
+
+Yuzu Turtle Power Energy	51-05-02-9990	1	53	34	13	23					24	120	17:00	23
+Strawberry Turtle Power Energy	51-05-02-9991	1	19	34	13	23					24	120	17:00	23
+Coconut Turtle Power Energy	51-05-02-9992	1	62	34	13	23					24	120	17:00	23
+Mint Turtle Power Energy	51-05-02-9993	1	59	34	13	23					24	120	17:00	23
+Vanilla Turtle Power Energy	51-05-02-9994	1	34	13	23						24	120	17:00	23
+Caramel Turtle Power Energy	51-05-02-9995	1	22	34	13	23					24	120	17:00	23
+Lychee Turtle Power Energy	51-05-02-9996	1	11	34	13	23					24	120	17:00	23

inter/aus/configure.ev

@@ -1,6 +1,6 @@
 
 	If BoxID = 200027 Then
-		Var EnableMultiInstanceFromBoxID = 1
+		Var EnableMultiInstanceFromBoxID = 0
 	EndIf
 
 	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig

inter/aus/menu/lang.tsv

@@ -18,6 +18,7 @@ TextID	Note	English	Thai
 000011		Kid Menu	เมนูเด็ก
 000012		App Fast	แอพ ฟาสท์
 000025		Dessert	ของหวาน
+000026		Energy Drink	Energy Drink
 
 	Menu 
 		Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal	Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal

inter/aus/xml/menu_catalog_default_init.lxml

@@ -108,18 +108,15 @@
             Var Menu7Selected = "Invisible"
         EndIf
 
-        If RecipeTag1 = "HealthTurnOn" Then
         Var Menu22Selected = "Enable"
-        Else
+        Var Menu23Selected = "Enable"
-            Var Menu22Selected = "Invisible"
-        EndIf
 
-        If WinterWarmersCatalogFlag = 1 Then
+        ;If WinterWarmersCatalogFlag = 1 Then
-            Var MenuWinterWarmersCatalogState = "Enable"
+        ;    Var MenuWinterWarmersCatalogState = "Enable"
-        Else
+        ;Else
-            Var MenuWinterWarmersCatalogState = "Invisible"
+        ;    Var MenuWinterWarmersCatalogState = "Invisible"
-        EndIf
+        ;EndIf
-        DEBUGVAR WinterWarmersCatalogFlag
+        ;DEBUGVAR WinterWarmersCatalogFlag
-        DEBUGVAR MenuWinterWarmersCatalogState
+        ;DEBUGVAR MenuWinterWarmersCatalogState
         ;
 

inter/aus/xml/menu_catalog_new.lxml

@@ -384,6 +384,26 @@
         </EventClick>
         </Button>
 
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu23Selected </State>
+        <Filename> Var( DirImageAlterAus + "/bn_energy_drink.png") </Filename>
+        <FilenamePress> Var( DirImageAlterAus + "/bp_energy_drink.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick>
+            Var NextPage = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_energy_drink.lxml"
+
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_energy_drink.lxml"
+
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            Open OpenFileXML
+        </EventClick>
+        </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
@@ -444,19 +464,19 @@
         </EventClick>
         </Button>
 
-        <Button>
+        ;<Button>
-        <Layout> "linear" </Layout>
+        ;<Layout> "linear" </Layout>
-        <State> MenuWinterWarmersCatalogState </State>
+        ;<State> MenuWinterWarmersCatalogState </State>
-        <Filename> "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_winter_warmers.png" </Filename>
+        ;<Filename> "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_winter_warmers.png" </Filename>
-        <FilenamePress> "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_winter_warmers.png" </FilenamePress>
+        ;<FilenamePress> "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_winter_warmers.png" </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
+        ;<Volume> SoundVolume </Volume>
-        <EventClick>
+        ;<EventClick>
-            Var NextPage = "-"
+        ;    Var NextPage = "-"
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+        ;    Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
-            Open OpenFileXML
+        ;    Open OpenFileXML
-        </EventClick>
+        ;</EventClick>
-        </Button>
+        ;</Button>
 </Row2>
 </ListView1>
 

inter/aus/xml/open_page_catalog.ev

@@ -1,3 +1,4 @@
+DEBUGVAR EnableMultiInstance
 If EnableMultiInstance = "true" Then
 	Var OpenFromPageBoard = 1
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"

inter/aus/xml/page_catalog.lxml

@@ -493,7 +493,8 @@
 
 
 <Button>
-<X> 220 </X>
+;<X> 220 </X>
+<X> 47 </X>
 <Y> 1532 </Y>
 <State>WheyButtonState</State>
 <Filename> Var(DirImage + "/bn_protein.png") </Filename>
@@ -520,7 +521,8 @@
 
 
 <Button>
-<X> 564 </X>
+;<X> 564 </X>
+<X> 391 </X>
 <Y> 1532 </Y>
 <State> "Enable" </State>
 <Filename> Var(DirImageAUS + "/bn_dessert.png") </Filename>
@@ -546,28 +548,55 @@
 </Language>
 </Button>
 
-
 <Button>
-<X> 736 </X>
+<X> 748 </X>
 <Y> 1532 </Y>
-<State> "Invisible" </State>
+<State> "Enable" </State>
-<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
+<Filename> Var(DirImageAUS + "/bn_energy_drink.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
+<FilenamePress> Var(DirImageAUS + "/bp_energy_drink.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
-	;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
+	;Open "ROOT/taobin_project/xml/page_catalog_group_energy_drink.lxml"
 
 
-	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_energy_drink.lxml"
 	Open OpenFileXML
 
 </EventClick>
+<Language>
+	<ID> 000026 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
 </Button>
 
 
+;<Button>
+;<X> 736 </X>
+;<Y> 1532 </Y>
+;<State> "Invisible" </State>
+;<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
+;<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick>
+;	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+;
+;	;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
+;
+;
+;	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+;	Open OpenFileXML
+;
+;</EventClick>
+;</Button>
+
+
 ;###############################################################
 
 <Button>

inter/aus/xml/page_catalog_group_energy_drink.skt

@@ -0,0 +1,42 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"
+    Var Menu23Selected = "PressForever"
+
+
+
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+
+</Popup>

inter/aus/xml/page_catalog_group_milk.lxml

@@ -36,6 +36,280 @@
 		Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
+	; ==================> Len = 3
+	; 51-03-01-0005 51-03-02-0005 51-03-03-0005 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-03-01-0005.Button,51-03-02-0005.Button,51-03-03-0005.Button,$Sum510301000551030200055103030005) </State> 
+	<Button>
+	<State> $Sum510301000551030200055103030005 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $51-03-01-0005.Price
+		Var PriceD2 = $51-03-02-0005.Price
+		Var PriceD3 = $51-03-03-0005.Price
+		Var PD_CODE1 = "51-03-01-0005"
+		Var PD_CODE2 = "51-03-02-0005"
+		Var PD_CODE3 = "51-03-03-0005"
+		; begin lang 
+		Var aliasName[0] = "MILK"
+		Var aliasDesc[0] = "Milk"
+		Var aliasName[1] = "นม"
+		Var aliasDesc[1] = "นม"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = "WARM MILK"
+		Var NameLang[0][1] = "นมร้อน"
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = "SUSU SUAM"
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = "Milk"
+		Var DescLang[0][1] = "นม"
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = "Susu"
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "MILK WITH Iced"
+		Var NameLang[1][1] = "นมเย็น"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = "SUSU AIS"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Milk, Ice"
+		Var DescLang[1][1] = "นม และน้ำแข็ง"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = "Susu, Ice"
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "MILK SMOOTHIE"
+		Var NameLang[2][1] = "นมปั่น"
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU"
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Milk, Ice"
+		Var DescLang[2][1] = "นม และน้ำแข็ง"
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = "Susu, Ais"
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = $51-03-01-0005.Button
+		Var PD_STAGE_2 = $51-03-02-0005.Button
+		Var PD_STAGE_3 = $51-03-03-0005.Button
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "51-03-02-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "51-03-01-0005"
+			Else
+			Topping "Load" "51-03-03-0005"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>MILK</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>MILK</LanguageSlot3>
+		<LanguageSlot4>นม</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>นม</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Milk</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>Milk</LanguageSlot3>
+		<LanguageSlot4>นม</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>นม</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $51-03-01-0005.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-03-01-0005.Button </State>
+	<Value> StringFmt(  $51-03-01-0005.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $51-03-02-0005.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-03-02-0005.Button </State>
+	<Value> StringFmt( $51-03-02-0005.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $51-03-03-0005.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-03-03-0005.Button </State>
+	<Value> StringFmt(  $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum510301000551030200055103030005 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum510301000551030200055103030005 = "Disable" Then
+				STRCONTAIN "ERR" $51-03-01-0005.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-03-02-0005.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-03-03-0005.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum510301000551030200055103030005 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 3
 	; 51-03-01-0002 51-03-02-0002 51-03-03-0002 
 <Block>