diff --git a/image/page_drink_disable_n2/blended_mango_greentea.png b/image/page_drink_disable_n2/blended_mango_greentea.png new file mode 100644 index 00000000..f91a517c Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_greentea.png differ diff --git a/image/page_drink_disable_n2/blended_mango_lychee.png b/image/page_drink_disable_n2/blended_mango_lychee.png new file mode 100644 index 00000000..e1cd3669 Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_lychee.png differ diff --git a/image/page_drink_disable_n2/blended_mango_sala.png b/image/page_drink_disable_n2/blended_mango_sala.png new file mode 100644 index 00000000..6d473cc4 Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_sala.png differ diff --git a/image/page_drink_disable_n2/blended_mango_strawberry.png b/image/page_drink_disable_n2/blended_mango_strawberry.png new file mode 100644 index 00000000..c54e74f3 Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_strawberry.png differ diff --git a/image/page_drink_disable_n2/blended_mango_taiwanese_tea.png b/image/page_drink_disable_n2/blended_mango_taiwanese_tea.png new file mode 100644 index 00000000..5edbebfb Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_taiwanese_tea.png differ diff --git a/image/page_drink_n/blended_mango_greentea.png b/image/page_drink_n/blended_mango_greentea.png new file mode 100644 index 00000000..8fe6b435 Binary files /dev/null and b/image/page_drink_n/blended_mango_greentea.png differ diff --git a/image/page_drink_n/blended_mango_lychee.png b/image/page_drink_n/blended_mango_lychee.png new file mode 100644 index 00000000..f5254173 Binary files /dev/null and b/image/page_drink_n/blended_mango_lychee.png differ diff --git a/image/page_drink_n/blended_mango_sala.png b/image/page_drink_n/blended_mango_sala.png new file mode 100644 index 00000000..01325b05 Binary files /dev/null and b/image/page_drink_n/blended_mango_sala.png differ diff --git a/image/page_drink_n/blended_mango_strawberry.png b/image/page_drink_n/blended_mango_strawberry.png new file mode 100644 index 00000000..fc17b270 Binary files /dev/null and b/image/page_drink_n/blended_mango_strawberry.png differ diff --git a/image/page_drink_n/blended_mango_taiwanese_tea.png b/image/page_drink_n/blended_mango_taiwanese_tea.png new file mode 100644 index 00000000..36d02d44 Binary files /dev/null and b/image/page_drink_n/blended_mango_taiwanese_tea.png differ diff --git a/image/page_drink_picture2_n/blended_mango_greentea.png b/image/page_drink_picture2_n/blended_mango_greentea.png new file mode 100644 index 00000000..49bd5e6e Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_greentea.png differ diff --git a/image/page_drink_picture2_n/blended_mango_lychee.png b/image/page_drink_picture2_n/blended_mango_lychee.png new file mode 100644 index 00000000..ad33ff8f Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_lychee.png differ diff --git a/image/page_drink_picture2_n/blended_mango_sala.png b/image/page_drink_picture2_n/blended_mango_sala.png new file mode 100644 index 00000000..8450f1f5 Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_sala.png differ diff --git a/image/page_drink_picture2_n/blended_mango_strawberry.png b/image/page_drink_picture2_n/blended_mango_strawberry.png new file mode 100644 index 00000000..913a4f8f Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_strawberry.png differ diff --git a/image/page_drink_picture2_n/blended_mango_taiwanese_tea.png b/image/page_drink_picture2_n/blended_mango_taiwanese_tea.png new file mode 100644 index 00000000..868fb0ad Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_taiwanese_tea.png differ diff --git a/image/page_drink_picture2_n/bn_PEPSI_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_PEPSI_Oreo_smoothie.png new file mode 100644 index 00000000..995f6ed7 Binary files /dev/null and b/image/page_drink_picture2_n/bn_PEPSI_Oreo_smoothie.png differ diff --git a/image/page_drink_press_n/blended_mango_greentea.png b/image/page_drink_press_n/blended_mango_greentea.png new file mode 100644 index 00000000..31d48b08 Binary files /dev/null and b/image/page_drink_press_n/blended_mango_greentea.png differ diff --git a/image/page_drink_press_n/blended_mango_lychee.png b/image/page_drink_press_n/blended_mango_lychee.png new file mode 100644 index 00000000..eac7832b Binary files /dev/null and b/image/page_drink_press_n/blended_mango_lychee.png differ diff --git a/image/page_drink_press_n/blended_mango_sala.png b/image/page_drink_press_n/blended_mango_sala.png new file mode 100644 index 00000000..25392eab Binary files /dev/null and b/image/page_drink_press_n/blended_mango_sala.png differ diff --git a/image/page_drink_press_n/blended_mango_strawberry.png b/image/page_drink_press_n/blended_mango_strawberry.png new file mode 100644 index 00000000..694702f9 Binary files /dev/null and b/image/page_drink_press_n/blended_mango_strawberry.png differ diff --git a/image/page_drink_press_n/blended_mango_taiwanese_tea.png b/image/page_drink_press_n/blended_mango_taiwanese_tea.png new file mode 100644 index 00000000..69e4c567 Binary files /dev/null and b/image/page_drink_press_n/blended_mango_taiwanese_tea.png differ diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index 4b33f02a..e24af969 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -17,6 +17,11 @@ If BoxID = 200435 Then Var EnableMultiInstanceFromBoxID = 1 EndIf + + If BoxID = 201316 Then + Var EnableMultiInstanceFromBoxID = 1 + EndIf + If BoxID = 123456 Then Var EnableMultiInstanceFromBoxID = 1 EndIf diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 467f9dc0..838f191f 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -381,11 +381,11 @@ Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 002405 Oh no! Your smoothie’s\n[getting cold feet###Font=MontserratMedium,Size=48] โอ้ไม่! สมูทตี้ของคุณ\n[กำลังรู้สึกเศร้ามาก###Font=KanitMedium,Size=48] 哎呀！您的冰沙\n[好像犹豫不决了。###Font=KanitMedium,Size=48] ဝမ်းနည်းပါတယ်။ သင့်စမူသီသည်\n[ကြိတ်ခြင်းမှ ရပ်နေပါပြီ။###Font=MontserratMedium,Size=48] 002406 You didn’t complete the transaction\n[within 120 seconds. Please try again###Font=MontserratMedium,Size=48] คุณพลาดการทำรายการภายใน 120 วินาที\n[กรุณาลองทำรายการใหม่อีกครั้ง###Font=KanitMedium,Size=48] 您在 120 秒内\n[未完成交易。请再试一次。###Font=KanitMedium,Size=48] သင်ငွေပေးချေမှုကို ၁၂၀စက္ကန့်အတွင်း\n[မပြီးမြောက်နိုင်ခဲ့ပါ။ ကျေးဇူးပြု၍ ပြန်လည်ကြိုးစားပါ။###Font=MontserratMedium,Size=48] - Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 -002407 Are you sure you\n[want to cancel?###Font=KanitBold,Size=64] คุณแน่ใจหรือว่าต้องการ\n[ยกเลิกออเดอร์จริงๆ###Font=KanitBold,Size=64] 您确定要\n[取消吗？###Font=KanitBold,Size=64] မင်းဖျက်ချင်တာ\n[သေချာပြီလား?###Font=KanitBold,Size=64] + Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=70 Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60 Font=Kanit,Type=Bold,Size=54,Color=0xEE8C62,Align=Center,LineHeight=70 +002407 Are you sure you\n[want to cancel?###Font=KanitBold,Size=64] คุณแน่ใจหรือว่าต้องการ\n[ยกเลิกออเดอร์จริงๆ###Font=KanitBold,Size=64] 您确定要\n[ 取消吗？###Font=KanitBold,Size=64] မင်းဖျက်ချင်တာ\n[သေချာပြီလား?###Font=KanitBold,Size=64] 002408 Session expired หมดเวลาทำรายการ 操作超时 ငွေပေးချေမှုအချိန်လွန်သွားပါပြီ - - + Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60 +002409 Taobin has encountered an error.\n[Please press the help button at the top right.###Font=MontserratMedium,Size=48] เต่าบินเกิดเหตุขัดข้อง\n[โปรดกดปุ่มขอความช่วยเหลือด้านขวาบน###Font=KanitMedium,Size=48] Taobin 出现故障，\n[请按右上角的求助按钮。###Font=KanitMedium,Size=48] Taobin ပြဿနာဖြစ်နေသည်။\n[အကူအညီခလုတ်ကို နှိပ်ပါ။###Font=KanitMedium,Size=48] @@ -1256,7 +1256,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index ce62a325..b10b00ae 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -78,10 +78,14 @@ Var SpiralModeFrozenFruit = 1 Var ButtonFrozenSmoothie = "Enable" EndIf + If MAT_ID_2301 = "Disable" Then + Var SpiralModeFrozenFruit = 1 + Var ButtonFrozenSmoothie = "Enable" + EndIf If BoxID = 123456 Then - Var SpiralModeGoods = 1 + Var SpiralModeGoods = 0 Var ButtonSpiralStage = "Enable" EndIf EndIf diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index 22e161a4..91674f04 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -143,38 +143,6 @@ Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml" - - KingdomThaiTeaProState - IMAGE - - eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png" - Else - Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png" - EndIf - ) - - - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_kingdom_thai_tea.lxml" - - - - PepsiXTaobinProState - VIDEO - - eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4" - Else - Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4" - EndIf - ) - - - Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml" - - ; ==================> Len = 3 ; - 12-02-02-0099 - diff --git a/inter/tha/xml/multi/v3/page_catalog_group_cocktail.lxml b/inter/tha/xml/multi/v3/page_catalog_group_cocktail.lxml index a3864321..673d010d 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_cocktail.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_cocktail.lxml @@ -67,9 +67,9 @@ 1 - "Hot" - "Ice" - "Blend" + 000081 + 000082 + 000083 000013 diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index d222d057..5804be23 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -130,17 +130,17 @@ 1 - "Hot" - "Ice" - "Blend" + 000081 + 000082 + 000083 000013 ;banners ; ==================> Len = 3 - ; - - 12-00-07-0000 + ; - - 12-00-07-0001 - Flag( 12-00-07-0000.Button,$Sum1200070000) + Flag( 12-00-07-0001.Button,$Sum1200070001) "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" @@ -156,20 +156,20 @@ - Mango Frozen - มะม่วงสุขแช่แข็ง + Frozen mango smoothies + มะม่วงปั่น แช่แข็ง - - - - - $12-00-07-0000.Button + $12-00-07-0001.Button eval( - If $12-00-07-0000.Price = -1 Then + If $12-00-07-0001.Price = -1 Then Var return = "Free" Else - Var return !assigned StringFmt( $12-00-07-0000.Price , DisplayFormat, PreScaleConvertShow) + Var return !assigned StringFmt( $12-00-07-0001.Price , DisplayFormat, PreScaleConvertShow) EndIf ) @@ -190,31 +190,31 @@ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - $Sum1200070000TextID - $Sum1200070000TextValue + $Sum1200070001TextID + $Sum1200070001TextValue Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png" @@ -222,15 +222,15 @@ Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $##-##-##-####.Price Var PriceD2 = $##-##-##-####.Price - Var PriceD3 = $12-00-07-0000.Price + Var PriceD3 = $12-00-07-0001.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####" - Var PD_CODE3 = "12-00-07-0000" + Var PD_CODE3 = "12-00-07-0001" ; begin lang Var aliasName[0] = "Mango Smoothie" - Var aliasDesc[0] = "Mango Frozen" + Var aliasDesc[0] = "Frozen mango smoothies" Var aliasName[1] = "มะม่วงปั่น" - Var aliasDesc[1] = "มะม่วงสุขแช่แข็ง" + Var aliasDesc[1] = "มะม่วงปั่น แช่แข็ง" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -263,14 +263,14 @@ Var DescLang[1][3] = "" Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "Mango Smoothie" + Var NameLang[2][0] = "Mango Smoothie SMOOTHIE" Var NameLang[2][1] = "มะม่วงปั่น" Var NameLang[2][2] = "-" Var NameLang[2][3] = "-" Var NameLang[2][4] = "-" Var NameLang[2][5] = "-" - Var DescLang[2][0] = "Mango Frozen" - Var DescLang[2][1] = "มะม่วงสุขแช่แข็ง" + Var DescLang[2][0] = "Frozen mango smoothies" + Var DescLang[2][1] = "มะม่วงปั่น แช่แข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" Var DescLang[2][4] = "-" @@ -278,7 +278,7 @@ ; end lang Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = "Disable2" - Var PD_STAGE_3 = $12-00-07-0000.Button + Var PD_STAGE_3 = $12-00-07-0001.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -299,7 +299,7 @@ If PD_STAGE_1 = "Enable" Then Topping "Load" "-" Else - Topping "Load" "12-00-07-0000" + Topping "Load" "12-00-07-0001" EndIf EndIf ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" @@ -336,9 +336,218 @@ Else Var show_eng = "true" EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" Else - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" + EndIf + + + + + + + ; ==================> Len = 3 + ; None None None + + Flag( None.Button,None.Button,None.Button,$SumNoneNoneNone) + "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_frozen_mango.png" + "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_frozen_mango.png" + "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_frozen_mango.png" + + + Mango Smoothie + มะม่วงปั่น + - + - + - + - + + + + + Frozen mango smoothies + มะม่วงปั่น แช่แข็ง + - + - + - + - + + + $None.Button + eval( + If $None.Price = -1 Then + Var return = "Free" + Else + Var return !assigned StringFmt( $None.Price , DisplayFormat, PreScaleConvertShow) + EndIf + ) + + eval( + If ICE_PROCESS_STATUS = 2 Then + If $Sum510201003951020200395102030039 = "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" + + + $SumNoneNoneNoneTextID + $SumNoneNoneNoneTextValue + + + Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_frozen_mango.png" + GetInstanceIDMenuTab OpenFromInstMenuTab + Var OpenFromXML = CurrentXMLFileName2 + Var PriceD1 = $None.Price + Var PriceD2 = $None.Price + Var PriceD3 = $None.Price + Var PD_CODE1 = "None" + Var PD_CODE2 = "None" + Var PD_CODE3 = "None" + ; begin lang + Var aliasName[0] = "Mango Smoothie" + Var aliasDesc[0] = "Frozen mango smoothies" + Var aliasName[1] = "มะม่วงปั่น" + Var aliasDesc[1] = "มะม่วงปั่น แช่แข็ง" + Var aliasName[2] = "-" + Var aliasDesc[2] = "-" + Var aliasName[3] = "-" + Var aliasDesc[3] = "-" + Var aliasName[4] = "-" + Var aliasDesc[4] = "-" + Var aliasName[5] = "-" + Var aliasDesc[5] = "-" + Var NameLang[0][0] = "" + Var NameLang[0][1] = "" + Var NameLang[0][2] = "" + Var NameLang[0][3] = "" + Var NameLang[0][4] = "" + Var NameLang[0][5] = "" + Var DescLang[0][0] = "" + Var DescLang[0][1] = "" + Var DescLang[0][2] = "" + Var DescLang[0][3] = "" + Var DescLang[0][4] = "" + Var DescLang[0][5] = "" + Var NameLang[1][0] = "" + Var NameLang[1][1] = "" + Var NameLang[1][2] = "" + Var NameLang[1][3] = "" + Var NameLang[1][4] = "" + Var NameLang[1][5] = "" + Var DescLang[1][0] = "" + Var DescLang[1][1] = "" + Var DescLang[1][2] = "" + Var DescLang[1][3] = "" + Var DescLang[1][4] = "" + Var DescLang[1][5] = "" + Var NameLang[2][0] = "" + Var NameLang[2][1] = "" + Var NameLang[2][2] = "" + Var NameLang[2][3] = "" + Var NameLang[2][4] = "" + Var NameLang[2][5] = "" + Var DescLang[2][0] = "" + Var DescLang[2][1] = "" + Var DescLang[2][2] = "" + Var DescLang[2][3] = "" + Var DescLang[2][4] = "" + Var DescLang[2][5] = "" + ; end lang + Var PD_STAGE_1 = $None.Button + Var PD_STAGE_2 = $None.Button + Var PD_STAGE_3 = $None.Button + Var SelectCountDrinkType = 0 + Var DefaultDrinkType = 0 + If PD_STAGE_1 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 1 + EndIf + If PD_STAGE_2 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 2 + EndIf + If PD_STAGE_3 = "Enable" Then + Var SelectCountDrinkType = SelectCountDrinkType + 1 + Var DefaultDrinkType = 3 + EndIf + If PD_STAGE_2 = "Enable" Then + Topping "Load" "None" + Else + If PD_STAGE_1 = "Enable" Then + Topping "Load" "None" + Else + Topping "Load" "None" + EndIf + EndIf + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_frozen_fruit.lxml" + + + TabMenuVisibleInst 99 + DEBUGVAR RedirectToNormalVersion + DEBUGVAR ToppingNewUINewSystem + If RedirectToNormalVersion = 1 Then + Var menu_name_eng_hot = NameLang[0][0] + Var menu_desc_eng_hot = DescLang[0][0] + Var menu_name_eng_cold = NameLang[1][0] + Var menu_desc_eng_cold = DescLang[1][0] + Var menu_name_eng_blender = NameLang[2][0] + Var menu_desc_eng_blender = DescLang[2][0] + + + + Var menu_name_thai_hot = NameLang[0][1] + Var menu_desc_thai_hot = DescLang[0][1] + Var menu_name_thai_cold = NameLang[1][1] + Var menu_desc_thai_cold = DescLang[1][1] + Var menu_name_thai_blender = NameLang[2][1] + Var menu_desc_thai_blender = DescLang[2][1] + DEBUGVAR menu_name_thai_cold + DEBUGVAR menu_desc_thai_cold + Var NameDrink = aliasName[0] + Var DrinkDescription = aliasDesc[0] + Var NameDrinkTH = aliasName[1] + Var DrinkDescriptionTH = aliasDesc[1] + If LanguageShow = "THAI" Then + Var show_eng = "false" + Else + Var show_eng = "true" + EndIf + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.xml" EndIf diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index 60dee73e..359f0a7c 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -26,7 +26,10 @@ Var ProcessCupDebugText = "" Var TimeOutSmoothiesProcess = 1 + Var OverrideVideoThankyou = 1 + Var IgnoreLidStrawAll = 1 + Open "ROOT/taobin_project/xml/page_thankyou.xml" 1000 @@ -54,7 +57,7 @@ Var Seeker.PictureDrink = "" Var Seeker.CollectPointMain = 1 - Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 29b0bd76..bdbe3cd9 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1,10 +1,10 @@ test ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น OverlayTemplate DateTimeStart DateTimeEnd Var DefaultLoadTopping ราคาร้อน ราคาเย็น ราคาปั่น Name=recommend,file=page_catalog_group_recommend.skt - เพียวมัทฉะคูณ 3 Pure Matcha X3 มัทฉะ น้ำเย็น Matcha Cold Water - 12-02-02-0099 - bn_Pure_Matcha_X3.png - - - posi1 2025/04/01T00:00:00 - - - - เต่าบินไอติมถัง\nกะทิ Coconut Milk\nIce Cream มะพร้าว, คาราเมล, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Milk, Sugar\nAnd Ice - - 12-03-03-0103 bn_Coconut_Milk_Smoothie.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro 3 - เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น Coconut Milk\nMatcha Ice Cream มะพร้าว, คาราเมล, มัทฉะ, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Matcha, Milk,\nSugar And Ice - - 12-03-03-0106 bn_Coconut_Milk_Matcha_Smoothie.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro 3 - โอเลี้ยง Oliang กาแฟ, น้ำตาล, คาราเมล และ ผงโกโก้ Coffee, Sugar, Caramel And Cocoa - 12-01-02-0090 - bn_iced_Oliang.png - 12-21-02-0090 - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro - + เพียวมัทฉะคูณ 3 Pure Matcha X3 มัทฉะ น้ำเย็น Matcha Cold Water - 12-02-02-0099 - bn_Pure_Matcha_X3.png - - - posi1 2025/04/01T00:00:00 2025/05/01T00:00:00 - - + เต่าบินไอติมถัง\nกะทิ Coconut Milk\nIce Cream มะพร้าว, คาราเมล, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Milk, Sugar\nAnd Ice - - 12-03-03-0103 bn_Coconut_Milk_Smoothie.png - - - posi1 2025/04/01T00:00:00 2025/05/01T00:00:00 KingdomThaiTeaPro 3 + เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น Coconut Milk\nMatcha Ice Cream มะพร้าว, คาราเมล, มัทฉะ, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Matcha, Milk,\nSugar And Ice - - 12-03-03-0106 bn_Coconut_Milk_Matcha_Smoothie.png - - - posi1 2025/04/01T00:00:00 2025/05/01T00:00:00 KingdomThaiTeaPro 3 + โอเลี้ยง Oliang กาแฟ, น้ำตาล, คาราเมล และ ผงโกโก้ Coffee, Sugar, Caramel And Cocoa - 12-01-02-0090 - bn_iced_Oliang.png - 12-21-02-0090 - posi1 2025/04/01T00:00:00 2025/05/01T00:00:00 KingdomThaiTeaPro - พรีเมียมมัทฉะ\nคาราเมลโอรีโอ Premium Green Tea\nCaramel Oreo มัทฉะ นม คาราเมล และ Oreo Matcha, Milk, Caramel, Oreo - - 12-02-03-0057 bn_Caramel_GreenTea_Oreo_smoothie.png - - - posi1 2025/03/01T00:00:00 2025/04/01T00:00:00 - 3 พรีเมียมชาไทย\nคาราเมลโอรีโอ Premium Thai Tea\nCaramel Oreo ชาไทย นม คาราเมล และ Oreo Thai Tea, Milk, Caramel, Oreo - - 12-02-03-0058 bn_Caramel_ThaiTea_Oreo_smoothie.png - - - posi1 2025/03/01T00:00:00 2025/04/01T00:00:00 - 3 @@ -173,7 +173,7 @@ Name=Milk,file=page_catalog_group_milk.skt โอรีโอปั่นภูเขาไฟ Oreo Smoothie \nVolcano นม น้ำตาล โอรีโอ \n Milk, Sugar, Oreo, Ice - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi2 - - - 3 - - #REF! NN #REF! ซูเปอร์โกโก้เข้ม คูณ 3 Super Cocoa X3 โกโก้ 3x นม และน้ำตาล Milk, Cocoa, Sugar - 12-03-02-0067 12-03-03-0067 IcedCocoax3.png - - - posi1 - - - 3 โอวัลตินรถโรงเรียน\nภูเขาไฟ Mini Bus Ovaltine\nVolcano โอวัลติน น้ำตาล และ นม Ovaltine, Sugar, milk - - 12-03-03-0094 bn_iced_Ovaltine_cocoa_smoothie.png - - - posi1 2024/12/16T00:00:00 - - 3 - ยูซุโอริโอ้โวคาโน่ Yuzu Milk Oreo Volcano ยูซุ นม โอริโอ้ Yuzu Milk Oreo - - 12-03-03-0087 bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro 3 + ยูซุโอริโอ้โวคาโน่ Yuzu Milk\nOreo Volcano ยูซุ นม โอริโอ้ Yuzu Milk Oreo - - 12-03-03-0087 bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 2025/04/01T00:00:00 - KingdomThaiTeaPro 3 เต่าบินไอติมถัง\nกะทิ Coconut Milk\nIce Cream มะพร้าว, คาราเมล, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Milk, Sugar\nAnd Ice - - 12-03-03-0103 bn_Coconut_Milk_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - 3 เต่าบินไอติมถัง\nสตรอเบอรี Coconut Milk\nStrawberry Ice Cream มะพร้าว, คาราเมล, สตรอเบอรี, นม,\nน้ำตาล และ น้ำแข็ง Coconut, Caramel, Strawberry, Milk,\nSugar And Ice - - 12-03-03-0104 bn_Coconut_Milk_Strawberry_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - 3 เต่าบินไอติมถัง\nโกโก้ Coconut Milk\nCocoa Ice Cream มะพร้าว, คาราเมล, โกโก้, นม, น้ำตาล\nและ น้ำแข็ง Coconut, Caramel, Cocoa, Milk,\nSugar And Ice - - 12-03-03-0105 bn_Coconut_Milk_Cocoa_Smoothie.png - - - posi1 2025/03/01T00:00:00 - - 3 @@ -1307,7 +1307,7 @@ Name=OreoVolcano,file=page_catalog_group_pro_oreo_volcano.skt พรีเมียมเอสเพรสโซ่\nคาราเมลโอรีโอ Premium Espresso\nCaramel Oreo กาแฟ นม คาราเมล และโอรีโอ Coffee, Milk, Caramel , Oreo - - 12-01-03-0078 bn_Caramel_Espresso_Oreo_smoothie.png - - 12-21-03-0078 posi1 - - - - พรีเมียมมัทฉะ\nคาราเมลโอรีโอ Premium Matcha\nCaramel Oreo มัทฉะ นม คาราเมล และโอรีโอ Matcha, Milk, Caramel , Oreo - - 12-02-03-0057 bn_Caramel_GreenTea_Oreo_smoothie.png - - - posi1 - - - - พรีเมียมชาไทย\nคาราเมลโอรีโอ Premium Thai Tea\nCaramel Oreo ชาไทย นม คาราเมล และโอรีโอ Thai Tea, Milk, Caramel , Oreo - - 12-02-03-0058 bn_Caramel_ThaiTea_Oreo_smoothie.png - - - posi1 - - - - - ยูซุโอริโอ้โวคาโน่ Yuzu Milk Oreo Volcano ยูซุ นม น้ำตาล \nโอรีโอ Yuzu , Milk,\nSugar, Oreo - - 12-03-03-0087 bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 - - - - + ยูซุโอริโอ้โวคาโน่ Yuzu Milk\nOreo Volcano ยูซุ นม น้ำตาล \nโอรีโอ Yuzu , Milk,\nSugar, Oreo - - 12-03-03-0087 bn_Yuzu_Milk_Oreo_Volcano.png - - - posi1 - - - - เป๊ปซี่โกโก้โอริโอ้ Pepsi Cocoa Oreo เป๊ปซี่ โกโก้ นม และโอรีโอ Pepsi, Cocoa, Milk, Oreo and Ice - - 12-99-03-0068 bn_PEPSI_Coaco_Oreo_smoothie.png - - - posi1 - - - - เป๊ปซี่โอริโอ้ Pepsi Oreo เป๊ปซี่ นม และโอรีโอ Pepsi, Milk, Oreo and Ice - - 12-99-03-0066 bn_PEPSI_Oreo_smoothie.png - - - posi1 - - - - นมคาราเมลปั่นโอรีโอ\nภูเขาไฟ Caramel Milk Oreo\nSmoothie คาราเมล นม น้ำตาล \nโอรีโอ Caramel , Milk,\nSugar, Oreo - - 12-03-03-0031 bn_CaramelOreo_smoothie.png - - - posi1 - - - - @@ -1364,13 +1364,13 @@ Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.xml,parameter=show-blend-only - มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0001 bn_frozen_mango.png - - - - - - - - - - + มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - - + 12-06-03-0001 + 12-06-03-0002 blended_mango_lychee.png + 12-06-03-0003 blended_mango_strawberry.png + 12-06-03-0004 blended_mango_sala.png + 12-06-03-0005 blended_mango_greentea.png + 12-06-03-0006 blended_mango_taiwanese_tea.png diff --git a/menu/page_catalog_group_other_other.skt b/menu/page_catalog_group_other_other.skt index fbea460b..9ed45cd7 100644 --- a/menu/page_catalog_group_other_other.skt +++ b/menu/page_catalog_group_other_other.skt @@ -10,6 +10,11 @@ ; "0xeae6e1" SoundVolume + DEBUGVAR BoostEnergyPro + If BoostEnergyPro = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_other_other_pro.xml" + EndIf + ; On open KanitMediumTTF 0x322B26 showengText - "Yuzu Milk Oreo Volcano" + "Yuzu Milk +Oreo Volcano" 16 diff --git a/xml/page_catalog_group_other_other.skt b/xml/page_catalog_group_other_other.skt index e40cac4a..5bf64dd0 100644 --- a/xml/page_catalog_group_other_other.skt +++ b/xml/page_catalog_group_other_other.skt @@ -11,6 +11,7 @@ SoundVolume ; On open + DEBUGVAR BoostEnergyPro If BoostEnergyPro = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_other_other_pro.xml" diff --git a/xml/page_catalog_group_other_other.xml b/xml/page_catalog_group_other_other.xml index 0fab7078..da040ab1 100644 --- a/xml/page_catalog_group_other_other.xml +++ b/xml/page_catalog_group_other_other.xml @@ -8,6 +8,7 @@ SoundVolume ; On open + DEBUGVAR BoostEnergyPro If BoostEnergyPro = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_other_other_pro.xml" diff --git a/xml/page_catalog_group_pro_buble_tea.xml b/xml/page_catalog_group_pro_buble_tea.xml index a5efd8b2..f9585e1f 100644 --- a/xml/page_catalog_group_pro_buble_tea.xml +++ b/xml/page_catalog_group_pro_buble_tea.xml @@ -8030,19 +8030,19 @@ Soda & Ice" ; ==================> Len = 16 - ; - - 12-00-07-0001 + ; - - 12-00-07-0000 33 22 225 296 - Flag( 12-00-07-0001.Button,$Sum1200070001) + Flag( 12-00-07-0000.Button,$Sum1200070000)