Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

adv/sync_1.file

@@ -1,14 +1,8 @@
-total 352108
--rw-rw---- 1 root sdcard_rw     2671 2022-01-13 17:36 sync_0.file
--rw-rw---- 1 root sdcard_rw        0 2021-03-22 17:48 sync_1.file
--rw-rw---- 1 root sdcard_rw     2671 2022-01-13 17:24 sync_2.file
--rw-rw---- 1 root sdcard_rw     2606 2022-02-03 17:03 sync_4.file
--rw-rw---- 1 root sdcard_rw     3028 2022-03-15 10:42 sync_5.file
--rw-rw---- 1 root sdcard_rw     3093 2022-03-31 23:56 sync_6.file
--rw-rw---- 1 root sdcard_rw     3379 2022-04-26 18:02 sync_7.file
+total 341484
+-rw-rw---- 1 root sdcard_rw        0 2024-01-04 21:41 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2023-09-18 18:44 taobin_adv_01.mp4
--rw-rw---- 1 root sdcard_rw 14288866 2023-10-26 17:13 taobin_adv_02.mp4
+-rw-rw---- 1 root sdcard_rw  6947194 2024-01-24 14:01 taobin_adv_02.mp4
 -rw-rw---- 1 root sdcard_rw  8019718 2023-09-24 22:02 taobin_adv_03.mp4
 -rw-rw---- 1 root sdcard_rw  8156825 2023-11-17 12:07 taobin_adv_04.mp4
 -rw-rw---- 1 root sdcard_rw  2686245 2023-09-18 18:44 taobin_adv_05.mp4
@@ -21,7 +15,7 @@ total 352108
 -rw-rw---- 1 root sdcard_rw   257107 2023-09-18 18:44 taobin_adv_12.mp4
 -rw-rw---- 1 root sdcard_rw   381590 2023-09-18 18:44 taobin_adv_13.mp4
 -rw-rw---- 1 root sdcard_rw  5352097 2023-09-18 18:44 taobin_adv_14.mp4
--rw-rw---- 1 root sdcard_rw  2705777 2023-11-16 16:58 taobin_adv_15.mp4
+-rw-rw---- 1 root sdcard_rw  2710208 2023-11-28 11:23 taobin_adv_15.mp4
 -rw-rw---- 1 root sdcard_rw  2229541 2023-09-18 18:44 taobin_adv_16.mp4
 -rw-rw---- 1 root sdcard_rw 18918525 2023-09-18 18:44 taobin_adv_17.mp4
 -rw-rw---- 1 root sdcard_rw  2526278 2023-09-18 18:44 taobin_adv_18.mp4
@@ -29,7 +23,7 @@ total 352108
 -rw-rw---- 1 root sdcard_rw  9424753 2023-09-18 18:44 taobin_adv_20.mp4
 -rw-rw---- 1 root sdcard_rw  2622440 2023-09-18 18:44 taobin_adv_menu2_00.mp4
 -rw-rw---- 1 root sdcard_rw  2755962 2023-09-18 18:44 taobin_adv_menu2_01.mp4
--rw-rw---- 1 root sdcard_rw  9784390 2023-10-26 17:13 taobin_adv_menu2_02.mp4
+-rw-rw---- 1 root sdcard_rw  8022474 2024-01-24 10:48 taobin_adv_menu2_02.mp4
 -rw-rw---- 1 root sdcard_rw  8002769 2023-09-24 22:02 taobin_adv_menu2_03.mp4
 -rw-rw---- 1 root sdcard_rw  5304348 2023-11-17 12:08 taobin_adv_menu2_04.mp4
 -rw-rw---- 1 root sdcard_rw  1920381 2023-09-18 18:44 taobin_adv_menu2_05.mp4
@@ -42,7 +36,7 @@ total 352108
 -rw-rw---- 1 root sdcard_rw   187326 2023-09-18 18:44 taobin_adv_menu2_12.mp4
 -rw-rw---- 1 root sdcard_rw   251935 2023-09-18 18:44 taobin_adv_menu2_13.mp4
 -rw-rw---- 1 root sdcard_rw  3630430 2023-09-18 18:44 taobin_adv_menu2_14.mp4
