diff --git a/image/page_payment_en/page_payment/img_popup1-AUS.png b/image/page_payment_en/page_payment/img_popup1-AUS.png new file mode 100644 index 00000000..92420fef Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup1-AUS.png differ diff --git a/inter/aus/image/payment_cash/bd_pay_qrcode.png b/inter/aus/image/payment_cash/bd_pay_qrcode.png index 7aea9419..30f76e99 100644 Binary files a/inter/aus/image/payment_cash/bd_pay_qrcode.png and b/inter/aus/image/payment_cash/bd_pay_qrcode.png differ diff --git a/inter/aus/image/payment_cash/bn_pay_qrcode.png b/inter/aus/image/payment_cash/bn_pay_qrcode.png index f0591823..4b85e2b8 100644 Binary files a/inter/aus/image/payment_cash/bn_pay_qrcode.png and b/inter/aus/image/payment_cash/bn_pay_qrcode.png differ diff --git a/inter/aus/image/payment_cash/bp_pay_qrcode.png b/inter/aus/image/payment_cash/bp_pay_qrcode.png index 14d77137..f2f88e27 100644 Binary files a/inter/aus/image/payment_cash/bp_pay_qrcode.png and b/inter/aus/image/payment_cash/bp_pay_qrcode.png differ diff --git a/inter/aus/support_langs b/inter/aus/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/aus/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/hkg/support_langs b/inter/hkg/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/hkg/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/mys/adv/taobin_adv_menu_25.mp4 b/inter/mys/adv/taobin_adv_menu_25.mp4 index f4989ed2..080c4332 100644 Binary files a/inter/mys/adv/taobin_adv_menu_25.mp4 and b/inter/mys/adv/taobin_adv_menu_25.mp4 differ diff --git a/inter/mys/support_langs b/inter/mys/support_langs index 9ea36cbe..c3d30223 100644 --- a/inter/mys/support_langs +++ b/inter/mys/support_langs @@ -1 +1 @@ -ENG,THAI,CHINA,JAPAN,MALAY \ No newline at end of file +ENG,-,CHINA,JAPAN,MALAY diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 4e868931..a60a1c16 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -5,75 +5,121 @@ DEBUGVAR XMLProfile STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce -DEBUGVAR HasProYuzu250Concat -DEBUGVAR ProReducedPriceEnable -DEBUGVAR IgnoreProfileFromRunEV +Var refresh_str = "-RefreshProf" +STRCONTAIN refresh_str XMLProfile HasRefreshProf -If ProReducedPriceEnable = 1 Then +DEBUGVAR HasRefreshProf +DEBUGVAR NeedRefreshProfile -Else - DEBUGVAR "Case pro reduce end" - ; case-pro-reduce-end - If IgnoreProfileFromRunEV = 1 Then - DEBUGVAR "Pro yuzu ongoing" - ; concat-profile - If HasProYuzu250Concat = "true" Then - DEBUGVAR "Pro yuzu concat" +; refresh-profile-after-promo-end +If NeedRefreshProfile = 1 Then + + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS + + STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop + STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop + + DEBUGVAR PromoYuzuDrop + DEBUGVAR PromoYuzuDis50Drop + + If HasRefreshProf = "true" Then + + DEBUGVAR "case already refresh" + + ; restore-profile + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + Var NeedRefreshProfile = 0 + Else + ; save-current-as-pre + CacheVarStr "put" XMLProfilePreEvent + + If PromoYuzuDrop = "true" Then + DEBUGVAR "case yuzu drop --> refresh" + Var XMLProfile = XMLProfile + refresh_str Else + If PromoYuzuDis50Drop = "true" Then + DEBUGVAR "case yuzu drop discount 50% --> refresh" + Var XMLProfile = XMLProfile + refresh_str + EndIf + EndIf + + EndIf +Else + + DEBUGVAR HasProYuzu250Concat + DEBUGVAR ProReducedPriceEnable + DEBUGVAR IgnoreProfileFromRunEV + + If ProReducedPriceEnable = 1 Then + + Else + DEBUGVAR "Case pro reduce end" + ; case-pro-reduce-end + If IgnoreProfileFromRunEV = 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 - 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 + "-" + DEBUGVAR "No pro reduce, concat pro yuzu" + CacheVarStr "put" XMLProfilePreEvent + + Var XMLProfile = XMLProfile + "-" 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 + If IsProfileReduce = "true" Then + DEBUGVAR "No yuzu but set pro reduce" CacheVarStr "get" XMLProfilePreEvent - Var XMLProfile = 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 - DEBUGVAR "Store profile pre event" - DEBUGVAR XMLProfilePreEvent - CacheVarStr "put" XMLProfilePreEvent EndIf EndIf -EndIf - - - -If IgnoreProfileFromRunEV = 1 Then - Var ToggleAfterEventProfileOff = 1 + + + If IgnoreProfileFromRunEV = 1 Then + Var ToggleAfterEventProfileOff = 1 + EndIf + + EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index fd1c1581..0fc1ba68 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -58,8 +58,25 @@ If SystemDateMonthInt = 9 Then EndIf EndIf +If SystemDateMonthInt = 10 Then + + Var IgnoreProfileFromRunEV = 0 + +EndIf + +If SystemDateMonthInt = 11 Then + + Var IgnoreProfileFromRunEV = 0 +EndIf + +If SystemDateMonthInt = 12 Then + Var IgnoreProfileFromRunEV = 0 + +EndIf + If SystemDateMonthInt < 10 Then Var ProReducedPriceEnable = 0 + Var IgnoreProfileFromRunEV = 0 EndIf If ProReducedPriceEnable = 0 Then @@ -69,6 +86,23 @@ If ProReducedPriceEnable = 0 Then EndIf EndIf + +; zone-refresh-once + +READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr +STRCONTAIN "1" NeedRefreshStr need_refresh + +If need_refresh = "true" Then + + Var NeedRefreshProfile = 1 + WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0" + +Else + Var NeedRefreshProfile = 0 +EndIf + + + If BoxID = 177746 Then Var ProThaiTeaEnable = 1 Var ProYuzuEnable = 1 diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv index d0e86aa0..a3a1ca45 100644 --- a/inter/sgp/animation01/play_list.tsv +++ b/inter/sgp/animation01/play_list.tsv @@ -570,9 +570,9 @@ Coke 52-05-03-0019 1 23 37 13 41 24 49 0:49 23 ไมโลเย็น 52-03-03-0048 1 7 61 16 23 41 24 120 8:00 23 ไมโลปั่นภูเขาไฟ 52-03-03-0049 1 7 15 61 41 61 24 120 8:00 23 - - - +รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 52-21-03-0078 1 2 3 4 14 23 41 24 49 11:01 23 +พรีเมียมมัทฉะคาราเมลโอริโอ้ 52-02-03-0057 1 6 22 40 8 9 23 41 24 133 14:13 22 +พรีเมียมชาไทยคาราเมลโอริโอ้ 52-02-03-0058 1 1 6 10 22 40 23 41 24 133 14:13 22 diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..eec67da2 Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..a6897c4a Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8ec58b6d Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..cb6d7c78 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..589c6fb8 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..0d04e424 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4ecab465 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4aea8004 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8149b0aa Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..9dae84a7 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..f4390602 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..25af310f Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/support_langs b/inter/sgp/support_langs new file mode 100644 index 00000000..16c4bfe8 --- /dev/null +++ b/inter/sgp/support_langs @@ -0,0 +1 @@ +ENG diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev index a79dcdd2..6910325e 100644 --- a/inter/sgp/video/script_thank.ev +++ b/inter/sgp/video/script_thank.ev @@ -11,3 +11,17 @@ If EventTurnOn = 1 Then EndIf +If UsePepsiTheme = 1 Then + + ; expect-wtc + If SaveTheWorldCount = 0 Then + GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 5184722 Then + Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" + EndIf + Else + + EndIf + +EndIf diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index 46691448..f97879c4 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -690,7 +690,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 60 +; menu_new_list 61 ; ==================> Len = 3 ; 52-01-01-0001 - - @@ -23279,6 +23279,281 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 52-21-03-0078.Button,$Sum5221030078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM ESPRESSO\nCARAMEL OREO + + PREMIUM ESPRESSO\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coffee, Milk, Caramel Syrup, Oreo + + Coffee, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-21-03-0078.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-21-03-0078.Button + StringFmt( $52-21-03-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-21-03-0078.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5221030078 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index bf5dbacc..82850d37 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -692,7 +692,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 46 +; menu_new_list 48 ; ==================> Len = 3 ; 52-02-01-0001 52-02-02-0001 52-02-03-0001 @@ -13865,6 +13865,556 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0057.Button,$Sum5202030057) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM GREEN TEA\nCARAMEL OREO + + PREMIUM GREEN TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Matcha, Milk, Caramel Syrup, Oreo + + Matcha, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0057.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0057.Button + StringFmt( $52-02-03-0057.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0057.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030057 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 52-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0058.Button,$Sum5202030058) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM THAI TEA\nCARAMEL OREO + + PREMIUM THAI TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Thai Tea, Milk, Caramel Syrup, Oreo + + Thai Tea, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0058.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0058.Button + StringFmt( $52-02-03-0058.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0058.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030058 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/whatthecup/common/video/wtc_thankyou.mp4 b/inter/whatthecup/common/video/wtc_thankyou.mp4 new file mode 100644 index 00000000..52a5ea4c Binary files /dev/null and b/inter/whatthecup/common/video/wtc_thankyou.mp4 differ diff --git a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml index 487a05a8..9978a123 100644 --- a/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml +++ b/xml/event/weekday_discount/multi_promotion_weekday_discount_event_on.xml @@ -147,6 +147,8 @@ ;TAGESP ; ==================> Len = 12 ; - - 12-99-03-0074 + ; ==================> Len = 12 + ; - - 12-99-03-0074 33 22 @@ -163,8 +165,8 @@ SoundVolume Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -237,7 +239,7 @@ 0x322B26 showthaiText "พรีเมียมเอสเพรสโซ่ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -247,7 +249,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม คาลาเมล และ Oreo" + "กาแฟ นม คาราเมล และโอรีโอ" 16 @@ -414,8 +416,8 @@ CARAMEL OREO" xmlpro( 12-99-03-0075, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -488,7 +490,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมเอสเพรสโซ่ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -498,7 +500,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม คาลาเมล และ Oreo" + "กาแฟ นม คาราเมล และโอรีโอ" 16 @@ -665,9 +667,9 @@ CARAMEL OREO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo" + Var NameDrink = "PREMIUM MATCHA CARAMEL OREO" + Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -740,7 +742,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมมัทฉะ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -750,7 +752,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "มัทฉะ นม คาลาเมล และ Oreo" + "มัทฉะ นม คาราเมล และโอรีโอ" 16 @@ -761,7 +763,7 @@ CARAMEL OREO" KanitMediumTTF 0x322B26 showengText - "PREMIUM GREEN TEA + "PREMIUM MATCHA CARAMEL OREO" @@ -919,8 +921,8 @@ CARAMEL OREO" SoundVolume Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ" Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -993,7 +995,7 @@ CARAMEL OREO" 0x322B26 showthaiText "พรีเมียมชาไทย -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -1003,7 +1005,7 @@ CARAMEL OREO" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย นม คาลาเมล และ Oreo" + "ชาไทย นม คาราเมล และโอรีโอ" 16 @@ -1173,7 +1175,7 @@ CARAMEL OREO" Var NameDrink = "COCONUT MILK SMOOTHIE" Var NameDrinkTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" - Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์" + Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นม" Var DrinkDescription = "Coconut syrup, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -1257,7 +1259,7 @@ CARAMEL OREO" 0x6F5F51 showthaiText "มะพร้าวน้ำหอมปั่น -นมนิวซีแลนด์" +นม" 16 @@ -1933,7 +1935,7 @@ SMOOTHIE" Var NameDrink = "ICED THAI MILK TEA COCONUT" Var NameDrinkTH = "มะพร้าวชาไทย นมนิวซีแลนด์" - Var DrinkDescriptionTH = "มะพร้าว ชาไทย นมนิวซีแลนด์" + Var DrinkDescriptionTH = "มะพร้าว ชาไทย นม" Var DrinkDescription = "Coconut syrup, Thai tea, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2016,7 +2018,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "มะพร้าว ชาไทย นมนิวซีแลนด์" + "มะพร้าว ชาไทย นม" 16 @@ -2420,7 +2422,7 @@ SMOOTHIE" ; - - - - ; ==================> Len = 11 + ; ==================> Len = 12 ; - - 12-99-03-0010 33 @@ -2533,7 +2535,8 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "COCOA STRAW SMOOTHIE" + "COCOA STRAW +SMOOTHIE" 16 @@ -2671,255 +2674,7 @@ SMOOTHIE" center-vertical-horizontal - ; - - posi1 - - 33 - 22 - 225 - 296 - Flag( posi1.Button,$Sumposi1) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "COCOA STRAW SMOOTHIE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "Cocoa, Strawberry syrup, Milk" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "นม น้ำเชื่อมสตอเบอร์รี่ -โกโก้ และน้ำแข็ง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "-" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $posi1.Button - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $posi1.Button - StringFmt( $posi1.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - 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 $Sumposi1 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $posi1.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" - $Sumposi1 - text_unavailable - center-vertical-horizontal - - + ; - - - ; ==================> Len = 12 ; - - 12-99-03-0032 @@ -2939,7 +2694,7 @@ SMOOTHIE" Var NameDrink = "SUPER VOCANO" Var NameDrinkTH = "ซูเปอร์โอริภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้" + Var DrinkDescriptionTH = "นม น้ำตาล โอรีโอ" Var DrinkDescription = "Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_super_oreo_volcano_weekday_discount_event_on.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3021,7 +2776,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้" + "นม น้ำตาล โอรีโอ" 16 diff --git a/xml/event/weekday_discount/promotion_oreo_discount_11.xml b/xml/event/weekday_discount/promotion_oreo_discount_11.xml index 1f13104e..f204e7ae 100644 --- a/xml/event/weekday_discount/promotion_oreo_discount_11.xml +++ b/xml/event/weekday_discount/promotion_oreo_discount_11.xml @@ -98,250 +98,250 @@ ;TAGESP ; ==================> Len = 12 - - 33 - 22 - 225 - 296 - "Enable" - + + 16 + 164 + 24 +220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "น้ำดื่ม" + + + 16 + 220 + 14 +220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำ" + + + 16 + 164 + 22 +220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "DRINKING WATER" + + + 16 + 220 + 14 +220 + KanitMediumTTF + 0x6F5F51 + showengText + "Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize +220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0016.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize +220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0016.Button + StringFmt( $12-05-02-0016.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum1205020016 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0016.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 - EndIf - Var menu_name_eng_hot = $##-##-##-####.NameE - Var menu_desc_eng_hot = $##-##-##-####.descriptionE - Var menu_name_thai_hot = $##-##-##-####.Name - Var menu_desc_thai_hot = $##-##-##-####.description - - Var menu_name_eng_cold = $12-05-02-0016.NameE - Var menu_desc_eng_cold = $12-05-02-0016.descriptionE - Var menu_name_thai_cold = $12-05-02-0016.Name - Var menu_desc_thai_cold = $12-05-02-0016.description - - Var menu_name_eng_blender = $##-##-##-####.NameE - Var menu_desc_eng_blender = $##-##-##-####.descriptionE - Var menu_name_thai_blender = $##-##-##-####.Name - Var menu_desc_thai_blender = $##-##-##-####.description - - DEBUGVAR PD_STAGE_1 - DEBUGVAR PD_STAGE_2 - DEBUGVAR PD_STAGE_3 - Var SelectDrinkType = 0 - - - Open "ROOT/taobin_project/xml/page_topping_select5.xml" - - - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "น้ำดื่ม" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "น้ำ" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "DRINKING WATER" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0016.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0016.Button - StringFmt( $12-05-02-0016.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 - - Var ice_tab_process_show = "Invisible" - 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 $Sum1205020016 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0016.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" - $Sum1205020016 - text_unavailable - center-vertical-horizontal - + 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" + $Sum1205020016 + text_unavailable + center-vertical-horizontal + 33 @@ -606,8 +606,8 @@ SoundVolume Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO" - Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้" - Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo" + Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอรีโอ" + Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ" Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png" Var OpenFromXML = CurrentXMLFileName2 @@ -680,7 +680,7 @@ 0x322B26 showthaiText "พรีเมียมมัทฉะ -คาราเมลโอริโอ้" +คาราเมลโอรีโอ" 16 @@ -690,7 +690,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "มัทฉะ นม คาลาเมล และ Oreo" + "มัทฉะ นม คาราเมล และโอรีโอ" 16 @@ -1331,13 +1331,12 @@ CARAMEL OREO" -; - - 12-01-03-0078 33 22 225 296 - Flag( 12-01-03-0078.Button,$Sum1201030078) + Flag( 12-01-03-0078.Button,Disable=Invisible,$Sum1201030078) + + + eval( + If LangProcess = "LoadConfig" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0x000000 + eval( + If LangProcess = "LoadConfig" Then + Var return = "Loading ..." + Else + Var return = "" + EndIf +) + + diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index fb22898b..15a8e7b2 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -230,27 +230,6 @@ Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" - If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - - EndIf - - Var X_CASH = 216 - - If RoadShow = "true" Then - Var X_CASH = 287 - If show_eng = "true" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png" - Else - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" - EndIf - EndIf If GetFreeFromError = 1 Then Var Seeker.FreeVendingCampaign = 1 @@ -1447,36 +1426,9 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - + +