diff --git a/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml b/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml new file mode 100644 index 00000000..aa3fde4f --- /dev/null +++ b/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml @@ -0,0 +1,134 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + + Var Timeout = 0 + DEBUGVAR TelephoneNumber + DEBUGVAR FromFruityRaya + + Var Cid = 43 + Var param1 = "" + Var param2 = "" + Var param3 = "" + + If FromFruityRaya = 1 Then + + If TelephoneNumber = "" Then + + Else + ; Telephone must not empty + AddData Cid TelephoneNumber param1 param2 param3 + EndIf + + EndIf + + ; reset flag + Var FromFruityRaya = 0 + + ; goto lid straw + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + + + + + 1000 + + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 0 Then + + EndIf + + TimerReset + Refresh + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + ; + + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + +; +; 0 +; 380 +; "ROOT/taobin_project/image/display_get_free/alpha.png" +; + + + 0 + 560 + "Enable" + Var( DirImage + img_popup6 ) + + + + + + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + 99 + 1300 + center + 48 + 0x513C2F + "Please wait for coupon from SMS ... " + + + \ No newline at end of file diff --git a/inter/mys/xml/event/out_put_file4.txt b/inter/mys/xml/event/out_put_file4.txt index 589ba06e..357e5109 100644 --- a/inter/mys/xml/event/out_put_file4.txt +++ b/inter/mys/xml/event/out_put_file4.txt @@ -1 +1 @@ -/event/promotion_fruit_raya.xml \ No newline at end of file +/event/promotion_fruit_raya.lxml \ No newline at end of file diff --git a/inter/mys/xml/event/promotion_fruit_raya.xml b/inter/mys/xml/event/promotion_fruit_raya.lxml similarity index 99% rename from inter/mys/xml/event/promotion_fruit_raya.xml rename to inter/mys/xml/event/promotion_fruit_raya.lxml index 7032526c..79fb55b0 100644 --- a/inter/mys/xml/event/promotion_fruit_raya.xml +++ b/inter/mys/xml/event/promotion_fruit_raya.lxml @@ -12571,7 +12571,7 @@ - Open "ROOT/taobin_project/inter/mys/xml/page_catalog_fruity_raya.xml" + Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_fruity_raya.lxml" diff --git a/inter/mys/xml/event/promotion_onclick4.inc b/inter/mys/xml/event/promotion_onclick4.inc index 1918f058..f23387db 100644 --- a/inter/mys/xml/event/promotion_onclick4.inc +++ b/inter/mys/xml/event/promotion_onclick4.inc @@ -1 +1 @@ - Open "ROOT/taobin_project/inter/mys/xml/page_catalog_fruity_raya.xml" \ No newline at end of file + Open "ROOT/taobin_project/inter/mys/xml/page_catalog_fruity_raya.lxml" \ No newline at end of file diff --git a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev index 92e54231..239dbdda 100644 --- a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev +++ b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev @@ -2,25 +2,25 @@ ; zone promote +DEBUGVAR FruityRayaEnable + If OpenFromPageBoard = 1 Then - If Propepsi99Enable = 1 Then - + If FruityRayaEnable = 1 Then Var BigButtonEnable = "Enable" - OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_pepsi_099.lxml" + OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_fruit_raya.lxml" Var OpenFromPageBoard = 0 - Else - OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" - + OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" EndIf Else - If Propepsi99Enable = 1 Then + If FruityRayaEnable = 1 Then Var BigButtonEnable = "Enable" - Open "ROOT/taobin_project/inter/mys/xml/event/promotion_pepsi_099.lxml" + OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_fruit_raya.lxml" + Var OpenFromPageBoard = 0 Else - Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" + OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" EndIf EndIf Var OpenFromPageBoard = 0 diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index 1b08b367..0514019b 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -22,3 +22,6 @@ If SystemDateMonthInt = 4 Then Var FruityRayaEnable = 1 EndIf +If BoxID = 177746 Then + Var FruityRayaEnable = 1 +EndIf \ No newline at end of file diff --git a/inter/mys/xml/page_catalog_group_fruity_raya.lxml b/inter/mys/xml/page_catalog_group_fruity_raya.lxml index f6fd4c9f..db22ed35 100644 --- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml +++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml @@ -1,613 +1,613 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - Var FromFruityRaya = 0 - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - Refresh - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 400 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + Var FromFruityRaya = 0 + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + 0x6F5F51 + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -718,6 +718,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -980,6 +981,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1246,6 +1248,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1512,6 +1515,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1774,7 +1778,8 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 - + Var FromFruityRaya = 1 + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2040,6 +2045,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2306,7 +2312,8 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 - + Var FromFruityRaya = 1 + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2568,6 +2575,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2834,6 +2842,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromFruityRaya = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3012,9 +3021,9 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/inter/mys/xml/page_topping_select6.lxml b/inter/mys/xml/page_topping_select6.lxml index a35680d9..52ac038a 100644 --- a/inter/mys/xml/page_topping_select6.lxml +++ b/inter/mys/xml/page_topping_select6.lxml @@ -519,6 +519,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var FromFruityRaya = 0 + ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index b75c3eed..bd452c5b 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -114,6 +114,8 @@ DEBUGVAR FromBadValentinePro DEBUGVAR LipitPro DEBUGVAR FromLipitPro + DEBUGVAR FruityRayaEnable + DEBUGVAR FromFruityRaya If Seeker.TNumberTaobinCredit = "" Then @@ -158,6 +160,15 @@ EndIf EndIf + DEBUGVAR FruityRayaEnable + DEBUGVAR FromFruityRaya + If FruityRayaEnable = 1 Then + If FromFruityRaya = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml" + EndIf + + EndIf + If PepweenEnable = 1 Then If PepweenCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 @@ -226,6 +237,15 @@ EndIf EndIf + DEBUGVAR FruityRayaEnable + DEBUGVAR FromFruityRaya + If FruityRayaEnable = 1 Then + If FromFruityRaya = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml" + EndIf + + EndIf + If ProBadValentineEnable = 1 Then If FromBadValentinePro = 1 Then GETACCEXT TelephoneNumber 32 @@ -723,6 +743,15 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP + DEBUGVAR FruityRayaEnable + DEBUGVAR FromFruityRaya + If FruityRayaEnable = 1 Then + If FromFruityRaya = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml" + EndIf + + EndIf + If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 @@ -801,9 +830,29 @@ 236 699 + eval( + If FromFruityRaya = 1 Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) Var( DirImage + "/text_2.png") + + 236 + 699 + eval( + If FromFruityRaya = 1 Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + Var( DirImage + "/edit.png") + + ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index 4beee371..689c7d40 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -1385,6 +1385,8 @@ If EnoughChange = "yes" Then + CoinVending ON + Var alphaState2 = "Enable" If RoadShow = "true" Then @@ -2288,5 +2290,15 @@ EndIf + + +Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" +Var MachineStage = "make-drink" +Var BrewingTextThai = "เตรียมแก้ว" +MakeDrinkV1 SelectDrink SelectSugarID +Open "ROOT/taobin_project/xml/page_thankyou.xml" + + +