--rw-rw---- 1 root sdcard_rw  1678796 2023-11-16 16:58 taobin_adv_menu2_15.mp4
+-rw-rw---- 1 root sdcard_rw  1657786 2023-11-28 11:23 taobin_adv_menu2_15.mp4
 -rw-rw---- 1 root sdcard_rw  1663856 2023-09-18 18:44 taobin_adv_menu2_16.mp4
 -rw-rw---- 1 root sdcard_rw 18108788 2023-09-18 18:44 taobin_adv_menu2_17.mp4
 -rw-rw---- 1 root sdcard_rw  2062164 2023-09-18 18:44 taobin_adv_menu2_18.mp4
@@ -50,7 +44,7 @@ total 352108
 -rw-rw---- 1 root sdcard_rw  5875043 2023-09-18 18:44 taobin_adv_menu2_20.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  2587515 2023-09-18 18:44 taobin_adv_menu_01.mp4
--rw-rw---- 1 root sdcard_rw 10101470 2023-10-26 17:13 taobin_adv_menu_02.mp4
+-rw-rw---- 1 root sdcard_rw  8414409 2024-01-12 11:41 taobin_adv_menu_02.mp4
 -rw-rw---- 1 root sdcard_rw  7959926 2023-09-24 22:02 taobin_adv_menu_03.mp4
 -rw-rw---- 1 root sdcard_rw  5567835 2023-11-17 12:07 taobin_adv_menu_04.mp4
 -rw-rw---- 1 root sdcard_rw  1959800 2023-09-18 18:44 taobin_adv_menu_05.mp4
@@ -63,7 +57,7 @@ total 352108
 -rw-rw---- 1 root sdcard_rw   190457 2023-09-18 18:44 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
--rw-rw---- 1 root sdcard_rw  1665787 2023-11-16 16:58 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw  1673445 2023-11-28 11:23 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  1716437 2023-09-18 18:44 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw  2165663 2023-09-18 18:44 taobin_adv_menu_18.mp4

inter/aus/menu/lang.tsv

@@ -681,15 +681,51 @@ TextID	Note	English	Thai
 800614
 800615		LID 1 disable	ฝาช่องที่ 1 ปิด
 800616		LID 2 disable	ฝาช่องที่ 2 ปิด
+800617		Do you want to reset counter soda cup ?	ต้องการเริ่มต้นนับแก้วโซดาใหม่หรือไม่
+800618		Gas Remaining	แก๊สเหลือ
+800619		Gas CO2	แก๊ส CO2
+800620		Menu soda	เมนูโซดา
+800621		Almost full	เกือบเต็ม
+800622		Do you want to change arm state?	ต้องการเปลี่ยนสถานะแขนใช่หรือไม่
+800623
+800624		Door Cup	ประตูรับแก้ว
+800625		Door LID	ประตูรับฝา
+800626		Ice system	ระบบน้ำแข็ง
+800627		Powder drive	แทงช่องที่
+800628		Powder position	ตำแหน่ง
+800629		Powder drive all slot	ทดสอบทุกช่อง
+800630		Powder all position	ทุกตำแหน่ง
+800631		Full test	ทดสอบทั้งหมด
 
 
+	Full Test System
 
-
-
-
-
-
-
+800631		Full Test System	ทดสอบเต็มระบบ
+800632		Door Not Close!!!	ยังไม่ได้ปิดประตู!!!
+800633		Please close door before Full Test.	กรุณาปิดประตู ก่อนทำการทดสอบเต็มระบบ
+800634		OK	รับทราบ
+800635		Main Disc Not Close!!!	ฐานจานหมุนไม่ได้ล็อค!!!
+800636		Main Disc lock may loose, Please lock Main Disc before Full Test.	ฐานจานหมุนอาจหลวม หรือลืมล็อค
+800637		Powder Disc	ตำแหน่งผง
+800638		ICE	น้ำแข็ง
+800639		Door Cup	ประตูรับแก้ว
+800640		Powder Channel  (falling powder!)	ชุดผง (ช่องจ่าย)  (ผงหล่น!)
+800641		Arm Disc	ตำแหน่งแขน
+800642		Door Lid/Straw	ประตูรับหลอดรับฝา
+800643		Whipper	หัวชง
+800644		Start	เริ่ม
+800645		Cancel	ยกเลิก
+800646		Padding	รอ
+800647		Testing...	กำลังทดสอบ...
+800648		Succeess	ผ่าน
+800649		Fail	ล้มเหลว
+800650		Testing List :	รายการทดสอบ :
+800651		Connection	การสื่อสาร
+800652		Tray	ถาดกาแฟ
+800653		ESP Module	ตำแหนงเครื่องอัดกาแฟ
+800654		Main Gate Switch	สวิทช์ประตู Main
+800655		Module Arm Switch	สวิทช์ Module แขน
+800656		Guard Bean Coffee Switch	สวิทช์ Guard Bean กาแฟ
 
 
 

