do frozen smoothie

inter/tha/menu/lang.tsv

@@ -1202,7 +1202,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1215,7 +1215,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -26,7 +26,8 @@
 	OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
 	RootLayoutVisible 13 "show"
 	 RootLayoutVisible 12 "show" 
-
+	RootLayoutVisible 3 "show"
+	
 	DEBUGVAR SlientRefreshIndex
     
 </EventOpen>

inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py

@@ -298,7 +298,8 @@
       out_xml( '\t\t\t\tVar show_eng =  "true"\n')
       out_xml( '\t\t\tEndIf\n')
 
-
+      print("topping_xml_file=" + topping_xml_file)
+      print("current_file_name=" + current_file_name)
       out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\n')
       out_xml( '\t\t\tElse\n')
       out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"\n')

inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml

@@ -0,0 +1,311 @@
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<ScrollableCatalog>
+	<X> 0 </X>
+	<Y> 497 </Y>
+	<Width> 1080 </Width>
+	<Height> 1423 </Height>
+	<Configuration>
+		<MenuNameTextConfiguration>
+			<Font> KanitMediumTTF </Font>
+			<Color> 0x322B26 </Color>
+			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<AutoResizeConfiguration>
+				<Min> 16 </Min>
+				<Max> 22 </Max>
+				<AdjustStep> 1 </AdjustStep>
+			</AutoResizeConfiguration>
+		</MenuNameTextConfiguration>
+		<MenuDescriptionTextConfiguration>
+			<Font> KanitMediumTTF </Font>
+			<Color> 0x322B26 </Color>
+			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<AutoResizeConfiguration>
+				<Min> 10 </Min>
+				<Max> 14 </Max>
+				<AdjustStep> 1 </AdjustStep>
+			</AutoResizeConfiguration>
+		</MenuDescriptionTextConfiguration>
+		<MenuPriceTextConfiguration>
+			<Font> KanitRegularTTF </Font>
+			<Color> 0x6F5F51 </Color>
+			<ColorDisable> 0xEAE6E1 </ColorDisable>
+			<AutoResizeConfiguration>
+				<Min> 4 </Min>
+				<Max> 20 </Max>
+				<AdjustStep> 1 </AdjustStep>
+			</AutoResizeConfiguration>
+		</MenuPriceTextConfiguration>
+		<MenuHotPriceLabel> "Hot" </MenuHotPriceLabel>
+		<MenuIcePriceLabel> "Ice" </MenuIcePriceLabel>
+		<MenuBlendPriceLabel> "Blend" </MenuBlendPriceLabel>
+		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
+	</Configuration>
+	<Menus>
+;banners
+			; ==================> Len = 3
+		; - - 12-00-07-0001 
+		<Menu>
+		<State> Flag( 12-00-07-0001.Button,$Sum1200070001) </State>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" </DisableImage>
+		<Name>
+			<LanguageGroup>
+				<LanguageSlot1>Mango Smoothie</LanguageSlot1>
+				<LanguageSlot2>มะม่วงปั่น</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>-</LanguageSlot6>
+			</LanguageGroup>
+		</Name>
+		<Description>
+			<LanguageGroup>
+				<LanguageSlot1>Mango Frozen</LanguageSlot1>
+				<LanguageSlot2>มะม่วงสุขแช่แข็ง</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>-</LanguageSlot6>
+			</LanguageGroup>
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> "Disable2" </IceState>
+		<BlendState> $12-00-07-0001.Button </BlendState>
+		<HotPrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </HotPrice>
+		<IcePrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </IcePrice>
+		<BlendPrice> eval( 
+		If $12-00-07-0001.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-00-07-0001.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "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
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<ConditionalDisable>
+			<Script>
+				If $Sum1200070001 = "Disable" Then
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag1_is_disable
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag2_is_disable
+					STRCONTAIN "STG=CLOSE" $12-00-07-0001.TAG tag3_is_disable
+					If tag1_is_disable = "true" Then
+						Var $Sum1200070001Tag = $##-##-##-####.TAG
+					EndIf
+					If tag2_is_disable = "true" Then
+						Var $Sum1200070001Tag = $##-##-##-####.TAG
+					EndIf
+					If tag3_is_disable = "true" Then
+						Var $Sum1200070001Tag = $12-00-07-0001.TAG
+					EndIf
+					Var $Sum1200070001TextValue !assigned GETS($Sum1200070001Tag,"MSG")
+					Var $Sum1200070001TextID !assigned GETS($Sum1200070001Tag,"TextID")
+					If $Sum1200070001TextID != "" Then
+						Var $Sum1200070001TextValue = ""
+					EndIf
+					If $Sum1200070001TextValue = "" Then
+						If $Sum1200070001TextID = "" Then
+							Var $Sum1200070001TextID = "000013"
+						EndIf
+					EndIf
+				EndIf
+			</Script>
+			<ID> $Sum1200070001TextID </ID>
+			<Value> $Sum1200070001TextValue </Value>
+		</ConditionalDisable>
+		<EventOnClick>
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png"
+			GetInstanceIDMenuTab OpenFromInstMenuTab
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $##-##-##-####.Price
+			Var PriceD3 = $12-00-07-0001.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "##-##-##-####"
+			Var PD_CODE3 = "12-00-07-0001"
+			; begin lang
+			Var aliasName[0] = "Mango Smoothie"
+			Var aliasDesc[0] = "Mango Frozen"
+			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] = ""
+			Var NameLang[0][1] = ""
+			Var NameLang[0][2] = ""
+			Var NameLang[0][3] = ""
+			Var NameLang[0][4] = ""
+			Var NameLang[0][5] = ""
+			Var DescLang[0][0] = ""
+			Var DescLang[0][1] = ""
+			Var DescLang[0][2] = ""
+			Var DescLang[0][3] = ""
+			Var DescLang[0][4] = ""
+			Var DescLang[0][5] = ""
+			Var NameLang[1][0] = ""
+			Var NameLang[1][1] = ""
+			Var NameLang[1][2] = ""
+			Var NameLang[1][3] = ""
+			Var NameLang[1][4] = ""
+			Var NameLang[1][5] = ""
+			Var DescLang[1][0] = ""
+			Var DescLang[1][1] = ""
+			Var DescLang[1][2] = ""
+			Var DescLang[1][3] = ""
+			Var DescLang[1][4] = ""
+			Var DescLang[1][5] = ""
+			Var NameLang[2][0] = ""
+			Var NameLang[2][1] = ""
+			Var NameLang[2][2] = ""
+			Var NameLang[2][3] = ""
+			Var NameLang[2][4] = ""
+			Var NameLang[2][5] = ""
+			Var DescLang[2][0] = ""
+			Var DescLang[2][1] = ""
+			Var DescLang[2][2] = ""
+			Var DescLang[2][3] = ""
+			Var DescLang[2][4] = ""
+			Var DescLang[2][5] = ""
+			; end lang
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = "Disable2"
+			Var PD_STAGE_3 = $12-00-07-0001.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-00-07-0001"
+				EndIf
+			EndIf
+			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_frozen_fruit.lxml"
+			
+			
+			TabMenuVisibleInst 99
+			DEBUGVAR RedirectToNormalVersion
+			DEBUGVAR ToppingNewUINewSystem
+			If RedirectToNormalVersion = 1 Then
+				Var menu_name_eng_hot = NameLang[0][0]
+				Var menu_desc_eng_hot = DescLang[0][0]
+				Var menu_name_eng_cold = NameLang[1][0]
+				Var menu_desc_eng_cold = DescLang[1][0]
+				Var menu_name_eng_blender = NameLang[2][0]
+				Var menu_desc_eng_blender = DescLang[2][0]
+				
+				
+				
+				Var menu_name_thai_hot = NameLang[0][1]
+				Var menu_desc_thai_hot = DescLang[0][1]
+				Var menu_name_thai_cold = NameLang[1][1]
+				Var menu_desc_thai_cold = DescLang[1][1]
+				Var menu_name_thai_blender = NameLang[2][1]
+				Var menu_desc_thai_blender = DescLang[2][1]
+				DEBUGVAR menu_name_thai_cold
+				DEBUGVAR menu_desc_thai_cold
+					Var NameDrink = aliasName[0]
+					Var DrinkDescription =  aliasDesc[0]
+					Var NameDrinkTH = aliasName[1]
+					Var DrinkDescriptionTH = aliasDesc[1]
+			If LanguageShow = "THAI" Then
+				Var show_eng =  "false"
+			Else
+				Var show_eng =  "true"
+			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+			EndIf
+			
+			
+			
+		</EventOnClick>
+		</Menu>
+
+		</Menus>
+
+</ScrollableCatalog>
+
+
+
+
+</Popup>

inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.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/tha/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml

@@ -59,10 +59,10 @@
 
     GetVisible inst_show_other_other
     
-	DEBUGVAR inst_show_other_other
+	;DEBUGVAR inst_show_other_other
 
     Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
-	DEBUGVAR OtherOtherRefreshTimeOut
+	;DEBUGVAR OtherOtherRefreshTimeOut
 
     If OtherOtherRefreshTimeOut > 15 Then
 	

inter/tha/xml/multi/v3/page_catalog_group_other_other.skt

@@ -62,10 +62,10 @@
 
     GetVisible inst_show_other_other
     
-	DEBUGVAR inst_show_other_other
+	;DEBUGVAR inst_show_other_other
 
     Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
-	DEBUGVAR OtherOtherRefreshTimeOut
+	;DEBUGVAR OtherOtherRefreshTimeOut
 
     If OtherOtherRefreshTimeOut > 15 Then
 	

inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml

@@ -7,7 +7,7 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-
+    RootLayoutVisible 13 "show"
 </EventOpen>
 
 <EventOnShow>
@@ -30,7 +30,6 @@
 	DEBUGVAR SlientRefreshIndex
     
 	RootLayoutVisible 13 "show"
-	 RootLayoutVisible 12 "show" 
 	RefreshAll
 
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_recommend.skt

