diff --git a/image/drink_option/normal.png b/image/drink_option/normal.png new file mode 100644 index 00000000..1cd02664 Binary files /dev/null and b/image/drink_option/normal.png differ diff --git a/image/drink_option_en/normal.png b/image/drink_option_en/normal.png new file mode 100644 index 00000000..82a1b3be Binary files /dev/null and b/image/drink_option_en/normal.png differ diff --git a/image/event/my_mint_my_moment/pro_mymint_en.mp4 b/image/event/my_mint_my_moment/pro_mymint_en.mp4 new file mode 100644 index 00000000..99ff8d0c Binary files /dev/null and b/image/event/my_mint_my_moment/pro_mymint_en.mp4 differ diff --git a/image/event/my_mint_my_moment/pro_mymint_th.mp4 b/image/event/my_mint_my_moment/pro_mymint_th.mp4 old mode 100755 new mode 100644 index 34ffb413..91b15620 Binary files a/image/event/my_mint_my_moment/pro_mymint_th.mp4 and b/image/event/my_mint_my_moment/pro_mymint_th.mp4 differ diff --git a/image/page_doing/txt_34_en.png b/image/page_doing/txt_34_en.png index 72c3f734..bf16b819 100644 Binary files a/image/page_doing/txt_34_en.png and b/image/page_doing/txt_34_en.png differ diff --git a/image/topping2/bt_normal_no.png b/image/topping2/bt_normal_no.png new file mode 100644 index 00000000..422cd3fb Binary files /dev/null and b/image/topping2/bt_normal_no.png differ diff --git a/image/topping2/bt_normal_selected_no.png b/image/topping2/bt_normal_selected_no.png new file mode 100644 index 00000000..33e50a22 Binary files /dev/null and b/image/topping2/bt_normal_selected_no.png differ diff --git a/image/topping2_en/bt_normal_no.png b/image/topping2_en/bt_normal_no.png new file mode 100644 index 00000000..0dbb6122 Binary files /dev/null and b/image/topping2_en/bt_normal_no.png differ diff --git a/image/topping2_en/bt_normal_selected_no.png b/image/topping2_en/bt_normal_selected_no.png new file mode 100644 index 00000000..9e4e4dd1 Binary files /dev/null and b/image/topping2_en/bt_normal_selected_no.png differ diff --git a/inter/aus/image/page_doing/txt_34_en.png b/inter/aus/image/page_doing/txt_34_en.png index 72c3f734..bf16b819 100644 Binary files a/inter/aus/image/page_doing/txt_34_en.png and b/inter/aus/image/page_doing/txt_34_en.png differ diff --git a/inter/aus/menu/lang.tsv b/inter/aus/menu/lang.tsv index aaf87bfe..313bc64d 100644 --- a/inter/aus/menu/lang.tsv +++ b/inter/aus/menu/lang.tsv @@ -108,7 +108,8 @@ TextID Note English Thai 000081 Hot ร้อน 000082 Iced เย็น 000083 Blend ปั่น - + Font=Kanit,Type=Regular,Size=24,Color=0x513C2F +000084 Normal ปกติ diff --git a/inter/aus/xml/menu_new_layout_gen_v2.py b/inter/aus/xml/menu_new_layout_gen_v2.py index 12ab43f3..73c051a9 100644 --- a/inter/aus/xml/menu_new_layout_gen_v2.py +++ b/inter/aus/xml/menu_new_layout_gen_v2.py @@ -296,8 +296,12 @@ out_xml( '\t\r\n') out_xml( '\t 81 \r\n') out_xml( '\t 264 \r\n') - out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n') - out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') + if pd_code_2 == "51-05-02-0016": + out_xml( '\t Var( DirImage2 + "normal.png" ) \r\n') + out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') + else: + out_xml( '\t Var( DirImage2 + "cold.png" ) \r\n') + out_xml( '\t Var( DirImage2 + "cold_db.png" ) \r\n') out_xml( '\t ' + shw + ' \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index 828dac06..7b71050f 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -12068,7 +12068,7 @@ 81 264 - Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "normal.png" ) Var( DirImage2 + "cold_db.png" ) $51-05-02-0016.Button diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv index 8b8ba827..1b597425 100644 --- a/inter/mys/menu/lang.tsv +++ b/inter/mys/menu/lang.tsv @@ -107,8 +107,8 @@ TextID Note English Thai China Japan Malaysia 000081 Hot ร้อน Hot 000082 Iced เย็น Iced 000083 Blend ปั่น Blend - - + Font=Kanit,Type=Regular,Size=24,Color=0x513C2F Font=Kanit,Type=Regular,Size=24,Color=0x513C2F +000084 Normal ปกติ Normal diff --git a/inter/mys/xml/event/promotion_2.xml b/inter/mys/xml/event/promotion_2.xml index 9ffc1d1c..806c877e 100644 --- a/inter/mys/xml/event/promotion_2.xml +++ b/inter/mys/xml/event/promotion_2.xml @@ -11448,15 +11448,15 @@ ; ==================> Len = 3 - ; - 12-05-02-0062 - + ; - 12-05-02-0062 12-05-03-0062 33 22 225 296 - Flag( 12-05-02-0062.Button,Disable=Invisible,$Sum1205020062) + Flag( 12-05-02-0062.Button,12-05-03-0062.Button,Disable=Invisible,$Sum12050200621205030062) diff --git a/xml/event/promotion_pepween.xml b/xml/event/promotion_pepween.xml index 1d422dac..9980b5af 100644 --- a/xml/event/promotion_pepween.xml +++ b/xml/event/promotion_pepween.xml @@ -7924,7 +7924,7 @@ AMERICANO" SoundVolume Var NameDrink = "JASMINE MILK TEA" - Var NameDrinkTH = "ชามะลิลาเต้" + Var NameDrinkTH = "ชานมมะลิ" Var DrinkDescriptionTH = "ชามะลิ และนม" Var DrinkDescription = "Jasmine & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png" @@ -7995,7 +7995,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "ชามะลิลาเต้" + "ชานมมะลิ" 16 diff --git a/xml/event/promotion_template1.inc b/xml/event/promotion_template1.inc index 79fc89d9..2ab02725 100644 --- a/xml/event/promotion_template1.inc +++ b/xml/event/promotion_template1.inc @@ -71,7 +71,7 @@ ) "true" - "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" + "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 6ab1e1eb..56b73b44 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -217,6 +217,11 @@ Var AddData = 0 EndIf + If MyMintEnable = 1 Then + If FromMyMintPro = 1 Then + Var AddData = 0 + EndIf + EndIf If GetFreeFromError = 1 Then ;Var GetFreeFromError = 0 diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index f2229eb5..53c93720 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -128,6 +128,12 @@ Var AddData = 0 EndIf + If MyMintEnable = 1 Then + If FromMyMintPro = 1 Then + Var AddData = 0 + EndIf + EndIf + If LedLidBlink = "true" Then Var LedLidBlink = "no" LED LedDoorLid Blink 255 255 255 255 diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 793a6880..4f8cc3dd 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -792,503 +792,6 @@ ; - - - - ; ==================> Len = 11 - ; 12-05-02-0062 12-05-03-0062 - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0062.Button,12-05-03-0062.Button,.Button,$Sum12050200621205030062) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "PEPSI MAX" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-05-02-0062.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0062.Button - StringFmt( $12-05-02-0062.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-03-0062.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-03-0062.Button - StringFmt( $12-05-03-0062.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 $Sum12050200621205030062 = "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 $Sum12050200621205030062 = "Disable" Then - STRCONTAIN "ERR" $12-05-02-0062.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-03-0062.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" - $Sum12050200621205030062 - text_unavailable - center-vertical-horizontal - - - ; posi1 - - 33 - 22 - 225 - 296 - Flag( .Button,.Button,posi1.Button,$Sumposi1) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "PEPSI MAX" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "" - - - 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 = 17 ; - 12-05-02-0035 12-05-03-0035 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index e3908543..b791bc66 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -6942,7 +6942,7 @@ AMERICANO" SoundVolume Var NameDrink = "JASMINE MILK TEA" - Var NameDrinkTH = "ชามะลิลาเต้" + Var NameDrinkTH = "ชานมมะลิ" Var DrinkDescriptionTH = "ชามะลิ และนม" Var DrinkDescription = "Jasmine & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png" @@ -7013,7 +7013,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "ชามะลิลาเต้" + "ชานมมะลิ" 16 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 10f5438b..83bbd97e 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -5358,7 +5358,7 @@ LIMENADE" SoundVolume Var NameDrink = "JASMINE MILK TEA" - Var NameDrinkTH = "ชามะลิลาเต้" + Var NameDrinkTH = "ชานมมะลิ" Var DrinkDescriptionTH = "ชามะลิ และนม" Var DrinkDescription = "Jasmine Tea & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_milk_tea.png" @@ -5429,7 +5429,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชามะลิลาเต้" + "ชานมมะลิ" 16 diff --git a/xml/page_topping_select6.lxml b/xml/page_topping_select6.lxml index 0e178806..41b0d1bd 100644 --- a/xml/page_topping_select6.lxml +++ b/xml/page_topping_select6.lxml @@ -211,6 +211,7 @@ Var hot_button_state = PD_STAGE_1 Var cold_button_state = PD_STAGE_2 Var blend_button_state = PD_STAGE_3 + Var normal_button_state = "Invisible" ; Protect have product-code but menu disable or invalid. If hot_button_state = "Invisible" Then @@ -624,6 +625,10 @@ DEBUGVAR SubMenuGroupIDSlot6_1 + If PD_CODE2 = "12-05-02-0016" Then + Var cold_button_state = "Invisible" + Var normal_button_state = "PressForever" + EndIf ; i f Hot menu disable away If hot_button_state = "PressForever" Then @@ -1557,6 +1562,61 @@ + +