diff --git a/image/event/school_ovaltine/school_ovaltine.jpg b/image/event/school_ovaltine/school_ovaltine.jpg deleted file mode 100644 index 29bc675c..00000000 Binary files a/image/event/school_ovaltine/school_ovaltine.jpg and /dev/null differ diff --git a/image/event/school_ovaltine/school_ovaltine.png b/image/event/school_ovaltine/school_ovaltine.png new file mode 100644 index 00000000..7ebe8155 Binary files /dev/null and b/image/event/school_ovaltine/school_ovaltine.png differ diff --git a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_disable_n2/bn_iced_Super_Ovaltine_cocoa_smoothie.png similarity index 100% rename from image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png rename to image/page_drink_disable_n2/bn_iced_Super_Ovaltine_cocoa_smoothie.png diff --git a/image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png similarity index 100% rename from image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png rename to image/page_drink_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png diff --git a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png deleted file mode 100644 index ece260a8..00000000 Binary files a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png and /dev/null differ diff --git a/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png index 09227398..ece260a8 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png and b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png differ diff --git a/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_press_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png similarity index 100% rename from image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png rename to image/page_drink_press_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png index b0608c21..cb8ee8b5 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png index ecfefbd9..637372f3 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png b/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png index 86967e0d..696ff952 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png b/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png index 5047d5f2..ad5668ad 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png index e1ca735b..4d73cca6 100755 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png index 6ee01d4c..c7b4fe2c 100755 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png b/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png index cef7ef2b..4f00eb92 100755 Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png index 7a51033a..d86a7c6c 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png index 54e00b63..45ffa62d 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png index 92b65cb7..4b3fd88c 100644 Binary files a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png and b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png index c12283f8..f0ba6f9e 100644 Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png index 25aa08a7..2af13312 100644 Binary files a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_america_no.png b/inter/aus/image/page_drink_n/bn_hot_america_no.png index 164080ca..73933336 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_n/bn_hot_america_no.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_n/bn_hot_cappuccino.png index 2979646d..7446ebca 100644 Binary files a/inter/aus/image/page_drink_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_n/bn_hot_cappuccino.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png index 826d5bfa..31b6074b 100755 Binary files a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_latte.png b/inter/aus/image/page_drink_n/bn_hot_latte.png index dc578694..d7c6def9 100755 Binary files a/inter/aus/image/page_drink_n/bn_hot_latte.png and b/inter/aus/image/page_drink_n/bn_hot_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_mocha.png b/inter/aus/image/page_drink_n/bn_hot_mocha.png index 7098448d..d8f8fa30 100755 Binary files a/inter/aus/image/page_drink_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_n/bn_hot_mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png index 1a85aee8..5ab7fd21 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_n/bn_iced_cocoa.png index e1638c0f..977ec044 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_n/bn_iced_cocoa.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_n/bn_protein_Mocha.png index aeed84d0..fc2b2af6 100644 Binary files a/inter/aus/image/page_drink_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_n/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png index 0e7ea616..41c55f15 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png index fb25147c..60a6a486 100755 Binary files a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png b/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png index 3495a10f..a9b60257 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png index ed15c88a..3f5aa0e0 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png index ac30ac7c..bf905376 100755 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png index 2651040c..cd30a4c1 100755 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png b/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png index fe056d34..8c4e011e 100755 Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png index 84d606be..3ecc4a5b 100755 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png index f9e005db..1798ef5e 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png index 7f605484..553f532c 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png index 313dac9d..44682489 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png index c3844a12..56e75b92 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_america_no.png b/inter/aus/image/page_drink_press_n/bn_hot_america_no.png index aba43f87..b561b309 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_press_n/bn_hot_america_no.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png index 766cbdf5..a50beb79 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png index 3e8bd86f..00433dd9 100755 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_latte.png index d9004d1a..781d522f 100755 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_latte.png and b/inter/aus/image/page_drink_press_n/bn_hot_latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_hot_mocha.png b/inter/aus/image/page_drink_press_n/bn_hot_mocha.png index 69d91f14..8364e702 100755 Binary files a/inter/aus/image/page_drink_press_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_press_n/bn_hot_mocha.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png index 08082cc1..d40ee52c 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png index 63fd2743..c5976d07 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png index 85c50b1f..8d4a4427 100644 Binary files a/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png differ diff --git a/inter/aus/material_image/04-03-04-0006.jpeg b/inter/aus/material_image/04-03-04-0006.jpeg new file mode 100644 index 00000000..d281f465 Binary files /dev/null and b/inter/aus/material_image/04-03-04-0006.jpeg differ diff --git a/inter/aus/xml/event/promotion_autumn_breeze.lxml b/inter/aus/xml/event/promotion_autumn_breeze.lxml index fe61ecc1..4ada3190 100644 --- a/inter/aus/xml/event/promotion_autumn_breeze.lxml +++ b/inter/aus/xml/event/promotion_autumn_breeze.lxml @@ -1163,15 +1163,15 @@ ; ==================> Len = 3 - ; - 51-05-02-0067 - + ; - 51-05-02-0068 - 33 22 225 296 - Flag( 51-05-02-0067.Button,Disable=Invisible,$Sum5105020067) + Flag( 51-05-02-0068.Button,Disable=Invisible,$Sum5105020068) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 diff --git a/xml/event/promotion_matcha_every_day.xml b/xml/event/promotion_matcha_every_day.xml index 41b35594..eb825482 100644 --- a/xml/event/promotion_matcha_every_day.xml +++ b/xml/event/promotion_matcha_every_day.xml @@ -68,7 +68,7 @@ ;dummy_layout.inc -; menu_new_list 61 +; menu_new_list 62 ; ==================> Len = 16 ; - 12-02-02-0099 - @@ -3091,19 +3091,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 diff --git a/xml/event/promotion_oreo_volcano.xml b/xml/event/promotion_oreo_volcano.xml index e4837674..84a2c218 100644 --- a/xml/event/promotion_oreo_volcano.xml +++ b/xml/event/promotion_oreo_volcano.xml @@ -68,7 +68,7 @@ ;dummy_layout.inc -; menu_new_list 61 +; menu_new_list 62 ; ==================> Len = 16 ; - 12-02-02-0099 - @@ -3091,19 +3091,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 diff --git a/xml/event/promotion_school_ovaltine.xml b/xml/event/promotion_school_ovaltine.xml index abc429ad..b5168349 100644 --- a/xml/event/promotion_school_ovaltine.xml +++ b/xml/event/promotion_school_ovaltine.xml @@ -68,7 +68,7 @@ ;dummy_layout.inc -; menu_new_list 61 +; menu_new_list 62 ; ==================> Len = 16 ; - 12-02-02-0099 - @@ -3091,19 +3091,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 029a570e..ee794894 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -5,7 +5,7 @@ DEBUGVAR CocktailShow DEBUGVAR OpenFromPageBoard DEBUGVAR MatchaEveryDayPro -DEBUGVAR SchoolOvaltine +DEBUGVAR SchoolOvaltinePro DEBUGVAR OreoVolcanoPro Var PromotionState1 = "Invisible" @@ -34,7 +34,7 @@ Else Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml" EndIf - If SchoolOvaltine = 1 Then + If SchoolOvaltinePro = 1 Then Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml" Var PromotionState1 = "Enable" diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 3ea69a39..1025d23c 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -55,9 +55,6 @@ Var ThickTeaByBrewerBanner = 0 Var StrawberrySeriesPro = 0 Var StrawberrySeriesMenu = 0 -; Ovaltine school, 1 - 28 Feb -Var OvaltineSchoolPro = 0 - ; Red string of fate, 10 - 23 Feb Var RedStringOfFatePro = 0 @@ -276,7 +273,6 @@ DEBUGVAR HaveIngredientOvaltine If HaveIngredientOvaltine = "true" Then Else - Var OvaltineSchoolPro = 0 Var SchoolOvaltinePro = 0 Var RedStringOfFatePro = 0 EndIf diff --git a/xml/page_catalog_group_recommend_multi_pro.xml b/xml/page_catalog_group_recommend_multi_pro.xml index 4004f22d..48146950 100644 --- a/xml/page_catalog_group_recommend_multi_pro.xml +++ b/xml/page_catalog_group_recommend_multi_pro.xml @@ -3099,19 +3099,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 @@ -19619,19 +19875,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 @@ -36139,19 +36651,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 @@ -52659,19 +53427,19 @@ Volcano" ; - - - ; ==================> Len = 16 - ; - 12-05-02-0133 - + ; - 12-05-02-0133 12-05-03-0133 33 22 225 296 - Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum1205020133) + Flag( 12-05-02-0133.Button,12-05-03-0133.Button,DateTimeStart="2025/05/01T00:00:00",$Sum12050201331205030133) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาผสานปักษ์ใต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ ชาไทย นม และคาราเมล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Southern Fusion +Tea" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha , Thai Tea, Milk Caramel" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0083.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0083.Button + StringFmt( $12-02-01-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0083.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0083.Button + StringFmt( $12-02-02-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-02-03-0083.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0083.Button + StringFmt( $12-02-03-0083.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120201008312020200831202030083 = "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 $Sum120201008312020200831202030083 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0083.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0083.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0083.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" + $Sum120201008312020200831202030083 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 21 diff --git a/xml/page_drink_stuck.xml b/xml/page_drink_stuck.xml index 1a6ed092..b853be3b 100644 --- a/xml/page_drink_stuck.xml +++ b/xml/page_drink_stuck.xml @@ -56,11 +56,10 @@ Var TextBottomShowX = 0 - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/complete_en/" + Var DirImage = "ROOT/taobin_project/image/complete/" - Else - Var DirImage = "ROOT/taobin_project/image/complete/" + If LanguageShow = "ENG" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/" EndIf If LanguageShow = "MYANMAR" Then diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml index 4d0b65cf..b3988863 100644 --- a/xml/page_drinkfail2Multi.xml +++ b/xml/page_drinkfail2Multi.xml @@ -9,11 +9,22 @@ Var buttonRemoveCup = "Enable" - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/complete_en/" + Var DirImage = "ROOT/taobin_project/image/complete/" - Else - Var DirImage = "ROOT/taobin_project/image/complete/" + If LanguageShow = "ENG" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/" + EndIf + + If LanguageShow = "MYANMAR" Then + Var DirImage = "ROOT/taobin_project/image/complete_mmr/" + EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_msc/" + EndIf + + If LanguageShow = "MTC" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_mtc/" EndIf Var Timeout = 0 diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 105ab7c3..b6d7eeed 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -110,24 +110,22 @@ DEBUGVAR MachineStage DEBUGVAR NextOrderStatus - ; Show text and button for remove CUP. - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/complete_en/" - Else - Var DirImage2 = "ROOT/taobin_project/image/complete/" + Var DirImage = "ROOT/taobin_project/image/complete/" + + If LanguageShow = "ENG" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/" EndIf - ;inter-image - If LanguageShow = "MYANMAR" Then - Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/" + If LanguageShow = "MYANMAR" Then + Var DirImage = "ROOT/taobin_project/image/complete_mmr/" EndIf - If LanguageShow = "MSC" Then - Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/" + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_msc/" EndIf - If LanguageShow = "MTC" Then - Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/" + If LanguageShow = "MTC" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_mtc/" EndIf Var txtDrinkOKState = "Invisible"