diff --git a/adv/sync_1.file b/adv/sync_1.file index 63719871..f8302478 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 250892 --rw-rw---- 1 root sdcard_rw 0 2024-11-01 10:08 sync_1.file +total 258344 +-rw-rw---- 1 root sdcard_rw 0 2024-11-06 08:46 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 @@ -39,6 +39,6 @@ total 250892 -rw-rw---- 1 root sdcard_rw 2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4 -rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4 --rw-rw---- 1 root sdcard_rw 2165663 2023-09-18 18:44 taobin_adv_menu_18.mp4 +-rw-rw---- 1 root sdcard_rw 9807774 2024-11-06 09:22 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4 -rw-rw---- 1 root sdcard_rw 2353764 2024-11-01 10:02 taobin_adv_menu_20.mp4 diff --git a/adv/taobin_adv_menu_18.mp4 b/adv/taobin_adv_menu_18.mp4 index 18628651..de361a4a 100644 Binary files a/adv/taobin_adv_menu_18.mp4 and b/adv/taobin_adv_menu_18.mp4 differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index adfeea23..27526ca4 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1027,10 +1027,16 @@ Name=Oreo11.11,file=page_catalog_group_pro_oreo_11.skt ชานมขิงโอรีโอปั่น GINGER MILK TEA\nOREO SMOOTHIE ขิง นม น้ำตาล \nโอรีโอ Ginger, Milk,\nSugar, Oreo - - 12-02-03-0056 bn_Ginger_milk_Oreo_smoothie_oreo_11 - - - posi1 นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ coconut milk oreo\nsmoothie น้ำเชื่อมมะพร้าว นม น้ำตาล \nโอรีโอ Coconut Syrup, Milk,\nSugar, Oreo - - 12-03-03-0086 bn_Coconut_Oreo_smoothie_oreo_11 - - - posi1 นมยูสุปั่นโอรีโอภูเขาไฟ Yuzu Milk Oreo\nSmoothie น้ำเชื่อมยูซุ นม น้ำตาล \nโอรีโอ Yuzu Syrup, Milk,\nSugar, Oreo - - 12-03-03-0087 bn_YUZU_Oreo_smoothie_oreo_11 - - - posi1 - พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11 - - - posi1 + พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11 - - 12-21-03-0078 posi1 พรีเมียมมัทฉะ\nคาราเมลโอรีโอ PREMIUM MATCHA\nCARAMEL OREO มัทฉะ นม คาราเมล และโอรีโอ Matcha, Milk, Caramel Syrup, Oreo - - 12-02-03-0057 bn_Caramel_Matcha_Oreo_smoothie_oreo_11 - - - posi1 พรีเมียมชาไทย\nคาราเมลโอรีโอ PREMIUM THAI TEA\nCARAMEL OREO ชาไทย นม คาราเมล และโอรีโอ Thai Tea, Milk, Caramel Syrup, Oreo - - 12-02-03-0058 bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11 - - - posi1 +Name=HappyTrios,file=page_catalog_group_pro_happy_trios.skt + พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ PREMIUM ESPRESSO\nCARAMEL OREO กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel Syrup, Oreo - - 12-01-03-0078 bn_super_oreo_volcano_Caramel_happy_trios.png - - 12-21-03-0078 posi1 + พรีเมียมมัทฉะ\nคาราเมลโอรีโอ PREMIUM MATCHA\nCARAMEL OREO มัทฉะ นม คาราเมล และโอรีโอ Matcha, Milk, Caramel Syrup, Oreo - - 12-02-03-0057 bn_super_oreo_volcano_Matcha_happy_trios.png - - - posi1 + พรีเมียมชาไทย\nคาราเมลโอรีโอ PREMIUM THAI TEA\nCARAMEL OREO ชาไทย นม คาราเมล และโอรีโอ Thai Tea, Milk, Caramel Syrup, Oreo - - 12-02-03-0058 bn_super_oreo_volcano_ThaiTea_happy_trios.png - - - posi1 + + Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt ลาเต้ LATTE กาแฟ นม และ ฟองนม Espresso, Milk, Foamed milk - 12-21-62-0002 12-21-63-0002 มอคค่า MOCHA กาแฟ นม โกโก้ และ น้ำตาล Espresso, Cocoa, Milk, Sugar - 12-21-62-0003 12-21-63-0003 diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index fd684a53..64059f67 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -491,10 +491,13 @@ DEBUGVAR JemilaRewardOutOfStock READ_FILE "/mnt/sdcard/coffeevending/pro_oreo_11_disable" Oreo11DisableFromFile DEBUGVAR Oreo11DisableFromFile +DEBUGVAR OreoEnable If Oreo11DisableFromFile = 1 Then Var OreoDiscount11Pro = 0 EndIf +DEBUGVAR OreoDiscount11Pro + ; Control collect promotion point behavior Var New_Payment = 0 Var NewFlowPaymentCode = 0 diff --git a/xml/menutab/page_catalog_group_pro_oreo_11.xml b/xml/menutab/page_catalog_group_pro_oreo_11.xml index 3a388817..322dd945 100644 --- a/xml/menutab/page_catalog_group_pro_oreo_11.xml +++ b/xml/menutab/page_catalog_group_pro_oreo_11.xml @@ -4387,7 +4387,259 @@ CARAMEL OREO" center-vertical-horizontal - ; - - - + ; - - 12-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-21-03-0078.Button,$Sum1221030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่ +คาราเมลโอรีโอ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาราเมล และโอรีโอ" + + + 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-21-03-0078.Button + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0078.Button + Var( "฿" + $12-21-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 $Sum1221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-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" + $Sum1221030078 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; - - 12-02-03-0057 diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index 6e71993e..4ced44d9 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -442,12 +442,52 @@ If ChangeOK = 3 Then If ActionOKCase = 0 Then + Var SVT = "coffee" + Var ACC = "0899999999" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + + 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 DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + Var ActionOKCase = 1 If Seeker.CodeChannel = 0 Then SAVELOG "back_to_main from line > 391." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf - + Var waitAckPay = 2 Var Timeout = 5 diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml index 6c768144..38473e12 100644 --- a/xml/page_cannotConti.xml +++ b/xml/page_cannotConti.xml @@ -598,8 +598,6 @@ EndIf - - Var DEE = PayDetail PAYEXT SVT ACC VendingTSIDTmp DEE diff --git a/xml/page_catalog_group_pro_oreo_11.xml b/xml/page_catalog_group_pro_oreo_11.xml index 76bb69f3..7a255418 100644 --- a/xml/page_catalog_group_pro_oreo_11.xml +++ b/xml/page_catalog_group_pro_oreo_11.xml @@ -4370,7 +4370,258 @@ CARAMEL OREO" center-vertical-horizontal - ; - - - + ; - - 12-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 12-21-03-0078.Button,$Sum1221030078) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "พรีเมียมเอสเพรสโซ่ +คาราเมลโอรีโอ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ นม คาราเมล และโอรีโอ" + + + 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-21-03-0078.Button + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-03-0078.Button + StringFmt( $12-21-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 $Sum1221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-21-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" + $Sum1221030078 + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 12 ; - - 12-02-03-0057 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 5c67530b..fd09b1a3 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -241,6 +241,9 @@ DEBUGVAR DrinkImageOnArm[DrinkArmCupID] DEBUGVAR DrinkNameOnArm[DrinkArmCupID] + Var TextDoorJamStage = "Invisible" + Var CountUpDoorJamAlert = 0 + 500 @@ -407,9 +410,38 @@ If txtDrinkOKState = "Enable" Then Var TextBottomShow = "Invisible" Else - Var TextBottomShow = "Enable" + ;Var TextBottomShow = "Enable" EndIf + If DOOR_CUP_OPEN_ERROR = "true" Then + Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1 + EndIf + If DOOR_CUP_CLOSE_ERROR = "true" Then + Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1 + EndIf + If CountUpDoorJamAlert > 0 Then + DEBUGVAR CountUpDoorJamAlert + EndIf + + If CountUpDoorJamAlert > 8 Then + DEBUGVAR DOOR_CUP_OPEN_ERROR + DEBUGVAR DOOR_CUP_CLOSE_ERROR + Var TextBottomShow = "Invisible" + Var TextDoorJamStage = "Enable" + EndIf + + If CountUpDoorJamAlert > 50 Then + Var CountUpDoorJamAlert = 1 + Var TextBottomShow = "Enable" + Var TextDoorJamStage = "Invisible" + EndIf + + If show_eng = "true" Then + Var TextDoorJamString = " Door Error. " + Else + Var TextDoorJamString = " ประตูมีปัญหา " + + EndIf TimerReset @@ -485,6 +517,18 @@ text_bottom + + 0 + 1418 + 87 + Center + 0xff0303 + KanitLightTTF + TextDoorJamStage + TextDoorJamString + + + 757