add 15THB pro

image/event/image_template2

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+normal_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-normal_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+normal_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-press_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+press_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-press_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+press_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-disable_eng=ROOT/taobin_project/image/event/pro_tamatian_en.png
+disable_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-disable_thai=ROOT/taobin_project/image/event/pro_tamatian_th.png
+disable_thai=ROOT/taobin_project/image/event/pro_15THB_th.png

menu/new-layout.tsv

@@ -417,8 +417,18 @@ Name=pepween,file=page_catalog_group_pro_pepween.skt
 		อาถรรพ์คืนวันพุธ	Midnight's Enigma	เป๊ปซี่ น้ำเชื่อมบ๊วย มะนาว  และโซดา	Pepsi Plum Lime and Soda	-	12-99-05-0064	-	bn_midnight_enigma.png	-	-	-
 		ล่า ท้า หลอน	Unbelievers' Demise	เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน  และโซดา	Pepsi Jasmine Melon and Soda	-	12-99-05-0065	-	bn_unbelievers_demise.png	-	-	-
 		ดิน 7 ป่าช้า	7 Haunted Woods	เป๊ปซี่ นม และโอริโอ้	Pepsi, Milk, Oreo and Ice	-	-	12-99-03-0066	bn_haunted_woods.png	-	-	-
-		น้ำตาหมาดำ	Midnight Hound's Sorrow	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice			12-99-03-0067
+		น้ำตาหมาดำ	Midnight Hound's Sorrow	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice	-	-	12-99-03-0067	bn_Midnight_Hound_Sorrow.png	-	-	-
 
+Name=Pro15THB,file=page_catalog_group_pro_15THB.skt
+		น้ำมะนาว	LIMENADE	น้ำมะนาว น้ำตาล	Limenade, Sugar	-	12-05-02-0001	-	15THB/bn_iced_lime.png	-	-	-
+		น้ำแดง	SALAK DRINK	น้ำแดงกลิ่นสละ \n	Salak Syrup & Ice	-	12-05-02-0002	-	15THB/bn_sala.png	-	-	-
+		เป็ปซี่น้ำแข็ง	PEPSI	เป๊ปซี่	Pepsi, Ice	-	12-05-02-0007	-	15THB/bn_iced_pepsi.png	-	-	-
+		เต่าทรงพลัง	TAO POWER DRINK	เครื่องดื่มเต่าทรงพลัง  \n(มีคาเฟอีน)	Medicine drink & Ice	-	12-05-02-0034	-	15THB/bn_iced_energy_drink.png	-	-	-
+		เต่าทรงพลังโซดา	TAO POWER \nDRINK SODA	เครื่องดื่มเต่าทรงพลัง  โซดา	Medicine drink, Soda	-	12-05-02-0035	-	15THB/bn_iced_energy_drink_soda.png	-	-	-
+		ชาเขียวญี่ปุ่น	MATCHA	ชาเชียว และน้ำ	Matcha & Water	12-02-01-0027	12-02-02-0027	-	15THB/bn_hot_matcha_tea.png	-	-	-
+		ชามะลิ	JASMINE TEA	ชามะลิ น้ำ	Jasmine Tea ,Water	12-02-01-0045	12-02-02-0045	-	15THB/bn_hot_jasmine_tea	-	-	-
+		ชามะลิมะนาว	JASMINE LIME	ชามะลิ นำ้มะนาว น้ำ	Jasmine Tea, Limenade, Water	12-02-01-0048	12-02-02-0049	-	15THB/bn_jasmine_lime_tea.png	-	-	-
+		ชาดำ	THAI BLACK TEA	ชาไทย และน้ำ	Thai Tea & Water	12-02-01-0047	12-02-02-0047	-	15THB/bn_hot_black_thai_tea.png	-	-	-
 
 Name=CockTail,file=page_catalog_group_cocktail.skt
 		STX On The Beach	STX On The Beach	Pineapple juice, Limeade, \nSoda, Ice, Malibu	Pineapple juice, Limeade, \nSoda, Ice, Malibu	-	11-99-05-0001	-	bn_Alcohol_ILYSB.png	-	-	-	-	#N/A	-	#N/A	#N/A

xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_Tamatian.xml
+/event/promotion_15THB.xml

xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-Open "ROOT/taobin_project/xml/page_catalog_group_pro_melon.xml"
+Open "ROOT/taobin_project/xml/page_catalog_group_pro_15THB.xml"

