diff --git a/image/page_drink_n/bn_hot_blackcoffee.png b/image/page_drink_n/bn_hot_blackcoffee.png index f13a6621..80e0f633 100644 Binary files a/image/page_drink_n/bn_hot_blackcoffee.png and b/image/page_drink_n/bn_hot_blackcoffee.png differ diff --git a/inter/sgp/hardware/exhaust_fan_schedule.ev b/inter/sgp/hardware/exhaust_fan_schedule.ev index 213d2fd6..7b87b7a5 100644 --- a/inter/sgp/hardware/exhaust_fan_schedule.ev +++ b/inter/sgp/hardware/exhaust_fan_schedule.ev @@ -73,7 +73,7 @@ DEBUGVAR LastTimeOfMainGateCloseUnitInMinute DEBUGVAR MachineUpTimeUnitInMinute If MachineStage = "close-maintenance" Then - Var CountDownForSetFanMode = 60 + Var CountDownForSetFanMode = 3 EndIf If CountDownForSetFanMode = "" Then diff --git a/inter/tha/hardware/exhaust_fan_schedule.ev b/inter/tha/hardware/exhaust_fan_schedule.ev index 7350a9af..7b87b7a5 100644 --- a/inter/tha/hardware/exhaust_fan_schedule.ev +++ b/inter/tha/hardware/exhaust_fan_schedule.ev @@ -73,7 +73,7 @@ DEBUGVAR LastTimeOfMainGateCloseUnitInMinute DEBUGVAR MachineUpTimeUnitInMinute If MachineStage = "close-maintenance" Then - Var CountDownForSetFanMode = 120 + Var CountDownForSetFanMode = 3 EndIf If CountDownForSetFanMode = "" Then diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index b40c3a65..cf7d693f 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -34,7 +34,7 @@ IGNORE เป๊ปซี่นม Pepsi milk เป๊ปซี่ นม Peps อเมริกาโน AMERICANO กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no.png - - - posi1 #REF! #REF! - #REF! #REF! อเมริกาโน AMERICANO กาแฟ และน้ำ Espresso, Water 12-21-01-0003 12-21-02-0001 - bn_hot_america_no.png - - - posi1 - กาแฟดำ STRONG COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-01-0081 12-21-01-0081 12-21-02-0081 + กาแฟดำ STRONG COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-01-0081 - bn_hot_blackcoffee.png 12-21-01-0081 12-21-02-0081 - posi1 อเมริกาโน \nGuji Queen Berry AMERICANO \nETHIOPAI GUJI กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้ กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้ 12-01-01-0014 12-01-02-0011 - bn_hot_americano_light.png - - - posi2 #REF! #REF! - #REF! #REF! อเมริกาโน \nBLUE DADDY BLUE DADDY \nAMERICANO Washed process \nหอมบลูเบอร์รี และดอกไม้ Washed process \nNote: Blue Berry & Floral 12-01-01-0019 12-01-02-0019 - bn_hot_americano_light_bluedaddy.png - - - posi2 #REF! #REF! - #REF! #REF! อเมริกาโน \nMOZART MOZART \nAMERICANO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0021 12-01-02-0021 - bn_hot_americano_light_mozart.png - - - posi2 #REF! #REF! - #REF! #REF! diff --git a/ui/lang.tsv b/ui/lang.tsv index 6c601d30..8d156419 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -1076,7 +1076,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/video/sync_1.file b/video/sync_1.file index b6388a16..27540512 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 175944 +total 175976 -rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4 @@ -25,7 +25,7 @@ total 175944 -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev -rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev -rw-rw---- 1 root sdcard_rw 6217 2024-09-17 14:24 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-09-02 21:10 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2024-09-25 12:12 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/promotion_cocoa77.xml b/xml/event/promotion_cocoa77.xml index 2e458551..0ab3dafe 100644 --- a/xml/event/promotion_cocoa77.xml +++ b/xml/event/promotion_cocoa77.xml @@ -7407,6 +7407,513 @@ Sugar, Biscof" ; - - - + ; ==================> Len = 12 + ; 12-01-01-0081 12-01-01-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0081.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-01-0081.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100811201010081 = "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" + + + 49 + 117 + + eval( + If $Sum12010100811201010081 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-01-0081.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 + ) + + "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" + $Sum12010100811201010081 + text_unavailable + center-vertical-horizontal + + + ; 12-21-01-0081 12-21-02-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0081.Button,12-21-02-0081.Button,Disable=Invisible,$Sum12210100811221020081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0081.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0081.Button + StringFmt( $12-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-21-02-0081.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0081.Button + StringFmt( $12-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12210100811221020081 = "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" + + + 49 + 117 + + eval( + If $Sum12210100811221020081 = "Disable" Then + STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0081.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 + ) + + "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" + $Sum12210100811221020081 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-01-01-0014 12-01-02-0011 - diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index cdd92fd9..e97e60ec 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -272,7 +272,7 @@ If BoxID = 173149 Then Var RobinsonBeautyPro = 0 Var JemilaPro = 1 EndIf - +DEBUGVAR JemilaPro Var XMLLiveInfoEnable = 1 diff --git a/xml/menutab/event/promotion_energy_drink_1_bath.xml b/xml/menutab/event/promotion_energy_drink_1_bath.xml index 2a50e63d..8c141317 100644 --- a/xml/menutab/event/promotion_energy_drink_1_bath.xml +++ b/xml/menutab/event/promotion_energy_drink_1_bath.xml @@ -8011,6 +8011,517 @@ Sugar, Biscof" ; - - - + ; ==================> Len = 12 + ; 12-01-01-0081 12-01-01-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0081.Button + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + Var( "฿" + $12-01-01-0081.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-01-01-0081.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + Var( "฿" + $12-01-01-0081.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100811201010081 = "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" + + + 49 + 117 + + eval( + If $Sum12010100811201010081 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-01-0081.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 + ) + + "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" + $Sum12010100811201010081 + text_unavailable + center-vertical-horizontal + + + ; 12-21-01-0081 12-21-02-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0081.Button,12-21-02-0081.Button,Disable=Invisible,$Sum12210100811221020081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0081.Button + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0081.Button + Var( "฿" + $12-21-01-0081.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-21-02-0081.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0081.Button + Var( "฿" + $12-21-02-0081.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12210100811221020081 = "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" + + + 49 + 117 + + eval( + If $Sum12210100811221020081 = "Disable" Then + STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0081.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 + ) + + "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" + $Sum12210100811221020081 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-01-01-0014 12-01-02-0011 - diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 94b21329..6d1d532a 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -641,7 +641,7 @@ ;dummy_layout.inc -; menu_new_list 50 +; menu_new_list 51 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -7034,6 +7034,517 @@ Sugar, Biscof" ; - - - + ; ==================> Len = 12 + ; 12-01-01-0081 12-01-01-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0081.Button + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + Var( "฿" + $12-01-01-0081.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-01-01-0081.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + Var( "฿" + $12-01-01-0081.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100811201010081 = "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" + + + 49 + 117 + + eval( + If $Sum12010100811201010081 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-01-0081.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 + ) + + "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" + $Sum12010100811201010081 + text_unavailable + center-vertical-horizontal + + + ; 12-21-01-0081 12-21-02-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0081.Button,12-21-02-0081.Button,Disable=Invisible,$Sum12210100811221020081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0081.Button + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0081.Button + Var( "฿" + $12-21-01-0081.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-21-02-0081.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0081.Button + Var( "฿" + $12-21-02-0081.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12210100811221020081 = "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" + + + 49 + 117 + + eval( + If $Sum12210100811221020081 = "Disable" Then + STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0081.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 + ) + + "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" + $Sum12210100811221020081 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-01-01-0014 12-01-02-0011 - diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index e9478d03..11c383e2 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -94,7 +94,7 @@ ;dummy_layout.inc -; menu_new_list 50 +; menu_new_list 51 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -6428,6 +6428,513 @@ Sugar, Biscof" ; - - - + ; ==================> Len = 12 + ; 12-01-01-0081 12-01-01-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0081.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-01-0081.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0081.Button + StringFmt( $12-01-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100811201010081 = "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" + + + 49 + 117 + + eval( + If $Sum12010100811201010081 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-01-0081.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 + ) + + "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" + $Sum12010100811201010081 + text_unavailable + center-vertical-horizontal + + + ; 12-21-01-0081 12-21-02-0081 - + + 33 + 22 + 225 + 296 + Flag( 12-21-01-0081.Button,12-21-02-0081.Button,Disable=Invisible,$Sum12210100811221020081) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "กาแฟดำ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ และน้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "STRONG COFFEE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Dark shot Espresso, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-21-01-0081.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-01-0081.Button + StringFmt( $12-21-01-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-21-02-0081.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0081.Button + StringFmt( $12-21-02-0081.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12210100811221020081 = "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" + + + 49 + 117 + + eval( + If $Sum12210100811221020081 = "Disable" Then + STRCONTAIN "ERR" $12-21-01-0081.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0081.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 + ) + + "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" + $Sum12210100811221020081 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-01-01-0014 12-01-02-0011 - diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index e26656b7..083396a0 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -202,7 +202,7 @@ EndIf EndIf - Var SlientRefreshEnable = 1 + Var SlientRefreshEnable = 2 Var TimeDelayDefault = 1200 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 9504ccd3..8fbae7e7 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.95" - Var XMLPageVersionInt = 895 + Var XMLPageVersion = "8.97" + Var XMLPageVersionInt = 897 ;Oreo Var OreoGuarantee = 0