diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev index ba3ceb05..aa29eb17 100644 --- a/inter/aus/xml/event/tricker.ev +++ b/inter/aus/xml/event/tricker.ev @@ -13,7 +13,7 @@ Var NewCollectPointFlag = 0 Var WinterWarmersCatalogFlag = 1 -Var XMLLiveInfoEnable = 0 +Var XMLLiveInfoEnable = 1 DEBUGVAR Propepsi99Enable diff --git a/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png b/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png new file mode 100644 index 00000000..e7f7a68e Binary files /dev/null and b/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png differ diff --git a/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml b/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml index 8d7a2f5c..cf8bd307 100644 --- a/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml +++ b/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml @@ -163,6 +163,14 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + + Var FromFruityRaya = 0 + Var FromProThaiTea = 0 + Var FromProYuzu = 0 + @@ -182,13 +190,13 @@ Var block_index_move = 0 ;dummy_layout.inc -;block1 - - PromotionState1 - 33 - 22 - 484 - 602 +;block1 + + PromotionState1 + 33 + 22 + 484 + 602 - + + ;endblock1 -;block2 - - PromotionState2 - 33 - 22 - 484 - 602 +;block2 + + PromotionState2 + 33 + 22 + 484 + 602 - + + ;endblock2 ;block3 diff --git a/inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json b/inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json index 31a1e28f..f3b392f2 100644 --- a/inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json +++ b/inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json @@ -16,12 +16,12 @@ "name": "yuzu", "template": "/event/promotion_template.inc", "config": { - "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", - "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png", + "normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", + "disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_yuzu/pro_yuzu_big_btn.png", "event_on_click": "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu.lxml" } } diff --git a/inter/mys/xml/event/promotion_thai_tea.lxml b/inter/mys/xml/event/promotion_thai_tea.lxml index 5d39de44..acf067a2 100644 --- a/inter/mys/xml/event/promotion_thai_tea.lxml +++ b/inter/mys/xml/event/promotion_thai_tea.lxml @@ -163,6 +163,15 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + + Var FromFruityRaya = 0 + Var FromProThaiTea = 0 + Var FromProYuzu = 0 + + diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index b8759c14..0a744158 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -16,6 +16,10 @@ Var FromFruityRaya = 0 Var ProThaiTeaEnable = 0 Var FromProThaiTea = 0 +; Yuzu Promo +Var ProYuzuEnable = 0 +Var FromProYuzu = 0 + If SystemDateMonthInt = 6 Then If SystemDateDayInt >= 15 Then Var ProThaiTeaEnable = 1 diff --git a/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml b/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml index adef36d8..eb7236da 100644 --- a/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml +++ b/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml @@ -25,22 +25,24 @@ Else DEBUGVAR Seeker.TNumberTaobinMember - DEBUGVAR TelephoneNumber - Var Seeker.TNumberTaobinMember = TelephoneNumber - DEBUGVAR Seeker.TNumberTaobinMember ; Telephone must not empty If Seeker.CodeChannel = 1 Then DEBUGVAR Seeker.CodeChannel Var Seeker.UseProYuzuCode = 1 Var Seeker.ProYuzu = 1 Else + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR TelephoneNumber + Var Seeker.TNumberTaobinMember = TelephoneNumber + DEBUGVAR Seeker.TNumberTaobinMember + Var Seeker.ProYuzu = 1 Var Seeker.UseProYuzuCode = 0 DEBUGVAR Seeker.ProYuzu DEBUGVAR Seeker.UseProYuzuCode ; support-for-multi-pro-with-same-cid - Var param1 = "701" + Var param1 = "703" AddData Cid TelephoneNumber param1 param2 param3 EndIf diff --git a/inter/mys/xml/page_brewing3.lxml b/inter/mys/xml/page_brewing3.lxml index d1bc0c1c..51f0faad 100644 --- a/inter/mys/xml/page_brewing3.lxml +++ b/inter/mys/xml/page_brewing3.lxml @@ -474,7 +474,7 @@ ; reset WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" "" ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" - APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n" + APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://game.my.taobin.local:26969"\r\n" If TelephoneNumber = "0899999999" Then ; Coupon or customer not input phone number. diff --git a/inter/mys/xml/page_catalog_group_pro_yuzu.lxml b/inter/mys/xml/page_catalog_group_pro_yuzu.lxml index e8d03b5e..3fc92442 100644 --- a/inter/mys/xml/page_catalog_group_pro_yuzu.lxml +++ b/inter/mys/xml/page_catalog_group_pro_yuzu.lxml @@ -620,7 +620,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 5 +; menu_new_list 12 ; ==================> Len = 3 ; 12-01-01-0040 12-01-02-0040 - @@ -2258,6 +2258,1915 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 12-05-01-0001 12-05-02-0001 12-05-03-0001 + + 33 + 22 + 225 + 296 + Flag( 12-05-01-0001.Button,12-05-02-0001.Button,12-05-03-0001.Button,$Sum120501000112050200011205030001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LIMENADE + น้ำมะนาว + LIMENADE + น้ำมะนาว + LIMAU AIS + น้ำมะนาว + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Limenade, Sugar + น้ำมะนาว น้ำตาล + Limenade, Sugar + น้ำมะนาว น้ำตาล + Sirap Limau, Gula, Ais + น้ำมะนาว น้ำตาล + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-05-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-01-0001.Button + StringFmt( $12-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0001.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0001.Button + StringFmt( $12-05-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0001.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0001.Button + StringFmt( $12-05-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120501000112050200011205030001 = "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 $Sum120501000112050200011205030001 = "Disable" Then + STRCONTAIN "ERR" $12-05-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0001.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0001.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 + "disable-show" + $Sum120501000112050200011205030001 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 12-05-01-1001 12-05-02-1001 - + + 33 + 22 + 225 + 296 + Flag( 12-05-01-1001.Button,12-05-02-1001.Button,$Sum12050110011205021001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + HOT LIMENADE + น้ำมะนาว + HOT LIMENADE + น้ำมะนาว + LIMAU PANAS + น้ำมะนาว + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Limenade, Sugar + น้ำมะนาว น้ำตาล + Limenade, Sugar + น้ำมะนาว น้ำตาล + Limau, Gula + น้ำมะนาว น้ำตาล + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-05-01-1001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-01-1001.Button + StringFmt( $12-05-01-1001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-1001.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-1001.Button + StringFmt( $12-05-02-1001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12050110011205021001 = "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 $Sum12050110011205021001 = "Disable" Then + STRCONTAIN "ERR" $12-05-01-1001.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-1001.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 + "disable-show" + $Sum12050110011205021001 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 12-05-02-0010 12-05-03-0010 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0010.Button,12-05-03-0010.Button,$Sum12050200101205030010) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LIMENADE \nSODA + น้ำมะนาวโซดา + LIMENADE \nSODA + น้ำมะนาวโซดา + SODA LIMAU + น้ำมะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Limenade, Sugar, Soda & Ice + มะนาว โซดา + Limenade, Sugar, Soda & Ice + มะนาว โซดา + Sirap Limau, Soda, Ais + มะนาว โซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0010.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0010.Button + StringFmt( $12-05-02-0010.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0010.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0010.Button + StringFmt( $12-05-03-0010.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 $Sum12050200101205030010 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0010.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0010.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 + "disable-show" + $Sum12050200101205030010 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 12-05-02-1010 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-1010.Button,$Sum1205021010) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + ICED LIMENADE \nSODA + น้ำมะนาวโซดา + ICED LIMENADE \nSODA + น้ำมะนาวโซดา + SODA LIMAU + น้ำมะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Limenade, Sugar, Soda, Ice + มะนาว โซดา และน้ำแข็ง + Limenade, Sugar, Soda, Ice + มะนาว โซดา และน้ำแข็ง + Limau, Gula, Soda, Ais + มะนาว โซดา และน้ำแข็ง + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-1010.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-1010.Button + StringFmt( $12-05-02-1010.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205021010 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-1010.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 + "disable-show" + $Sum1205021010 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 12-05-02-0060 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0060.Button,$Sum1205020060) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MINT LIME SODA + มินต์มะนาวโซดา + MINT LIME SODA + มินต์มะนาวโซดา + SODA MINT LIMAU + มินต์มะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Mint Syrup, Lime, Soda & Ice + น้ำเชื่อมมินต์ มะนาว และโซดา + Mint Syrup, Lime, Soda & Ice + น้ำเชื่อมมินต์ มะนาว และโซดา + Mint Syrup, Lime, Soda & Ice + น้ำเชื่อมมินต์ มะนาว และโซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0060.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0060.Button + StringFmt( $12-05-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020060 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0060.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 + "disable-show" + $Sum1205020060 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 12-05-02-0009 12-05-03-0009 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0009.Button,12-05-03-0009.Button,$Sum12050200091205030009) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LIME\nSALAK SODA + น้ำแดงมะนาวโซดา + LIME\nSALAK SODA + น้ำแดงมะนาวโซดา + SODA SALAK LIMAU + น้ำแดงมะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Salak Syrup, Limenade, \nSoda & Ice + น้ำแดงกลิ่นสละ มะนาว โซดา + Salak Syrup, Limenade, \nSoda & Ice + น้ำแดงกลิ่นสละ มะนาว โซดา + Sirap Salak, Sirap Limau, Soda, Ais + น้ำแดงกลิ่นสละ มะนาว โซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0009.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0009.Button + StringFmt( $12-05-02-0009.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0009.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0009.Button + StringFmt( $12-05-03-0009.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 $Sum12050200091205030009 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0009.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0009.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 + "disable-show" + $Sum12050200091205030009 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 12-02-01-0048 12-02-02-0049 - + + 33 + 22 + 225 + 296 + Flag( 12-02-01-0048.Button,12-02-02-0049.Button,$Sum12020100481202020049) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + JASMINE LIME + ชามะลิมะนาว + JASMINE LIME + ชามะลิมะนาว + TEH LIMAU JASMINE + ชามะลิมะนาว + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Jasmine Tea, Limenade, Water + ชามะลิ น้ำมะนาว น้ำ + Jasmine Tea, Limenade, Water + ชามะลิ น้ำมะนาว น้ำ + Jasmine Tea, Limenade, Water + ชามะลิ น้ำมะนาว น้ำ + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0048.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0048.Button + StringFmt( $12-02-01-0048.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0049.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0049.Button + StringFmt( $12-02-02-0049.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12020100481202020049 = "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 $Sum12020100481202020049 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0048.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0049.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 + "disable-show" + $Sum12020100481202020049 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/mys/xml/page_topping_select6.lxml b/inter/mys/xml/page_topping_select6.lxml index d2303c39..06ffa126 100644 --- a/inter/mys/xml/page_topping_select6.lxml +++ b/inter/mys/xml/page_topping_select6.lxml @@ -526,8 +526,15 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + + DEBUGVAR "back" + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + Var FromFruityRaya = 0 Var FromProThaiTea = 0 + Var FromProYuzu = 0 ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML @@ -3394,6 +3401,15 @@ SoundVolume + DEBUGVAR "back.cancel" + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + + Var FromFruityRaya = 0 + Var FromProThaiTea = 0 + Var FromProYuzu = 0 + If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 5b115128..ed55ab58 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -467,7 +467,7 @@ If bg_lidProblem_ST = "Enable" Then Var EnableTopupCreditBetweenBrew = "Invisible" Var EnableGetMore - End + EndIf If bg_strawProblem_ST = "Enable" Then Var EnableGetMoreStrawFileName = "Invisible" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index c18a9c89..10a65032 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -10,6 +10,16 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev" EndIf + If CountryName = "Malaysia" Then + DEBUGVAR FromFruityRaya + DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu + + Var FromFruityRaya = 0 + Var FromProThaiTea = 0 + Var FromProYuzu = 0 + EndIf + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 075e15cf..f384319b 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -135,6 +135,7 @@ DEBUGVAR FromFruityRaya DEBUGVAR ProThaiTeaEnable DEBUGVAR FromProThaiTea + DEBUGVAR FromProYuzu If Seeker.TNumberTaobinCredit = "" Then @@ -202,6 +203,14 @@ EndIf EndIf + DEBUGVAR ProYuzuEnable + DEBUGVAR FromProYuzu + If ProYuzuEnable = 1 Then + If FromProYuzu = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml" + EndIf + EndIf + If PepweenEnable = 1 Then If PepweenCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 @@ -317,6 +326,14 @@ Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml" EndIf EndIf + + DEBUGVAR ProYuzuEnable + DEBUGVAR FromProYuzu + If ProYuzuEnable = 1 Then + If FromProYuzu = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml" + EndIf + EndIf If ProBadValentineEnable = 1 Then If FromBadValentinePro = 1 Then @@ -845,6 +862,14 @@ EndIf EndIf + DEBUGVAR ProYuzuEnable + DEBUGVAR FromProYuzu + If ProYuzuEnable = 1 Then + If FromProYuzu = 1 Then + Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml" + EndIf + EndIf + If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 @@ -952,7 +977,11 @@ If FromProThaiTea = 1 Then Var return = "Invisible" Else - Var return = "Enable" + If FromProYuzu = 1 Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf EndIf ) Var( DirImage + "/text_2.png") @@ -965,7 +994,11 @@ If FromProThaiTea = 1 Then Var return = "Enable" Else - Var return = "Invisible" + If FromProYuzu = 1 Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf EndIf ) Var( DirImage + "/edit.png") diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 1364d2f2..91d5af8a 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -447,6 +447,12 @@ Var Seeker.FreeVendingCampaign = 0 EndIf + ; mys pro yuzu + If FromProYuzu = 1 Then + Var Seeker.VendingCode = "YZ1F1" + Var Seeker.FreeVendingCampaign = 0 + EndIf + ; Oreo free If PromotionIDOreoBuyTwoSaveMore = 1 Then Var PromotionIDOreoBuyTwoSaveMore = 0 diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml index 07cfd04c..e99e0233 100644 --- a/xml/page_payment_cash-MYR.xml +++ b/xml/page_payment_cash-MYR.xml @@ -509,6 +509,10 @@ Var X_PS6 = 652 EndIf + DEBUGVAR VendingCashless + Var VendingCashless = "-" + DEBUGVAR VendingCashless + diff --git a/xml/vending_info.xml b/xml/vending_info.xml index a0863276..422a2f2b 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -725,14 +725,22 @@ Var TelephoneNumber = "0859586589" WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" "" ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" - If CountryName = "Australia" Then - APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://game.au.taobin.local:26969"\r\n" + + If InternationalEnable = 1 Then + + If CountryName = "Australia" Then + APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://game.au.taobin.local:26969"\r\n" + EndIf + + If CountryName = "Malaysia" Then + APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://game.my.taobin.local:26969"\r\n" + EndIf + Else APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n" EndIf - Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber) DEBUGVAR ACCString