xml/event/script_common_for_open_promotion_xml.ev

@@ -13,20 +13,21 @@ Else
 	; zone promote
 	If OpenFromPageBoard = 1 Then
 
-		If PepweenEnable = 1 Then
+	If pro15THBEnable = 1 Then
-			Var BigButtonEnable = "Enable"
+		Var BigButtonEnable = "Enable"
-			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+		OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
-		    Var OpenFromPageBoard = 0
+	    Var OpenFromPageBoard = 0
-		
+	
-		Else
-			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-		    
-		EndIf
 	Else
-		If PepweenEnable = 1 Then
+		OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-			; Temporary debug
+	    
-			Var BigButtonEnable = "Enable"
+	EndIf
-			Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+Else
+	If pro15THBEnable = 1 Then
+
+		; Temporary debug
+		Var BigButtonEnable = "Enable"
+		Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
 
 		Else
 

xml/event/tricker.ev

@@ -45,6 +45,9 @@ Var MayDayRunEnable = 0
 Var MilkChoiceVeganEnable = 0
 
 
+; Enable pro 15 THB, November 1 - 30
+Var pro15THBEnable = 0
+
 
 If SystemDateMonthInt = 10 Then
 
@@ -63,7 +66,7 @@ EndIf
 
 If SystemDateMonthInt = 11 Then
 	Var PepweenEnable = 0
-
+	Var pro15THBEnable = 1
 	If SystemDateDayInt = 1 Then
 		If SystemTimeHourInt < 5 Then
 			Var PepweenEnable = 1
@@ -78,6 +81,7 @@ EndIf
 If BoxID = 173149 Then
 	Var PepweenEnable = 1
 	Var MilkChoiceVeganEnable = 1
+	Var pro15THBEnable = 1
 EndIf
 
 If BoxID = 176757 Then

xml/page_catalog_group_pro_15THB.skt

@@ -0,0 +1,83 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    
+    Var Menu1Selected = "PressForever"
+
+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+    If show_eng = "true" Then 
+    
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    Else
+        Var text_unavailable = "หมด###size=32"
+    
+    EndIf
+
+    <?hurr 
+        #include=menu_catalog_new_menu.xml
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+
+
+;BigLogoLayout
+
+</Popup>
+
+

xml/page_catalog_group_pro_pepween.xml

@@ -557,7 +557,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 13
+; menu_new_list 14
 	; ==================> Len = 11
 	; - 12-99-05-0053 - 
 <Block>
@@ -3785,6 +3785,254 @@ Hag of village" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 11
+	; - - 12-99-03-0067 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-99-03-0067.Button,$Sum1299030067) </State> 
+	<Button>
+	<State> $Sum1299030067 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Midnight_Hound_Sorrow.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Midnight_Hound_Sorrow.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Midnight_Hound_Sorrow.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Midnight Hound's Sorrow"
+		Var NameDrinkTH = "น้ำตาหมาดำ"
+		Var DrinkDescriptionTH = "เป๊ปซี่ โกโก้ นม และโอริโอ้"
+		Var DrinkDescription = "Pepsi, Cocoa, Milk, Oreo and Ice"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Midnight_Hound_Sorrow.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-99-03-0067.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-99-03-0067"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-99-03-0067.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" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-99-03-0067"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-99-03-0067.NameE
+		Var menu_desc_eng_blender = $12-99-03-0067.descriptionE
+		Var menu_name_thai_blender = $12-99-03-0067.Name
+		Var menu_desc_thai_blender = $12-99-03-0067.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "น้ำตาหมาดำ" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "เป๊ปซี่ โกโก้ นม และโอริโอ้" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "Midnight Hound's Sorrow" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Pepsi, Cocoa, Milk, Oreo and Ice" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.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> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.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> $12-99-03-0067.Button </State>
+	</Image>
+	<Text>
+	<X> 180 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-99-03-0067.Button </State>
+	<Value> StringFmt(  $12-99-03-0067.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		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 $Sum1299030067 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-99-03-0067.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>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1299030067 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 </FrameScroll>

xml/page_topping_select7.xml

@@ -263,6 +263,12 @@
 	DEBUGVAR PriceD2
 	DEBUGVAR PriceD3
 
+	If OpenFromXML = "/mnt/sdcard/coffeevending//taobin_project/xml/page_catalog_group_pro_15THB.xml" Then
+		PriceD1 = 15
+		PriceD2 = 15
+		PriceD3 = 15
+	EndIf
+
 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
 	Else