inter/mys/menu/lang.tsv

@@ -307,6 +307,11 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 800067		Open. Confirm?	คุณต้องการเปิด			Open. Confirm?
 800068		Close. Confirm?	คุณต้องการปิด			Close. Confirm?
 800069		Select Material want to change.	เลือก วัตถุดิบที่ต้องการเปลี่ยน			Select Material want to change.
+800070		Day	วัน
+800071		Water Tank	ถังน้ำดี
+
+800072		Water Tank restart.
+800073		Restart Shot coffee count
 
 
 	Soda System
@@ -671,6 +676,67 @@ TextID	Note	English	Thai	China	Japan	Malaysia
 800614
 800615		LID 1 disable	ฝาช่องที่ 1 ปิด
 800616		LID 2 disable	ฝาช่องที่ 2 ปิด
+800617		Do you want to reset counter soda cup ?	ต้องการเริ่มต้นนับแก้วโซดาใหม่หรือไม่
+800618		Gas Remaining	แก๊สเหลือ
+800619		Gas CO2	แก๊ส CO2
+800620		Menu soda	เมนูโซดา
+800621		Almost full	เกือบเต็ม
+800622		Do you want to change arm state?	ต้องการเปลี่ยนสถานะแขนใช่หรือไม่
+800623
+800624		Door Cup	ประตูรับแก้ว
+800625		Door LID	ประตูรับฝา
+800626		Ice system	ระบบน้ำแข็ง
+800627		Powder drive	แทงช่องที่
+800628		Powder position	ตำแหน่ง
+800629		Powder drive all slot	ทดสอบทุกช่อง
+800630		Powder all position	ทุกตำแหน่ง
+800631		Full test	ทดสอบทั้งหมด
+
+
+	Full Test System
+
+800631		Full Test System	ทดสอบเต็มระบบ
+800632		Door Not Close!!!	ยังไม่ได้ปิดประตู!!!
+800633		Please close door before Full Test.	กรุณาปิดประตู ก่อนทำการทดสอบเต็มระบบ
+800634		OK	รับทราบ
+800635		Main Disc Not Close!!!	ฐานจานหมุนไม่ได้ล็อค!!!
+800636		Main Disc lock may loose, Please lock Main Disc before Full Test.	ฐานจานหมุนอาจหลวม หรือลืมล็อค
+800637		Powder Disc	ตำแหน่งผง
+800638		ICE	น้ำแข็ง
+800639		Door Cup	ประตูรับแก้ว
+800640		Powder Channel  (falling powder!)	ชุดผง (ช่องจ่าย)  (ผงหล่น!)
+800641		Arm Disc	ตำแหน่งแขน
+800642		Door Lid/Straw	ประตูรับหลอดรับฝา
+800643		Whipper	หัวชง
+800644		Start	เริ่ม
+800645		Cancel	ยกเลิก
+800646		Padding	รอ
+800647		Testing...	กำลังทดสอบ...
+800648		Succeess	ผ่าน
+800649		Fail	ล้มเหลว
+800650		Testing List :	รายการทดสอบ :
+800651		Connection	การสื่อสาร
+800652		Tray	ถาดกาแฟ
+800653		ESP Module	ตำแหนงเครื่องอัดกาแฟ
+800654		Main Gate Switch	สวิทช์ประตู Main
+800655		Module Arm Switch	สวิทช์ Module แขน
+800656		Guard Bean Coffee Switch	สวิทช์ Guard Bean กาแฟ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	Test (New UI)

