From 703acf2f25afff3746efa5132eb792ff6731704e Mon Sep 17 00:00:00 2001 From: wanlop run Date: Wed, 25 Sep 2024 13:38:13 +0700 Subject: [PATCH 1/2] fix --- inter/sgp/hardware/exhaust_fan_schedule.ev | 2 +- inter/tha/hardware/exhaust_fan_schedule.ev | 2 +- ui/lang.tsv | 2 +- video/sync_1.file | 4 ++-- xml/event/tricker.ev | 2 +- xml/page_drinkok.xml | 2 +- xml_main/startup.xml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) 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/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/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/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 From 79257109016e6bf7d9718420a891557fc57c4d8c Mon Sep 17 00:00:00 2001 From: wanlop run Date: Wed, 25 Sep 2024 15:31:26 +0700 Subject: [PATCH 2/2] DO --- image/page_drink_n/bn_hot_blackcoffee.png | Bin 13762 -> 13811 bytes menu/new-layout.tsv | 2 +- xml/event/promotion_cocoa77.xml | 507 +++++++++++++++++ .../event/promotion_energy_drink_1_bath.xml | 511 +++++++++++++++++ xml/menutab/page_catalog_group_recommend.xml | 513 +++++++++++++++++- xml/page_catalog_group_recommend.xml | 509 ++++++++++++++++- 6 files changed, 2039 insertions(+), 3 deletions(-) diff --git a/image/page_drink_n/bn_hot_blackcoffee.png b/image/page_drink_n/bn_hot_blackcoffee.png index f13a6621a3c081d208d30216f2fd5b8710c6f09f..80e0f6335bbc6178f1115d18b3ef4a48a04ffba0 100644 GIT binary patch delta 13303 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 delta 13262 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 M07*qoM6N<$f)9Iey#N3J 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/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/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 -