diff --git a/adv/sync_1.file b/adv/sync_1.file index 4718c3fa..9da161e5 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 252288 --rw-rw---- 1 root sdcard_rw 0 2021-03-18 16:21 sync_1.file +total 252284 +-rw-rw---- 1 root sdcard_rw 0 2024-10-17 09:24 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4 diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index d1244856..6f2dd44f 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -1184,3 +1184,25 @@ Strawberry americano 7up soda 12-21-02-0083 1 18 2 3 4 5 13 24 133 11:13 22 Caramel milk 7up smoothie 12-03-03-0082 1 18 22 6 23 41 24 133 12:13 22 Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 133 13:13 22 24 133 14:13 22 + +พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 12-01-03-0078 1 2 3 4 5 22 40 41 24 133 14:13 22 +พรีเมียมมัทฉะคาราเมลโอริโอ้ 12-02-03-0057 1 6 22 40 8 9 23 41 24 133 14:13 22 +พรีเมียมชาไทยคาราเมลโอริโอ้ 12-02-03-0058 1 1 6 10 22 40 23 41 24 133 14:13 22 +พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 12-99-03-0078 1 2 3 4 5 22 40 41 24 133 14:13 22 +พรีเมียมมัทฉะคาราเมลโอริโอ้ 12-99-03-0057 1 6 22 40 8 9 23 41 24 133 14:13 22 +พรีเมียมชาไทยคาราเมลโอริโอ้ 12-99-03-0058 1 1 6 10 22 40 23 41 24 133 14:13 22 + +ซูเปอร์โกโก้เข้ม คูณ 3 12-03-03-0067 1 15 6 7 23 41 24 133 14:13 22 +ซูเปอร์โกโก้เข้ม คูณ 2 12-03-03-0065 1 15 6 7 23 41 24 133 14:13 22 +อเมริกาโน่โซดา 12-21-02-0041 1 2 3 4 5 23 16 13 24 133 14:13 22 + +มะพร้าวน้ำหอมปั่นนมนิวซีแลนด์ 12-99-03-0058 1 7 62 23 41 24 133 14:13 22 +นมสตอเบอร์รี่ปั่น 12-99-03-0011 1 1 17 19 23 41 24 133 14:13 22 +มะพร้าวโกโก้ปั่นนมนิวซีแลนด์ 12-99-03-0059 1 7 15 62 23 41 24 133 14:13 22 +มะพร้าวชาไทยนมนิวซีแลนด์ 12-99-03-0062 1 10 7 62 23 41 24 133 14:13 22 +คาราเมลโกโก้ปั่น 12-99-03-0004 1 15 22 17 23 41 24 133 14:13 22 +โกโก้สตอเบอร์รี่ปั่น 12-99-03-0010 1 15 17 19 23 41 24 133 14:13 22 +ซูเปอร์โอริภูเขาไฟ 12-99-03-0032 1 17 23 40 41 24 133 14:13 22 +ซูเปอร์โกโก้เข้ม คูณ 3 12-99-03-0067 1 15 6 7 23 41 24 133 14:13 22 +ซูเปอร์โกโก้เข้ม คูณ 2 12-99-03-0065 1 15 6 7 23 41 24 133 14:13 22 +อเมริกาโน่โซดา 12-99-02-0041 1 2 3 4 5 23 16 13 24 133 14:13 22 diff --git a/image/event/halloween/thank_you.png b/image/event/halloween/thank_you.png deleted file mode 100644 index b89009bc..00000000 Binary files a/image/event/halloween/thank_you.png and /dev/null differ diff --git a/image/event/halloween/thank_you_en.png b/image/event/halloween/thank_you_en.png new file mode 100644 index 00000000..b6040eee Binary files /dev/null and b/image/event/halloween/thank_you_en.png differ diff --git a/image/event/halloween/thank_you_th.png b/image/event/halloween/thank_you_th.png new file mode 100644 index 00000000..d5c0d563 Binary files /dev/null and b/image/event/halloween/thank_you_th.png differ diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv index 95d67801..eb75a8e5 100644 --- a/inter/aus/animation01/play_list.tsv +++ b/inter/aus/animation01/play_list.tsv @@ -936,3 +936,7 @@ Combination 51-99-05-0024 1 27 28 24 120 17:00 23 Ume Ume 51-99-05-0025 1 27 28 24 120 17:00 23 Like Sex\non The Beach 51-99-05-0026 1 27 28 24 120 17:00 23 Plum Highball 51-99-05-0027 1 27 28 24 120 17:00 23 + +Hot VANILLA latte 51-21-81-0060 1 2 3 4 5 63 6 70 24 120 17:00 23 +Iced VANILLA latte 51-21-82-0060 1 2 3 4 5 63 6 70 23 24 120 17:00 23 +VANILLA latte frappe 51-21-83-0060 1 2 3 4 5 63 6 70 41 24 120 17:00 23 diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png new file mode 100644 index 00000000..31191847 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png new file mode 100644 index 00000000..267fdb03 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png new file mode 100644 index 00000000..8b537ae3 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png new file mode 100644 index 00000000..9c38ccac Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png new file mode 100644 index 00000000..56fc0a7a Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png new file mode 100644 index 00000000..498dcf78 Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index 79dd72e8..bd5932ee 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -1953,7 +1953,7 @@ Var PD_CODE2 = "51-05-02-0132" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "TURTLE ENERGY\nTOKYO BANANA SODA" + Var aliasName[0] = "TURTLE ENERGY\nTOKYO SODA" Var aliasDesc[0] = "Energy drink, Tokyo Banana Syrup, Soda, Ice" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -1977,7 +1977,7 @@ Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "TURTLE ENERGY TOKYO BANANA SODA" + Var NameLang[1][0] = "TURTLE ENERGY TOKYO SODA" Var NameLang[1][1] = "-" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -2048,9 +2048,9 @@ KanitMediumTTF 0x322B26 - TURTLE ENERGY\nTOKYO BANANA SODA + TURTLE ENERGY\nTOKYO SODA - TURTLE ENERGY\nTOKYO BANANA SODA + TURTLE ENERGY\nTOKYO SODA diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml index b855ae4c..5c704b13 100644 --- a/inter/aus/xml/page_catalog_group_tea.lxml +++ b/inter/aus/xml/page_catalog_group_tea.lxml @@ -12357,13 +12357,13 @@ Flag( 51-02-02-0076.Button,$Sum5102020076) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, 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-01-03-0078.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-03-0078.Button + StringFmt( $12-01-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 $Sum1201030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-01-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201030078 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0057.Button,Disable=Invisible,$Sum1202030057) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมมัทฉะคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM GREEN TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha, Milk, Caramel Syrup, 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-02-03-0057.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0057.Button + StringFmt( $12-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 $Sum1202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030057 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0058.Button,Disable=Invisible,$Sum1202030058) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมชาไทยคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM THAI TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "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" ) + + + 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-02-03-0058.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0058.Button + StringFmt( $12-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 $Sum1202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030058 + text_unavailable + center-vertical-horizontal + + + ; - - - ; ==================> Len = 12 ; - - 12-05-03-0092 diff --git a/xml/menutab/event/promotion_energy_drink_1_bath.xml b/xml/menutab/event/promotion_energy_drink_1_bath.xml index 45f4008f..cd11a96c 100644 --- a/xml/menutab/event/promotion_energy_drink_1_bath.xml +++ b/xml/menutab/event/promotion_energy_drink_1_bath.xml @@ -1892,6 +1892,765 @@ ; menu_new_li;TAGESP + ; ==================> Len = 12 + ; - - 12-01-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-01-03-0078.Button,Disable=Invisible,$Sum1201030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-01-03-0078.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-03-0078.Button + Var( "฿" + $12-01-03-0078.Price ) + + + 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 $Sum1201030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-01-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201030078 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0057.Button,Disable=Invisible,$Sum1202030057) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมมัทฉะคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM GREEN TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0057.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0057.Button + Var( "฿" + $12-02-03-0057.Price ) + + + 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 $Sum1202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030057 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0058.Button,Disable=Invisible,$Sum1202030058) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมชาไทยคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM THAI TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Thai Tea, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0058.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0058.Button + Var( "฿" + $12-02-03-0058.Price ) + + + 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 $Sum1202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030058 + text_unavailable + center-vertical-horizontal + + + ; - - - ; ==================> Len = 12 ; - - 12-05-03-0092 diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 64ca6ba0..b0dde760 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -655,7 +655,7 @@ ;dummy_layout.inc -; menu_new_list 51 +; menu_new_list 54 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -916,6 +916,765 @@ ; - - - ;TAGESP ; ==================> Len = 12 + ; - - 12-01-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-01-03-0078.Button,Disable=Invisible,$Sum1201030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-01-03-0078.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-03-0078.Button + Var( "฿" + $12-01-03-0078.Price ) + + + 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 $Sum1201030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-01-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201030078 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0057.Button,Disable=Invisible,$Sum1202030057) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมมัทฉะคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM GREEN TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0057.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0057.Button + Var( "฿" + $12-02-03-0057.Price ) + + + 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 $Sum1202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030057 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0058.Button,Disable=Invisible,$Sum1202030058) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมชาไทยคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM THAI TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Thai Tea, Milk, Caramel Syrup, Oreo" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0058.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0058.Button + Var( "฿" + $12-02-03-0058.Price ) + + + 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 $Sum1202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030058 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 ; - - 12-05-03-0092 33 diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index cd8776a8..06dc0e45 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -258,6 +258,13 @@ Var EnableTopupCreditBetweenBrew = "Invisible" EndIf + If ModeFreeEnable = 1 Then + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + + If SELLSTATUS = "DEACTIVE" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" @@ -501,7 +508,8 @@ EndIf - + + __CMD "SetErrorCodeHandleByXML" 1028 "-" "-" diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index 647ee1d4..6e71993e 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -354,6 +354,35 @@ Var PayO2 = Seeker.CoffeePinNumber EndIf + ; Reject by app close order + ; XML must send pay detail by myself. + SAVELOG " Cannot conti with new payment" + + If NextOrderStatus = "Disable" Then + Var PayDetail="1/F:1221/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + Else + DEBUGVAR error_code_stop_now + + If error_code_stop_now > 0 Then + Var PayDetail = "1/F:" + error_code_stop_now + Var PayDetail = PayDetail + "/0/" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + Else + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "" + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + EndIf + EndIf + + Var ServiceType = "coffee-refund" Var ServiceCredit = SelectDrink Var SuggestID = "" diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index dc823759..db8ea507 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -94,7 +94,7 @@ ;dummy_layout.inc -; menu_new_list 51 +; menu_new_list 54 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -353,6 +353,759 @@ ; - - - ;TAGESP ; ==================> Len = 12 + ; - - 12-01-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-01-03-0078.Button,Disable=Invisible,$Sum1201030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่คาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM ESPRESSO CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Coffee, Milk, Caramel Syrup, 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-01-03-0078.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-03-0078.Button + StringFmt( $12-01-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 $Sum1201030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-01-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201030078 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0057.Button,Disable=Invisible,$Sum1202030057) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมมัทฉะคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "มัทฉะ นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM GREEN TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Matcha, Milk, Caramel Syrup, 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-02-03-0057.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0057.Button + StringFmt( $12-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 $Sum1202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030057 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - - 12-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 12-02-03-0058.Button,Disable=Invisible,$Sum1202030058) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมชาไทยคาราเมลโอริโอ้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย นม คาลาเมล และ Oreo" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PREMIUM THAI TEA CARAMEL OREO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "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" ) + + + 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-02-03-0058.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0058.Button + StringFmt( $12-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 $Sum1202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-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 + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202030058 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 ; - - 12-05-03-0092 33 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 7b8188f0..9f34937d 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -27,6 +27,7 @@ ;Var PriceDrink = 2 Var DiscountDrink = 0 + Var DiscountCampaignCode = "" Var SelectSlot = "1" SAVELOG BoxID @@ -293,6 +294,12 @@ Var Seeker.CodeChannel = 1 Var Seeker.CodeNumber = IDNum + SAVELOG "ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable" + If New_Payment = 1 Then + Var Seeker.ORDER_ID = "" + GenHashWithTimeStamp Seeker.ORDER_ID + __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID + EndIf Open "ROOT/taobin_project/xml/page_payment_cash.xml" @@ -326,6 +333,7 @@ Var param1 = Seeker.ORDER_ID Var param2 = Seeker.NameDrinkEN + Var param3 = DiscountCampaignCode STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet If SizeFromSheet = "true" Then @@ -337,7 +345,7 @@ Var WaitPOSStatus = 1 Var TimeWaitPOSStatus = 0 Var POS_SELL_STATUS = "-" - GetPOSStatus param1 param2 + GetPOSStatus param1 param2 param3 EndIf EndIf diff --git a/xml/process/discount_from_promotion.ev b/xml/process/discount_from_promotion.ev index 6b777fab..96cbe6ca 100644 --- a/xml/process/discount_from_promotion.ev +++ b/xml/process/discount_from_promotion.ev @@ -24,6 +24,7 @@ If BoxID = 105005 Then Var PriceDiff = PriceDrink - 25 Var DiscountDrink = PriceDiff Var Seeker.CampaignPPrice = 25 + Var DiscountCampaignCode = "SVB0002" Var PriceDrink = PriceDrink - PriceDiff EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index c7a1ff3e..32d2dc20 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.06" - Var XMLPageVersionInt = 906 + Var XMLPageVersion = "9.07" + Var XMLPageVersionInt = 907 ;Oreo Var OreoGuarantee = 0 diff --git a/xml_main/startup.xml_561 b/xml_main/startup.xml_561 deleted file mode 100644 index b5939f6e..00000000 --- a/xml_main/startup.xml_561 +++ /dev/null @@ -1,154 +0,0 @@ -28 -255 - "ROOT/ui/bg_main_menu2.png" - - - 1024 - 600 - "/ROOT/pictures/startup.bmp" - 3000 - - Open "/ROOT/xml/main.xml" - - - Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4" - Var video_menu_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00.mp4" - Var video_menu_1 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_00.mp4" - Var MenuLangTH = 1 - Var VendingCampaign = 0 - Var VendingDiscount = 0 - Var VendingClass = "" - TopView "hide" - Var NetworkStatus = "DOWN" - Var MachineErrorDetail = "" - Var SetVideo = 1 - Var AdvSoundWorking = "" - Var AdvSoundWorking = "/ROOT/sounds/adv_working_01.wav" - Var AdvIndex = 1 - Var SetSoundPlay = 0 - Var CheckAutoZero = 0.0 - Var DeffZero = 0.0 - Var CountZero = 0 - Var AdvWorking = "" - Var AdvCoin = "" - Var AdvAmount = "" - Var AdvMobile = "" - Var AdvId = "00" - ;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00" - Var AdvertiseProfile1 = "00" - Var AdvertiseProfile2 = "00" - Var AdvertiseProfile3 = "00" - Var AdvertiseProfile4 = "00" - Var AdvertiseProfile5 = "00" - Var AdvertiseProfile6 = "00" - Var AdvertiseProfile7 = "00" - Var AdvertiseProfile8 = "00" - Var AdvertiseProfile9 = "00" - Var AdvertiseProfile10 = "00" - Var AdvertiseProfile11 = "00" - Var AdvertiseProfile12 = "00" - Var AdvertiseProfile13 = "00" - Var AdvertiseProfile14 = "00" - Var AdvertiseProfile15 = "00" - Var AdvertiseProfile16 = "00" - Var AdvertiseProfile17 = "00" - Var AdvertiseProfile18 = "00" - - Var ExtSlot1 = "" - Var ExtSlot2 = "" - Var ExtSlot3 = "" - Var ExtSlot4 = "" - Var ExtSlot5 = "" - Var ExtSlot6 = "" - - Var AdvExt1 = ".mp4" - Var AdvExt2 = ".mp4" - Var AdvExt3 = ".mp4" - Var AdvExt4 = ".bmp" - Var AdvExt5 = ".bmp" - Var AdvExt6 = ".bmp" - Var AdvExt7 = ".mp4" - Var AdvExt8 = ".mp4" - Var AdvExt9 = ".bmp" - Var AdvExt10 = ".bmp" - Var AdvExt11 = ".mp4" - Var AdvExt12 = ".bmp" - Var AdvExt13 = ".bmp" - Var AdvExt14 = ".bmp" - Var AdvExt15 = ".bmp" - Var AdvExt16 = ".mp4" - Var AdvExt17 = ".mp4" - Var AdvExt18 = ".bmp" - Var AdvExt19 = ".mp4" - Var AdvExt20 = ".bmp" - -;Dtac - Var RandomPromotion = 0 -;true_move - Var RandomPromotion1 = 0 - Var RandomPromotionAIS = 0 - Var RandomPromotionCAT = 0 - Var RandomPromotionOper168 = 0 - Var RandomPromotionImobile = 0 - Var RandomPromotionWhitespace = 0 - Var RandomPromotionTOT = 0 - Var RandomPromotionMyworld = 0 - Var RandomSalePackage = 0 - - Var XMLPageVersion = "6.51" - Var XMLPageVersionInt = 651 - - - - 644 - 350 - 20 - fontType1 - 0xEA068A - 0 - "Engine" - - - - 724 - 350 - 20 - fontType1 - 0xEA068A - 0 - SoftwareVersion - - - - 628 - 380 - 20 - fontType1 - 0xEA068A - 0 - "Software version" - - - - 802 - 380 - 20 - fontType1 - 0xEA068A - 0 - XMLPageVersion - - - - False - 430 - 50 - 20 - fontType1 - True - 0xFFFF00 - 0x0000A0 - "/ROOT/text/runner.txt" - - -