@@ -9,7 +9,7 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-
+    RootLayoutVisible 13 "show"
 </EventOpen>
 
 <EventOnShow>
@@ -32,7 +32,6 @@
 	DEBUGVAR SlientRefreshIndex
     
 	RootLayoutVisible 13 "show"
-	 RootLayoutVisible 12 "show" 
 	RefreshAll
 
 </EventOnShow>

menu/new-layout.tsv

@@ -684,7 +684,7 @@ Name=Health,file=page_catalog_group_health.skt
 		โฮจิฉะลาเต้	Hojicha Latte	[ร้อน 49 Cal. , เย็น 79 Cal.] ชาเขียวคั่ว และ นมอุ่น 	[Hot 49 Cal. , Iced 79 Cal.] Hojicha And Milk	12-02-01-1037	12-02-02-1037	-	bn_hot_hojicha_milk_tea_sing_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		โกโก้	Cocoa	[ร้อน 56 Cal. , เย็น 98 Cal.] โกโก้ นมและน้ำตาล	[Hot 56 Cal. , Iced 98 Cal.] Milk, Cocoa, Sugar	12-03-01-1002	12-03-02-1002	-	bn_iced_cocoa_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		นม	Milk	[ร้อน 49 Cal. , เย็น 79 Cal.] นม	[Hot 49 Cal. , Iced 79 Cal.] Milk	12-03-01-1005	12-03-02-1005	-	bn_iced_milk_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
