diff --git a/image/page2_inter/bn_frozen_smoothie.png b/image/page2_inter/bn_frozen_smoothie.png new file mode 100644 index 00000000..7357fa8a Binary files /dev/null and b/image/page2_inter/bn_frozen_smoothie.png differ diff --git a/image/page2_inter/bp_frozen_smoothie.png b/image/page2_inter/bp_frozen_smoothie.png new file mode 100644 index 00000000..5300923a Binary files /dev/null and b/image/page2_inter/bp_frozen_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_frozen_mango.png b/image/page_drink_disable_n2/bn_frozen_mango.png new file mode 100644 index 00000000..61d7daf2 Binary files /dev/null and b/image/page_drink_disable_n2/bn_frozen_mango.png differ diff --git a/image/page_drink_n/bn_frozen_mango.png b/image/page_drink_n/bn_frozen_mango.png new file mode 100644 index 00000000..08bcc170 Binary files /dev/null and b/image/page_drink_n/bn_frozen_mango.png differ diff --git a/image/page_drink_press_n/bn_frozen_mango.png b/image/page_drink_press_n/bn_frozen_mango.png new file mode 100644 index 00000000..b7c2434a Binary files /dev/null and b/image/page_drink_press_n/bn_frozen_mango.png differ diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index f8a16171..3cab040d 100644 --- a/inter/tha/menu/lang.tsv +++ b/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. ทดสอบการบด diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index 54df57c2..d318f9db 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/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 diff --git a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py b/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py index 1c837525..27ac6f98 100644 --- a/inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py +++ b/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') diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml new file mode 100644 index 00000000..69d13128 --- /dev/null +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -0,0 +1,311 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; 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 + + + 1000 + + + ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc" + + + TimerReset + + +;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml" + + + + + 0 + 497 + 1080 + 1423 + + + KanitMediumTTF + 0x322B26 + 0xEAE6E1 + + 16 + 22 + 1 + + + + KanitMediumTTF + 0x322B26 + 0xEAE6E1 + + 10 + 14 + 1 + + + + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + + 4 + 20 + 1 + + + "Hot" + "Ice" + "Blend" + 000013 + + +;banners + ; ==================> Len = 3 + ; - - 12-00-07-0001 + + Flag( 12-00-07-0001.Button,$Sum1200070001) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" + + + Mango Smoothie + มะม่วงปั่น + - + - + - + - + + + + + Mango Frozen + มะม่วงสุขแช่แข็ง + - + - + - + - + + + "Disable2" + "Disable2" + $12-00-07-0001.Button + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + eval( + If $##-##-##-####.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + 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 + ) + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + $Sum1200070001TextID + $Sum1200070001TextValue + + + 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 + + + + + + + + + + + + + + diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt new file mode 100644 index 00000000..6c9249bd --- /dev/null +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt @@ -0,0 +1,42 @@ + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; 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 + + + 1000 + + + ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc" + + + TimerReset + + +;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml" + + + + + + + + diff --git a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml index 71ee86ea..326223e8 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml +++ b/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 diff --git a/inter/tha/xml/multi/v3/page_catalog_group_other_other.skt b/inter/tha/xml/multi/v3/page_catalog_group_other_other.skt index 0af9b6bd..7edf1b53 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.skt +++ b/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 diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml index 625dec8b..4ec53dc2 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml @@ -7,7 +7,7 @@ ; "0xeae6e1" SoundVolume - + RootLayoutVisible 13 "show" @@ -30,7 +30,6 @@ DEBUGVAR SlientRefreshIndex RootLayoutVisible 13 "show" - RootLayoutVisible 12 "show" RefreshAll diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt index 1f00caf6..01015ee8 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt @@ -9,7 +9,7 @@ ; "0xeae6e1" SoundVolume - + RootLayoutVisible 13 "show" @@ -32,7 +32,6 @@ DEBUGVAR SlientRefreshIndex RootLayoutVisible 13 "show" - RootLayoutVisible 12 "show" RefreshAll diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 25a549b3..9599bbf6 100644 --- a/menu/new-layout.tsv +++ b/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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/lang.tsv b/ui/lang.tsv index f8a16171..3cab040d 100644 --- a/ui/lang.tsv +++ b/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. ทดสอบการบด diff --git a/xml/page_board.xml b/xml/page_board.xml index 6b4f3c78..67fe56eb 100644 --- a/xml/page_board.xml +++ b/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" diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 11b21c2c..aeadeb8c 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -4904,7 +4904,7 @@ Water, And Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - 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" KanitMediumTTF 0x322B26 showengText - "Hot Limenade" + "Limenade" 16 diff --git a/xml/page_catalog_group_pro_buble_tea.xml b/xml/page_catalog_group_pro_buble_tea.xml index 6b63a935..f534ab6d 100644 --- a/xml/page_catalog_group_pro_buble_tea.xml +++ b/xml/page_catalog_group_pro_buble_tea.xml @@ -32,7 +32,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 16 +; menu_new_list 17 ; ==================> Len = 15 ; - 12-21-62-0002 12-21-63-0002 @@ -8026,6 +8026,255 @@ Soda & Ice" text_unavailable center-vertical-horizontal + + ; ==================> Len = 8 + ; - - 12-00-07-0001 + + 33 + 22 + 225 + 296 + Flag( 12-00-07-0001.Button,$Sum1200070001) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "มะม่วงปั่น" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มะม่วงปั่น แช่แข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Mango Smoothie" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Frozen mango smoothies" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-00-07-0001.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-00-07-0001.Button + StringFmt( $12-00-07-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + 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 + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + 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 + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1200070001 + text_unavailable + center-vertical-horizontal + ; Cart diff --git a/xml/page_catalog_group_pro_freefile.xml b/xml/page_catalog_group_pro_freefile.xml index 01a58fae..f7352411 100644 --- a/xml/page_catalog_group_pro_freefile.xml +++ b/xml/page_catalog_group_pro_freefile.xml @@ -52,7 +52,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "" + Var NameDrink = "Kapella's Sweet Drinks" Var NameDrinkTH = "คาเพลล่าสวีทดริ๊งค์" Var DrinkDescriptionTH = "สตรอเบอรี นม น้ำตาล Oreo" Var DrinkDescription = "Strawberry , Milk, Sugar, Oreo" @@ -148,7 +148,7 @@ KanitMediumTTF 0x322B26 showengText - "" + "Kapella's Sweet Drinks" 16 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index a52aca79..a2a0de32 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.79" - Var XMLPageVersionInt = 979 + Var XMLPageVersion = "9.80" + Var XMLPageVersionInt = 980 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index f5877844..87cd7f45 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.79" - Var XMLPageVersionInt = 1079 + Var XMLPageVersion = "10.80" + Var XMLPageVersionInt = 1080 ;Oreo Var OreoGuarantee = 0