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/inc/video.inc b/inc/video.inc index b1e5d581..4036838c 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -78,6 +78,9 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf + If ProYuzu250Enable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" + EndIf If UseSlideShowVideo = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" EndIf @@ -137,6 +140,9 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf + If ProYuzu250Enable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" + EndIf If UseSlideShowVideo = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" EndIf @@ -211,6 +217,9 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf + If ProYuzu250Enable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" + EndIf If UseSlideShowVideo = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" EndIf @@ -263,6 +272,10 @@ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf + If ProYuzu250Enable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" + EndIf + If UseSlideShowVideo = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" EndIf diff --git a/inter/mys/adv/taobin_adv_menu_24.mp4 b/inter/mys/adv/taobin_adv_menu_24.mp4 new file mode 100644 index 00000000..5047f12f Binary files /dev/null and b/inter/mys/adv/taobin_adv_menu_24.mp4 differ diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 54b50e9d..12da7f98 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -12,22 +12,60 @@ DEBUGVAR ProYuzu250Enable If ProReducedPriceEnable = 1 Then Else + DEBUGVAR "Case pro reduce end" ; case-pro-reduce-end If ProYuzu250Enable = 1 Then + DEBUGVAR "Pro yuzu ongoing" ; concat-profile If HasProYuzu250Concat = "true" Then - + DEBUGVAR "Pro yuzu concat" Else - + If IsProfileReduce = "true" Then - + DEBUGVAR "Pro reduce was set but disabled from trick" + CacheVarStr "get" XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "Get PreEvent Empty" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event, also concat Yuzu" + DEBUGVAR XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + "-" + Var XMLProfile = XMLProfile + "PromoYuzu250" + EndIf + Else + DEBUGVAR "No pro reduce, concat pro yuzu" CacheVarStr "put" XMLProfilePreEvent Var XMLProfile = XMLProfile + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" EndIf EndIf + Else + If IsProfileReduce = "true" Then + DEBUGVAR "No yuzu but set pro reduce" + CacheVarStr "get" XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "PreEvent empty, set General" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event" + Var XMLProfile = XMLProfilePreEvent + EndIf + + Else + + If HasProYuzu250Concat = "true" Then + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + EndIf + + DEBUGVAR "Store profile pre event" + DEBUGVAR XMLProfilePreEvent + CacheVarStr "put" XMLProfilePreEvent + EndIf + EndIf EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index fb0813bf..63d9cdaa 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -44,6 +44,9 @@ Var EnablePayLaterMode = 0 ; Slide show Video Var UseSlideShowVideo = 0 +Var NoTrickPriceProfile = 0 + + If SystemDateMonthInt = 9 Then If SystemDateDayInt < 17 Then Var PromotionOreoToppingFreeEnable = 1 @@ -59,7 +62,7 @@ If SystemDateMonthInt = 10 Then If SetProReduceByBO = 1 Then Var ProReducedPriceEnable = 1 EndIf - + Var ProYuzu250Enable = 1 EndIf @@ -67,12 +70,17 @@ If SystemDateMonthInt = 11 Then If SetProReduceByBO = 1 Then Var ProReducedPriceEnable = 1 EndIf - + Var ProYuzu250Enable = 1 EndIf If SystemDateMonthInt = 12 Then Var ProYuzu250Enable = 1 + + If SetProReduceByBO = 1 Then + Var ProReducedPriceEnable = 0 + EndIf + EndIf If SystemDateMonthInt = 1 Then @@ -83,6 +91,17 @@ If SystemDateMonthInt = 1 Then EndIf EndIf +If SystemDateMonthInt < 10 Then + Var ProReducedPriceEnable = 0 +EndIf + +If ProReducedPriceEnable = 0 Then + If XMLProfile = "PromoReduced" Then + Var NoTrickPriceProfile = 1 + + EndIf +EndIf + If BoxID = 177746 Then Var ProThaiTeaEnable = 1 Var ProYuzuEnable = 1 @@ -94,8 +113,8 @@ If BoxID = 177746 Then Var UseSlideShowVideo = 0 - Var ProReducedPriceEnable = 0 - Var ProYuzu250Enable = 1 + ;Var ProReducedPriceEnable = 0 + ;Var ProYuzu250Enable = 1 EndIf If BoxID = 210037 Then @@ -106,9 +125,9 @@ If BoxID = 210011 Then Var UseSlideShowVideo = 1 EndIf -If BoxID = 200002 Then - Var UseSlideShowVideo = 1 -EndIf +;If BoxID = 200002 Then +; Var UseSlideShowVideo = 1 +;EndIf ;If BoxID = Something Then ; Var EnablePayLaterMode = 1 diff --git a/inter/whatthecup/common/adv/wtc_banner.mp4 b/inter/whatthecup/common/adv/wtc_banner.mp4 new file mode 100644 index 00000000..a339ce64 Binary files /dev/null and b/inter/whatthecup/common/adv/wtc_banner.mp4 differ diff --git a/inter/whatthecup/sgp/image/collectiing/QR_contract.png b/inter/whatthecup/sgp/image/collectiing/QR_contract.png index 5a6aee0b..2a45c2dc 100644 Binary files a/inter/whatthecup/sgp/image/collectiing/QR_contract.png and b/inter/whatthecup/sgp/image/collectiing/QR_contract.png differ 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_board.xml b/xml/page_board.xml index daf82682..056fd975 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -633,6 +633,9 @@ DEBUGVAR EventTurnOn Var UsePepsiTheme = 0 + + Var NoTrickPriceProfile = 0 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1734,30 +1737,36 @@ PRICE "Reset" "-" DEBUGVAR XMLProfile DEBUGVAR XMLProfilePrevious - If TimeProfilePrice = 5 Then - PRICE "Reset" "-" - PRICE "Load" "-" - PRICE "CheckAndApply" XMLProfile + If NoTrickPriceProfile = 0 Then - DEBUGVAR ProfileIndex[0] - DEBUGVAR ProfileIndex[1] - DEBUGVAR ProfileIndex[2] - DEBUGVAR ProfileIndex[3] - DEBUGVAR ProfileIndex[4] - DEBUGVAR ProfileIndex[5] - DEBUGVAR ProfileIndex[6] - DEBUGVAR ProfileIndex[7] - DEBUGVAR ProfileIndex[8] - DEBUGVAR ProfileIndex[9] - DEBUGVAR ProfileIndex[10] + If TimeProfilePrice = 5 Then + PRICE "Reset" "-" + PRICE "Load" "-" + PRICE "CheckAndApply" XMLProfile - PRICE "Reload" "-" + DEBUGVAR ProfileIndex[0] + DEBUGVAR ProfileIndex[1] + DEBUGVAR ProfileIndex[2] + DEBUGVAR ProfileIndex[3] + DEBUGVAR ProfileIndex[4] + DEBUGVAR ProfileIndex[5] + DEBUGVAR ProfileIndex[6] + DEBUGVAR ProfileIndex[7] + DEBUGVAR ProfileIndex[8] + DEBUGVAR ProfileIndex[9] + DEBUGVAR ProfileIndex[10] + + PRICE "Reload" "-" + + Var XMLProfilePrevious = XMLProfile + EndIf - Var XMLProfilePrevious = XMLProfile EndIf + EndIf + Refresh TimerReset diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index e6caaacf..4259fcc3 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -762,69 +762,36 @@ EndIf EndIf - If MyMintEnable = 1 Then - If FromMyMintPro = 1 Then - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" - EndIf - EndIf - - If ProBadValentineEnable = 1 Then - If FromBadValentinePro = 1 Then - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml" - EndIf - EndIf - - If LipitPro = 1 Then - If FromLipitPro = 1 Then - If Seeker.CodeChannel = 1 Then - If Seeker.CollectPointPromotion = 1 Then - If LipitRewardOutOfStock = 0 Then + If NotCollectPointPromotion = 0 Then + If RobinsonBeautyPro = 1 Then + If FromRobinsonBeautyPro = 1 Then + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointPromotion = 1 Then GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" + Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml" EndIf - EndIf - Else - If LipitRewardOutOfStock = 0 Then - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" - EndIf - EndIf - EndIf - EndIf - - DEBUGVAR NamHomCoconutPro - DEBUGVAR FromNamHomCoconutPro - DEBUGVAR Seeker.CodeChannel - If NamHomCoconutPro = 1 Then - If FromNamHomCoconutPro = 1 Then - If Seeker.CodeChannel = 1 Then - If Seeker.CollectPointPromotion = 1 Then - If NamHomCoconutRewardOutOfStock = 0 Then - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml" - EndIf - EndIf - Else - If NamHomCoconutRewardOutOfStock = 0 Then - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml" - EndIf - EndIf - EndIf - EndIf - - If RobinsonBeautyPro = 1 Then - If FromRobinsonBeautyPro = 1 Then - If Seeker.CodeChannel = 1 Then - If Seeker.CollectPointPromotion = 1 Then + Else GETACCEXT TelephoneNumber 32 Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml" EndIf - Else - GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml" + EndIf + EndIf + + If JemilaPro = 1 Then + If FromJemilaPro = 1 Then + If JemilaRewardOutOfStock = 1 Then + SAVELOG "Jemila prize out of stock skip collect promotion point." + Else + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointPromotion = 0 Then + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf + Else + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf + EndIf EndIf EndIf EndIf diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index 7e9c1434..69e6f26c 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -747,6 +747,13 @@ EndIf + If VendingCashless = "END" Then + If ReqPayInfoFromCashOther = 2 Then + DEBUGVAR "CashlessReq OFF" + CashlessReq OFF + EndIf + EndIf + @@ -1494,7 +1501,8 @@ If CancelFlag = 0 Then Var QR_POPUP = "/img_popup8.png" Var alphaState = "Enable" - ;Coin CARD + Coin CARD + Var ReqPayInfoFromCashOther = 2 Var CreditCardRef = "" @@ -1516,9 +1524,7 @@ Var Timeout = 0 EndIf - Var QRErrorState = "Invisible" Var VendingCashless = "-" - Var LOADING_STATE = "Enable" Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 @@ -1738,18 +1744,11 @@ ;CoinVending ON ;VendingQR OFF - - If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF by user" - CashlessReq OFF - EndIf - If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 CashlessReq FAIL EndIf - Refresh