-		น้ำมะนาว	Hot Limenade	[ร้อน 11 Cal. , เย็น 23 Cal.] น้ำมะนาว น้ำตาล	[Hot 11 Cal. , Iced 23 Cal.] Limenade, Sugar	12-05-01-1001	12-05-02-1001	-	bn_limande_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
+		น้ำมะนาว	Limenade	[ร้อน 11 Cal. , เย็น 23 Cal.] น้ำมะนาว น้ำตาล	[Hot 11 Cal. , Iced 23 Cal.] Limenade, Sugar	12-05-01-1001	12-05-02-1001	-	bn_limande_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		น้ำมะนาวโซดา	Iced Limenade \nSoda	[23 Cal.] มะนาว โซดา และน้ำแข็ง	[23 Cal.] Limenade, Sugar, Soda, Ice	-	12-05-02-1010	-	bn_iced_lemonade_soda_Healthy.png	-	-	-	posi1	-	-	-	-	-	#REF!	-	#REF!	#REF!
 		ชานมไทย	Thai Milk Tea	[ร้อน 53 Cal. , เย็น 89 Cal.] ชาไทย และ นมอุ่น	[Hot 53 Cal. , Iced 89 Cal.] Thai Tea, Sugar, Milk	12-02-01-1038	12-02-02-1038	-	bn_thai_milk_tea_SingPark_Healthy.png	-	-	-	posi1	-	-	-	-	#REF!	#REF!	-	#REF!	#REF!
 		ชาดำ	Black Tea	[ร้อน 7 Cal. , เย็น 7 Cal.] ชาไทย และน้ำ	[Hot 7 Cal. , Iced 7 Cal.] Thai Tea And Water	12-02-01-1039	12-02-02-1039	-	bn_thai_black_tea_SingPark_Healthy.png	-	-	-	posi1	-	-	-	-
@@ -897,7 +897,7 @@ Name=Tea Time Festival,file=page_catalog_group_pro_tea_time.skt
 
 
 Name=Free fire,file=page_catalog_group_pro_freefile.skt
-		คาเพลล่าสวีทดริ๊งค์		สตรอเบอรี นม น้ำตาล \n Oreo	Strawberry , Milk,\nSugar, Oreo	-	-	12-99-03-0026	bn_smoothie_oreo_freefire.png	-	-	-	posi1	-	-	-	-
+		คาเพลล่าสวีทดริ๊งค์	Kapella's Sweet Drinks	สตรอเบอรี นม น้ำตาล \n Oreo	Strawberry , Milk,\nSugar, Oreo	-	-	12-99-03-0026	bn_smoothie_oreo_freefire.png	-	-	-	posi1	-	-	-	-
 		แม๊กซิมบูสเตอร์ 	Maxim's Booster	เป๊ปซี่ โกโก้ นม และโอรีโอ	Pepsi, Cocoa, Milk, Oreo and Ice	-	-	12-99-03-0067	bn_smoothie_oreo_Chocolate_Milk_freefire.png	-	-	-	posi1	-	-	-	-
 		สูตรลับเคลลี่	Kelly's Secret Recipe	เป๊ปซี่ นม และโอรีโอ	pepsi, Milk,\nSugar, Oreo	-	-	12-99-03-0066	bn_smoothie_oreo_Pepsi_Milk_freefire.png	-	-	-	posi1	-	-	-	-
 
@@ -1303,6 +1303,42 @@ Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt
 		ชานมมะลิ	Jasmine Milk Tea	ชามะลิ และนม	Jasmine & Milk	-	12-02-62-0047	12-03-63-0047						-	-	-
 		ชานมไต้หวัน	Taiwanese Tea	ชาไต้หวัน นม	Taiwan Tea, Milk, Sugar	-	12-02-62-0025	12-02-63-0025						-	-	-
 		เต่าติมไข่มุก	Tao Tim Bubble Tea	ไอศครีมนม คาราเมล และบุกไข่มุก	Icecream, Caramel and Pearl Carrageenan			12-41-03-0028						-	-	-
+
+
+Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.xml
+		มะม่วงปั่น	Mango Smoothie	มะม่วงปั่น แช่แข็ง	Frozen mango smoothies	-	-	12-00-07-0001	bn_frozen_mango.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

ui/lang.tsv

@@ -1202,7 +1202,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1215,7 +1215,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

xml/page_board.xml

@@ -1307,10 +1307,15 @@
 		If CountryName = "Thailand" Then
 
 			Var MyanmarLangEnable = "true"
-			Var InternationalShow = 1
+			Var InternationalShow = 0
 
 			Var CatalogLayoutV3 = 1
 
+			Var SpiralModeFrozenFruit = 0
+			If BoxID = 123456 Then
+				Var SpiralOnline = "true"
+				Var SpiralModeFrozenFruit = 1
+			EndIf
 
 			; test payment
 			Var New_Payment = 1
@@ -1325,9 +1330,6 @@
 			;specified to unittest4
 			Var CountryRootPath = "ROOT/taobin_project/inter/tha/"
 			Var CountryShortName = "tha"
-			Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
-			DEBUGVAR OpenFileXML
-			TRY OpenFileXML
 
 			Var WebAppShow = "Invisible"
 			Var ENABLE_UAE_DUBAI = "Invisible"

xml/page_catalog_group_health.xml

@@ -4904,7 +4904,7 @@ Water, And Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Hot Limenade"
+		Var NameDrink = "Limenade"
 		Var NameDrinkTH = "น้ำมะนาว"
 		Var DrinkDescriptionTH = "[ร้อน 11 Cal. , เย็น 23 Cal.] น้ำมะนาว น้ำตาล"
 		Var DrinkDescription = "[Hot 11 Cal. , Iced 23 Cal.] Limenade, Sugar"
@@ -4999,7 +4999,7 @@ Water, And Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Hot Limenade" </Value>
+	<Value> "Limenade" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_pro_buble_tea.xml

@@ -32,7 +32,7 @@
 		Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
-; menu_new_list 16
+; menu_new_list 17
 	; ==================> Len = 15
 	; - 12-21-62-0002 12-21-63-0002 
 <Block>
@@ -8026,6 +8026,255 @@ Soda & Ice" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 8
+	; - - 12-00-07-0001 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-00-07-0001.Button,$Sum1200070001) </State> 
+	<Button>
+	<State> $Sum1200070001 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_frozen_mango.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_frozen_mango.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_frozen_mango.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "Mango Smoothie"
+		Var NameDrinkTH = "มะม่วงปั่น"
+		Var DrinkDescriptionTH = "มะม่วงปั่น แช่แข็ง"
+		Var DrinkDescription = "Frozen mango smoothies"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_frozen_mango.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-00-07-0001.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-00-07-0001"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-00-07-0001.Button
+		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_.png")
+		DEBUGVAR OverlayMenuFilter
+		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-00-07-0001"
+			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-00-07-0001.NameE
+		Var menu_desc_eng_blender = $12-00-07-0001.descriptionE
+		Var menu_name_thai_blender = $12-00-07-0001.Name
+		Var menu_desc_thai_blender = $12-00-07-0001.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> "Mango Smoothie" </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> "Frozen mango smoothies" </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-00-07-0001.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-00-07-0001.Button </State>
+	<Value> StringFmt(  $12-00-07-0001.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 $Sum1200070001 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-00-07-0001.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> $Sum1200070001 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

xml/page_catalog_group_pro_freefile.xml

@@ -52,7 +52,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = ""
+		Var NameDrink = "Kapella's Sweet Drinks"
 		Var NameDrinkTH = "คาเพลล่าสวีทดริ๊งค์"
 		Var DrinkDescriptionTH = "สตรอเบอรี นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Strawberry , Milk, Sugar, Oreo"
@@ -148,7 +148,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "" </Value>
+	<Value> "Kapella's Sweet Drinks" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.79"
+	Var XMLPageVersion = "9.80"
-	Var XMLPageVersionInt = 979
+	Var XMLPageVersionInt = 980
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.79"
+	Var XMLPageVersion = "10.80"
-	Var XMLPageVersionInt = 1079
+	Var XMLPageVersionInt = 1080
 ;Oreo
 Var OreoGuarantee = 0