diff --git a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png new file mode 100644 index 00000000..351e0106 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png new file mode 100644 index 00000000..e4caec8c Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png new file mode 100644 index 00000000..ff0d1e02 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png new file mode 100644 index 00000000..b14bc304 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png new file mode 100644 index 00000000..20788f06 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png new file mode 100644 index 00000000..5c039657 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png new file mode 100644 index 00000000..1b98bde4 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png new file mode 100644 index 00000000..13ab57b2 Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_soda_jemila_pro.png b/image/page_drink_disable_n2/bn_soda_jemila_pro.png new file mode 100644 index 00000000..1cbf6000 Binary files /dev/null and b/image/page_drink_disable_n2/bn_soda_jemila_pro.png differ diff --git a/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png b/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png new file mode 100644 index 00000000..204b90f1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png differ diff --git a/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png new file mode 100644 index 00000000..cd9901df Binary files /dev/null and b/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png differ diff --git a/image/page_drink_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_n/bn_hot_america_no_jemila_pro.png new file mode 100644 index 00000000..e20850c5 Binary files /dev/null and b/image/page_drink_n/bn_hot_america_no_jemila_pro.png differ diff --git a/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png new file mode 100644 index 00000000..2a9d8085 Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png differ diff --git a/image/page_drink_n/bn_iced_7up_jemila_pro.png b/image/page_drink_n/bn_iced_7up_jemila_pro.png new file mode 100644 index 00000000..03013d39 Binary files /dev/null and b/image/page_drink_n/bn_iced_7up_jemila_pro.png differ diff --git a/image/page_drink_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_n/bn_iced_cocoa_jemila_pro.png new file mode 100644 index 00000000..77f1320e Binary files /dev/null and b/image/page_drink_n/bn_iced_cocoa_jemila_pro.png differ diff --git a/image/page_drink_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_n/bn_iced_lemonade_jemila_pro.png new file mode 100644 index 00000000..b2696c74 Binary files /dev/null and b/image/page_drink_n/bn_iced_lemonade_jemila_pro.png differ diff --git a/image/page_drink_n/bn_iced_milk_jemila_pro.png b/image/page_drink_n/bn_iced_milk_jemila_pro.png new file mode 100644 index 00000000..b37142d7 Binary files /dev/null and b/image/page_drink_n/bn_iced_milk_jemila_pro.png differ diff --git a/image/page_drink_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_n/bn_jasmine_tea_jemila_pro.png new file mode 100644 index 00000000..6021a0d1 Binary files /dev/null and b/image/page_drink_n/bn_jasmine_tea_jemila_pro.png differ diff --git a/image/page_drink_n/bn_soda_jemila_pro.png b/image/page_drink_n/bn_soda_jemila_pro.png new file mode 100644 index 00000000..9a6d3096 Binary files /dev/null and b/image/page_drink_n/bn_soda_jemila_pro.png differ diff --git a/image/page_drink_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_n/bn_water_roomtemp_jemila_pro.png new file mode 100644 index 00000000..7e3d494c Binary files /dev/null and b/image/page_drink_n/bn_water_roomtemp_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png new file mode 100644 index 00000000..3a40b1c0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png new file mode 100644 index 00000000..f194f79c Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png new file mode 100644 index 00000000..5669d460 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png new file mode 100644 index 00000000..a32cb674 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png new file mode 100644 index 00000000..92558dc6 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png new file mode 100644 index 00000000..7c5606c7 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png new file mode 100644 index 00000000..88beab8e Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png new file mode 100644 index 00000000..7f25e4f0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_soda_jemila_pro.png b/image/page_drink_picture2_n/bn_soda_jemila_pro.png new file mode 100644 index 00000000..ab1c7fd3 Binary files /dev/null and b/image/page_drink_picture2_n/bn_soda_jemila_pro.png differ diff --git a/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png new file mode 100644 index 00000000..af6a5be0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png new file mode 100644 index 00000000..558218e1 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png new file mode 100644 index 00000000..3f0d93a5 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png new file mode 100644 index 00000000..e990f73b Binary files /dev/null and b/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_jemila_pro.png b/image/page_drink_press_n/bn_iced_7up_jemila_pro.png new file mode 100644 index 00000000..5e660515 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_7up_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png new file mode 100644 index 00000000..20770a6d Binary files /dev/null and b/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png new file mode 100644 index 00000000..d2bf5796 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_jemila_pro.png b/image/page_drink_press_n/bn_iced_milk_jemila_pro.png new file mode 100644 index 00000000..f6fed9f4 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_milk_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png new file mode 100644 index 00000000..306ff524 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_soda_jemila_pro.png b/image/page_drink_press_n/bn_soda_jemila_pro.png new file mode 100644 index 00000000..57d198c3 Binary files /dev/null and b/image/page_drink_press_n/bn_soda_jemila_pro.png differ diff --git a/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png new file mode 100644 index 00000000..64716c10 Binary files /dev/null and b/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png differ diff --git a/xml/event/promotion_cocoa77.xml b/xml/event/promotion_cocoa77.xml index 0ab3dafe..5fa0604b 100644 --- a/xml/event/promotion_cocoa77.xml +++ b/xml/event/promotion_cocoa77.xml @@ -7424,7 +7424,7 @@ Sugar, Biscof" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRONG COFFEE" + Var NameDrink = "BLACK COFFEE" Var NameDrinkTH = "กาแฟดำ" Var DrinkDescriptionTH = "กาแฟ และน้ำ " Var DrinkDescription = "Dark shot Espresso, Water" @@ -7519,7 +7519,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "STRONG COFFEE" + "BLACK COFFEE" 16 @@ -7677,7 +7677,7 @@ Sugar, Biscof" SoundVolume xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") - Var NameDrink = "STRONG COFFEE" + Var NameDrink = "BLACK COFFEE" Var NameDrinkTH = "กาแฟดำ" Var DrinkDescriptionTH = "กาแฟ และน้ำ " Var DrinkDescription = "Dark shot Espresso, Water" @@ -7772,7 +7772,7 @@ Sugar, Biscof" KanitMediumTTF 0x322B26 showengText - "STRONG COFFEE" + "BLACK COFFEE" 16 diff --git a/xml/event/promotion_jemila.xml b/xml/event/promotion_jemila.xml index cd7af1b0..38417e88 100644 --- a/xml/event/promotion_jemila.xml +++ b/xml/event/promotion_jemila.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 + "BLACK 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 + "BLACK 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_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 85cfcaf2..61b3b921 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -2596,7 +2596,7 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRONG COFFEE" + Var NameDrink = "BLACK COFFEE" Var NameDrinkTH = "กาแฟดำ" Var DrinkDescriptionTH = "กาแฟ และน้ำ " Var DrinkDescription = "Dark shot Espresso, Water" @@ -2691,7 +2691,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "STRONG COFFEE" + "BLACK COFFEE" 16 @@ -2849,7 +2849,7 @@ ESPRESSO" SoundVolume xmlpro( 12-21-01-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png") - Var NameDrink = "STRONG COFFEE" + Var NameDrink = "BLACK COFFEE" Var NameDrinkTH = "กาแฟดำ" Var DrinkDescriptionTH = "กาแฟ และน้ำ " Var DrinkDescription = "Dark shot Espresso, Water" @@ -2944,7 +2944,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "STRONG COFFEE" + "BLACK COFFEE" 16 diff --git a/xml/page_catalog_group_pro_jemila.xml b/xml/page_catalog_group_pro_jemila.xml index 06cd3bc1..56aeafa9 100644 --- a/xml/page_catalog_group_pro_jemila.xml +++ b/xml/page_catalog_group_pro_jemila.xml @@ -44,9 +44,9 @@ Flag( 12-03-02-0075.Button,12-03-03-0075.Button,$Sum12030200751203030075)