inter/mys/xml/page_catalog_group_coffee.lxml

@@ -21318,6 +21318,272 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 12-01-01-0060 12-01-02-0060 12-01-03-0060 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0060.Button,12-01-02-0060.Button,12-01-03-0060.Button,$Sum120101006012010200601201030060) </State> 
+	<Button>
+	<State> $Sum120101006012010200601201030060 </State> 
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_peach_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_peach_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_peach_latte.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_peach_latte.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0060.Price
+		Var PriceD2 = $12-01-02-0060.Price
+		Var PriceD3 = $12-01-03-0060.Price
+		Var PD_CODE1 = "12-01-01-0060"
+		Var PD_CODE2 = "12-01-02-0060"
+		Var PD_CODE3 = "12-01-03-0060"
+		; begin lang 
+		Var aliasName[0] = "PEACH CAFE LATTE"
+		Var aliasDesc[0] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var aliasName[1] = "กาแฟพีชลาเต้"
+		Var aliasDesc[1] = "กาแฟ น้ำ นม และ พีช"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "PEACH CAFE LATTE"
+		Var aliasDesc[4] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var NameLang[0][0] = "HOT PEACH CAFE LATTE"
+		Var NameLang[0][1] = "กาแฟพีชลาเต้"
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "HOT PEACH CAFE LATTE"
+		Var DescLang[0][0] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var DescLang[0][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Espresso, Peach Syrup,\nSugar, Milk"
+		Var NameLang[1][0] = "ICED PEACH CAFE LATTE"
+		Var NameLang[1][1] = "กาแฟพีชลาเต้"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "ICED PEACH CAFE LATTE"
+		Var DescLang[1][0] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var DescLang[1][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var NameLang[2][0] = "PEACH CAFE LATTE SMOOTHIE"
+		Var NameLang[2][1] = "กาแฟพีชลาเต้"
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "PEACH CAFE LATTE SMOOTHIE"
+		Var DescLang[2][0] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		Var DescLang[2][1] = "กาแฟ น้ำ นม และ พีช"
+		Var DescLang[2][2] = "-"
+		Var DescLang[2][3] = "-"
+		Var DescLang[2][4] = "Espresso, Peach Syrup,\nSugar, Milk, Ice"
+		; end lang 
+		Var PD_STAGE_1 = $12-01-01-0060.Button
+		Var PD_STAGE_2 = $12-01-02-0060.Button
+		Var PD_STAGE_3 = $12-01-03-0060.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" "12-01-02-0060"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-01-01-0060"
+			Else
+			Topping "Load" "12-01-03-0060"
+			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>PEACH CAFE LATTE</LanguageSlot1>
+		<LanguageSlot2>กาแฟพีชลาเต้</LanguageSlot2>
+		<LanguageSlot3>PEACH CAFE LATTE</LanguageSlot3>
+		<LanguageSlot4>กาแฟพีชลาเต้</LanguageSlot4>
+		<LanguageSlot5>PEACH CAFE LATTE</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>Espresso, Peach Syrup,\nSugar, Milk</LanguageSlot1>
+		<LanguageSlot2>กาแฟ น้ำ นม และ พีช</LanguageSlot2>
+		<LanguageSlot3>Espresso, Peach Syrup,\nSugar, Milk</LanguageSlot3>
+		<LanguageSlot4>กาแฟ น้ำ นม และ พีช</LanguageSlot4>
+		<LanguageSlot5>Espresso, Peach Syrup,\nSugar, Milk</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> $12-01-01-0060.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> $12-01-01-0060.Button </State>
+	<Value> StringFmt(  $12-01-01-0060.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> $12-01-02-0060.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> $12-01-02-0060.Button </State>
+	<Value> StringFmt( $12-01-02-0060.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-01-03-0060.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> $12-01-03-0060.Button </State>
+	<Value> StringFmt(  $12-01-03-0060.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum120101006012010200601201030060 = "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 $Sum120101006012010200601201030060 = "Disable" Then
+				STRCONTAIN "ERR" $12-01-01-0060.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-01-02-0060.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-01-03-0060.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> $Sum120101006012010200601201030060 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; 12-01-01-0030 12-01-02-0030 12-01-03-0030 
@@ -21850,6 +22116,272 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 12-21-01-0061 12-21-02-0061 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-21-01-0061.Button,12-21-02-0061.Button,$Sum12210100611221020061) </State> 
+	<Button>
+	<State> $Sum12210100611221020061 </State> 
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_lime_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_lime_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_lime_tea.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_lime_tea.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-21-01-0061.Price
+		Var PriceD2 = $12-21-02-0061.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-21-01-0061"
+		Var PD_CODE2 = "12-21-02-0061"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "GINGER CAFE LATTE"
+		Var aliasDesc[0] = "Espresso, Milk, Ginger"
+		Var aliasName[1] = "กาแฟขิงลาเต้"
+		Var aliasDesc[1] = "กาแฟ น้ำ นม ขิง"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "KOPI HALIA LATTE"
+		Var aliasDesc[4] = "Espresso, Milk, Ginger"
+		Var NameLang[0][0] = "HOT GINGER CAFE LATTE"
+		Var NameLang[0][1] = "กาแฟขิงลาเต้"
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "KOPI HALIA LATTE PANAS"
+		Var DescLang[0][0] = "Espresso, Milk, Ginger, \nWater"
+		Var DescLang[0][1] = "กาแฟ น้ำ นม ขิง"
+		Var DescLang[0][2] = "-"
+		Var DescLang[0][3] = "-"
+		Var DescLang[0][4] = "Espresso, Milk, Ginger, \nWater"
+		Var NameLang[1][0] = "ICED GINGER CAFE LATTE"
+		Var NameLang[1][1] = "กาแฟขิงลาเต้"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "KOPI HALIA LATTE AIS"
+		Var DescLang[1][0] = "Espresso, Milk, Ginger, \nIce"
+		Var DescLang[1][1] = "กาแฟ น้ำ นม ขิง"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "Espresso, Milk, Ginger, \nIce"
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		; end lang 
+		Var PD_STAGE_1 = $12-21-01-0061.Button
+		Var PD_STAGE_2 = $12-21-02-0061.Button
+		Var PD_STAGE_3 = "Disable2"
+		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" "12-21-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "12-21-01-0061"
+			Else
+			Topping "Load" "-"
+			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>GINGER CAFE LATTE</LanguageSlot1>
+		<LanguageSlot2>กาแฟขิงลาเต้</LanguageSlot2>
+		<LanguageSlot3>GINGER CAFE LATTE</LanguageSlot3>
+		<LanguageSlot4>กาแฟขิงลาเต้</LanguageSlot4>
+		<LanguageSlot5>KOPI HALIA LATTE</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>Espresso, Milk, Ginger</LanguageSlot1>
+		<LanguageSlot2>กาแฟ น้ำ นม ขิง</LanguageSlot2>
+		<LanguageSlot3>Espresso, Milk, Ginger</LanguageSlot3>
+		<LanguageSlot4>กาแฟ น้ำ นม ขิง</LanguageSlot4>
+		<LanguageSlot5>Espresso, Milk, Ginger</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> $12-21-01-0061.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> $12-21-01-0061.Button </State>
+	<Value> StringFmt(  $12-21-01-0061.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> $12-21-02-0061.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> $12-21-02-0061.Button </State>
+	<Value> StringFmt( $12-21-02-0061.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> "Invisible" </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> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum12210100611221020061 = "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 $Sum12210100611221020061 = "Disable" Then
+				STRCONTAIN "ERR" $12-21-01-0061.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-21-02-0061.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.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> $Sum12210100611221020061 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

inter/sgp/image/event/image_template1

@@ -0,0 +1,6 @@
+normal_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+normal_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+press_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+press_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+disable_eng=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
+disable_thai=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png

inter/sgp/image/event/image_template2

@@ -0,0 +1,6 @@
+normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
+disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png

inter/sgp/image/event/image_template3

@@ -0,0 +1,6 @@
+normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
+disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
+disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png