From d24f316a2815e5064f7adcca808549a5f4ece71a Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 28 Apr 2023 14:55:10 +0700 Subject: [PATCH] 7.16 fix songgran --- xml/eventopen_menu.ev | 1 - xml/menu_catalog_new.xml | 23 +- xml/page_board.xml | 9 + xml/page_catalog2.xml | 19 +- xml/page_catalog_group_appfast.xml | 23 +- xml/page_catalog_group_cocktail.xml | 23 +- xml/page_catalog_group_coffee.xml | 23 +- xml/page_catalog_group_forkid.xml | 23 +- xml/page_catalog_group_health.xml | 23 +- xml/page_catalog_group_milk.skt | 4 +- xml/page_catalog_group_milk.xml | 57 ++--- xml/page_catalog_group_oreo.xml | 23 +- xml/page_catalog_group_other.xml | 23 +- xml/page_catalog_group_recommend.xml | 309 ++------------------------ xml/page_catalog_group_recommend3.xml | 273 +---------------------- xml/page_catalog_group_songkran.xml | 23 +- xml/page_catalog_group_tea.xml | 23 +- xml/page_catalog_group_whey.xml | 23 +- xml/page_payment.xml | 6 +- 19 files changed, 91 insertions(+), 840 deletions(-) delete mode 100644 xml/eventopen_menu.ev diff --git a/xml/eventopen_menu.ev b/xml/eventopen_menu.ev deleted file mode 100644 index 09c0ba96..00000000 --- a/xml/eventopen_menu.ev +++ /dev/null @@ -1 +0,0 @@ - diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index e91a6734..7aa8299a 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -101,21 +101,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -197,12 +182,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_board.xml b/xml/page_board.xml index b2caa956..aacca50e 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -679,6 +679,15 @@ Var SongkranEnable = 1 EndIf EndIf + + If SystemDateMonthInt = 5 Then + If SystemDateDayInt = 1 Then + Var SongkranEnable = 1 + EndIf + If SystemDateDayInt = 2 Then + Var SongkranEnable = 1 + EndIf + EndIf If SongkranEnable = 1 Then diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 3ffec5dc..a77bf538 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -203,7 +203,7 @@ RebootWithCause "BoxID was zero" EndIf - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/backToSchool.ev" @@ -365,12 +365,8 @@ ; zone promote - - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + @@ -601,7 +597,7 @@ Var CheckCupStateDoorCupClose = "reset" Var buttonRemoveCup = "Invisible" - + @@ -653,5 +649,12 @@ Var SongkranEnable = 1 + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_backToSchool.xml" + + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_oreo_buy2_save_more.xml" + + diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 3d07d946..19b3fbe9 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -249,21 +249,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -345,12 +330,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index a3a0b278..d4e8d641 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -241,21 +241,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -337,12 +322,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index c6169b6b..07c256ca 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -241,21 +241,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -337,12 +322,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 1288f1df..0c7001d5 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -250,21 +250,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -346,12 +331,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index f8509d47..21cef35a 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -241,21 +241,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -337,12 +322,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_milk.skt b/xml/page_catalog_group_milk.skt index 956e94f0..f0a9ce20 100644 --- a/xml/page_catalog_group_milk.skt +++ b/xml/page_catalog_group_milk.skt @@ -43,5 +43,7 @@ ?> - + diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 2ec6bf98..f3ed8dba 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -239,21 +239,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -335,12 +320,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" @@ -3304,15 +3285,15 @@ VOLCANO" ; - - - ; ==================> Len = 16 - ; - - 12-03-03-0009 + ; - - 12-03-03-0032 33 22 225 296 - Flag( 12-03-03-0009.Button,$Sum1203030009) + Flag( 12-03-03-0032.Button,$Sum1203030032) diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 7e8e73e2..ea7fd324 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -240,21 +240,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -336,12 +321,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 8a96f4b8..058e3ec8 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -258,21 +258,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -354,12 +339,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" @@ -593,18 +574,18 @@ ;dummy_layout.inc -; menu_new_list 31 +; menu_new_list 30 ;TAGESP ; ==================> Len = 16 - ; - - 12-03-03-0009 + ; - - 12-03-03-0032 33 22 225 296 - Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009) + Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอริโอ้ปั่นภูเขาไฟ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "นม น้ำตาล โอริโอ้ - " - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "OREO SMOOTHIE -VOLCANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Sugar, Oreo" - - - 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" ) - $12-03-03-0009-alter.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0009-alter.Button - StringFmt( $12-03-03-0009-alter.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 $Sum1203030009alter = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0009-alter.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" - $Sum1203030009alter - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 16 ; - - 12-03-03-0009 33 diff --git a/xml/page_catalog_group_recommend3.xml b/xml/page_catalog_group_recommend3.xml index 453b7bf9..7244110f 100644 --- a/xml/page_catalog_group_recommend3.xml +++ b/xml/page_catalog_group_recommend3.xml @@ -258,21 +258,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -354,12 +339,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" @@ -1826,256 +1807,6 @@ VOLCANO" ; menu_new_li;TAGESP - ; ==================> Len = 16 - ; - - 12-03-03-0009-alter - - 33 - 22 - 225 - 296 - Flag( 12-03-03-0009-alter.Button,Disable=Invisible,$Sum1203030009alter) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอริโอ้ปั่นภูเขาไฟ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "นม น้ำตาล โอริโอ้ - " - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "OREO SMOOTHIE -VOLCANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Sugar, Oreo" - - - 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" ) - $12-03-03-0009-alter.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0009-alter.Button - StringFmt( $12-03-03-0009-alter.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 $Sum1203030009alter = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0009-alter.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" - $Sum1203030009alter - text_unavailable - center-vertical-horizontal - - - ; - - - ; ==================> Len = 16 ; - - 12-03-03-0009 diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index 58201c35..331a8768 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -237,21 +237,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -333,12 +318,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 2655418c..48b9e0c0 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -241,21 +241,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -337,12 +322,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 3d6e3249..762bc94f 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -246,21 +246,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - ; under line 0 @@ -342,12 +327,8 @@ SAVELOG "Click rec" Var NextPage = "-" - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 81eccd6c..c30cc4f5 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -10,7 +10,7 @@ Var IndoQR = 0 - + Var GetPayInfoFlag = 0 Var SessionID2 = "" @@ -243,6 +243,10 @@ If UserSelectProductCode = "12-05-02-0056" Then Var PromotionIDCurrentOrder = 3 EndIf + + If SystemDateMonthInt = 5 Then + Var PromotionIDCurrentOrder = 0 + EndIf EndIf DEBUGVAR PromotionIDCurrentOrder