diff --git a/image/page_drink_disable_n2/bn_frozen_mango.png b/image/page_drink_disable_n2/bn_frozen_mango.png index 61d7daf2..21194a49 100644 Binary files a/image/page_drink_disable_n2/bn_frozen_mango.png and b/image/page_drink_disable_n2/bn_frozen_mango.png differ diff --git a/image/page_drink_n/bn_frozen_mango.png b/image/page_drink_n/bn_frozen_mango.png index 08bcc170..c118ead6 100644 Binary files a/image/page_drink_n/bn_frozen_mango.png and b/image/page_drink_n/bn_frozen_mango.png differ diff --git a/image/page_drink_press_n/bn_frozen_mango.png b/image/page_drink_press_n/bn_frozen_mango.png index b7c2434a..76d7f8e4 100644 Binary files a/image/page_drink_press_n/bn_frozen_mango.png and b/image/page_drink_press_n/bn_frozen_mango.png differ diff --git a/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png b/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png index 61d7daf2..21194a49 100644 Binary files a/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png and b/inter/tha/image/page_drink_disable_n2/bn_frozen_mango.png differ diff --git a/inter/tha/image/page_drink_n/bn_frozen_mango.png b/inter/tha/image/page_drink_n/bn_frozen_mango.png index 08bcc170..c118ead6 100644 Binary files a/inter/tha/image/page_drink_n/bn_frozen_mango.png and b/inter/tha/image/page_drink_n/bn_frozen_mango.png differ diff --git a/inter/tha/image/page_drink_press_n/bn_frozen_mango.png b/inter/tha/image/page_drink_press_n/bn_frozen_mango.png index b7c2434a..76d7f8e4 100644 Binary files a/inter/tha/image/page_drink_press_n/bn_frozen_mango.png and b/inter/tha/image/page_drink_press_n/bn_frozen_mango.png differ diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index f8d45f43..9712b767 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -1203,7 +1203,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/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index e5c55e84..dcc9b864 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 @@ -73,7 +73,7 @@ If inst_show_frozen_fruit_counter = 0 Then RefreshAll - Var inst_show_frozen_fruit_counter = 4 + Var inst_show_frozen_fruit_counter = 15 EndIf EndIf EndIf diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt index fcf99eed..415f3741 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt @@ -75,7 +75,7 @@ If inst_show_frozen_fruit_counter = 0 Then RefreshAll - Var inst_show_frozen_fruit_counter = 4 + Var inst_show_frozen_fruit_counter = 15 EndIf EndIf EndIf diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml new file mode 100644 index 00000000..4a94a1b0 --- /dev/null +++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml @@ -0,0 +1,2922 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + Machine WakeUp + + + CRLFToSpace showname + CRLFToSpace showdesc + + ;- Begin + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + ;SAVELOG PriceDrinkTmp + ;- End + + If RoadShow = "true" Then + Var PriceDrinkTmp = "Free" + Var SaveSelectDrinkRoadShow = SelectDrink + EndIf + + DEBUGVAR SaveSelectDrinkRoadShow + + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + + Var StateImgKeto = "Invisible" + + + Var ToppingGotoPayment = "true" + + DEBUGVAR backGroundAddExtra + DEBUGVAR backGroundAddShotPremium + + DEBUGVAR MultiPayEnable + DEBUGVAR CART_COUNT + Var btnAddCart = "Invisible" + If MultiPayEnable = "true" Then + Var btnAddCart = "Enable" + If CART_COUNT = 3 Then + Var btnAddCart = "Invisible" + EndIf + EndIf + + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + + Machine DoorClose + Machine DoorLidClose + + Var ButtonNext = "false" + + Var NEW_MULTI = "Invisible" + + Var high_light_drink_type = "Invisible" + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0x84776F" + + Var PriceDrinkTmpShow = "---" + + Var show_select_type = "Enable" + + Var hot_button_state = PD_STAGE_1 + Var cold_button_state = PD_STAGE_2 + Var blend_button_state = PD_STAGE_3 + Var normal_button_state = "Invisible" + + ; Protect have product-code but menu disable or invalid. + If hot_button_state = "Invisible" Then + + Var hot_button_state = "Disable2" + EndIf + If cold_button_state = "Invisible" Then + + Var cold_button_state = "Disable2" + EndIf + If blend_button_state = "Invisible" Then + + Var blend_button_state = "Disable2" + EndIf + + + Function 2 + + + DEBUGVAR show_select_type + DEBUGVAR PriceD1 + DEBUGVAR PriceD2 + DEBUGVAR PriceD3 + DEBUGVAR DisplayFormatFull + + If hot_button_state = "Disable2" Then + Var text_price_d1 = "" + Else + Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) + EndIf + + If cold_button_state = "Disable2" Then + Var text_price_d2 = "" + Else + Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) + EndIf + + + If blend_button_state = "Disable2" Then + Var text_price_d3 = "" + Else + Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) + EndIf + + DEBUGVAR LanguageShowByIndex + DEBUGVAR NameLang[0][LanguageShowByIndex] + DEBUGVAR NameLang[1][LanguageShowByIndex] + DEBUGVAR NameLang[2][LanguageShowByIndex] + + Var showname = aliasName[LanguageShowByIndex] + Var showdesc = aliasName[LanguageShowByIndex] + + BackslashNToEnter showname + BackslashNToEnter showdesc + + CRLFToSpace showname + CRLFToSpace showdesc + + + 1000 + + DEBUGVAR Timeout + + + Var Timeout = Timeout + 1 + + If Timeout > 40 Then + Var Timeout = 0 + If Seeker = "next" Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + EndIf + + If MultiPayEnable = "true" Then + If NEW_MULTI = "Invisible" Then + Var NEW_MULTI = "Enable" + Else + Var NEW_MULTI = "Invisible" + EndIf + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + + EndIf + EndIf + + Refresh + TimerReset + + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + + + + 1000 + 381 + show_btn + show_btp + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + ; + + + + + DEBUGVAR LanguageShowByIndex + DEBUGVAR LanguageShow + + + If SelectDrinkType = 1 Then + Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] + Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] + + Else + Var showname = aliasName[LanguageShowByIndex] + Var showdesc = aliasName[LanguageShowByIndex] + + EndIf + + BackslashNToEnter showname + BackslashNToEnter showdesc + CRLFToSpace showname + CRLFToSpace showdesc + Var Timeout = 0 + + + + +; back + + + + If BugFlag = 1 Then + + Else + + + Function 2 + EndIf + + + + + +; same + + 374 + 382 + 331 + 436 + PictureDrink + + + + + 374 + 399 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + +; same +; Text head + + 0 + 752 + 1080 + Center + 68 + KanitMediumTTF + 0x513C2F + showname + +; same + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + + + + + +; +; +; +; +; +; +; +; +; +; +; +; +;- FRAME SCORELLL + + 52 + 881 + 1080 + 880 + 880 + "Vertical" + 1 + + + +; show_select_type + 988 + 162 + 20 + show_select_type + + + "ROOT/taobin_project/image/topping_inter/drink_select_type.png" + + + + 40 + 10 + 500 + 72 + + 000067 + + + + + + + + + + + + + + + + + + + + + 510 + 85 + KanitRegularTTF + 23 + text_hot_color + text_price_d1 + + + + 690 + 85 + KanitRegularTTF + 23 + text_cold_color + text_price_d2 + + + +; x for blend rng. + + + text_show_blend_x + 85 + KanitRegularTTF + 23 + text_blender_color + text_price_d3 + + + + + + +; +; +; +; +; +; +; +; +; +; +;- Begin topping new + + + 988 + 156 + 20 + BGSugarNew +; sugar layout + + "Enable" + "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" + + + + + 40 + 10 + 500 + 72 + + 000065 + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + +; sugar6 + +;- END topping1 + + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +;- Begin topping2 + + + 988 + 156 + 20 + BGSugarHotHealthy +; sugar layout + + BGSugarHotHealthy + "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" + + + + 40 + 10 + 500 + 72 + + 000065 + + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +;- Begin topping3 + + + 988 + 156 + 20 + BGSugarColdHealthy +; sugar layout + + BGSugarColdHealthy + "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" + + + + 40 + 10 + 500 + 72 + + 000065 + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; + + +;-BEGIN milk choice + + OatMilkToppingEnable + 986 + 157 + 20 + + OatMilkToppingEnable + "ROOT/taobin_project/image/topping_inter/bg_milk_choice.png" + + + + 40 + 10 + 500 + 72 + + 000103 + + + + + + +; + + + + text_milk_choice_price_x + 63 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_price_oat_milk + + + + + + 120 + 62 + 800 + 65 + + 000104 + + + + + +; +; +; +; +; +; +; +; +; + + + + +;-END +; +; +; Extra topping. +; +; +; +; +; +; +;-BEGIN shot layout + + ExtraTopping + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + ExtraTopping +; + + 986 + 64 + ExtraTopping + + "ROOT/taobin_project/image/topping_inter/bg_top.png" + + + + 40 + 10 + 500 + 72 + + 000064 + + + +; +; +; + + 986 + "auto" + ShotCoffeePremium +; + + 0 + 0 + "ROOT/taobin_project/image/topping_inter/bg_top_shot2.png" + + + 120 + 4 + + 000102 + + 800 + 65 + + + + +; + + + + topping_shot_price_x + 2 + KanitRegularTTF + "ShotCoffeePremium" + 36 + 0x84776F + text_price_topping + + + + +; +; +; +;-BEGIN shot layout "showShotEnable" + + 986 + "auto" + showShotEnable +; + + 0 + 0 + "ROOT/taobin_project/image/topping_inter/bg_top_shot2.png" + + + + 120 + 4 + + 000100 + + 800 + 65 + +; + + +; + + + + showText4 + 602 + 4 + Var( DirImage + "/text4.png" ) + + + + text_show_normal_x + 4 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_shot_normal_add + + + + + +; +; +; +; +; + + 986 + "auto" + showOreoAddEnable +; + + 0 + 0 + "ROOT/taobin_project/image/topping_inter/bg_top_shot2.png" + + + + + +; + + +; + + +; +; showText8 +; 600 +; 6 +; Var( DirImage + "/text8.png" ) +; + + + showText8 + 580 + 2 + 300 + 70 + + 000092 + + + + + text_x_add_oreo_price + 12 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_price_6 + + + + 120 + 12 + + 000101 + + + + + +; +; +; +; +; +; + + + "Enable" + 986 + 27 + -5 + + ExtraTopping + "ROOT/taobin_project/image/topping_inter/bg_bottom.png" + + + + + + + + +;-END +; +; +; +; +; +; +; +; +; +; +;-BEGIN Collagen +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + "ROOT/taobin_project/image/topping_inter/bg_strawlid.png" + + + + 40 + 10 + 500 + 72 + + 000066 + + + + + 120 + 80 + 500 + 72 + + 000070 + + + + + 120 + 156 + 500 + 72 + + 000071 + + + + + + + LidDeactiveButton + 602 + 144 + 290 + 72 + + 000091 + + + + + +; straw left + + + + + + +; LID left + + + + +; +; StrawDeactiveButton +; 602 +; 64 +; Var( DirImage + "/text20.png" ) +; + + + + + +; +; +; +; +; +; +; +; +; + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + +; back + + + + + + +; add cart + + + + +; next + + + + + + + + Var img_cold_no_flag = 0 + Var img_smth_no_flag = 0 + + If hot_button_state = "Disable2" Then + If blend_button_state = "Disable2" Then + Var img_cold_no_flag = 1 + Else + Var img_cold_no_flag = 1 + Var img_smth_no_flag = 2 + EndIf + EndIf + + If PriceD1 = PriceD2 Then + Var img_cold_no_flag = 1 + EndIf + + If hot_button_state = "Disable2" Then + If cold_button_state = "Disable2" Then + Var img_smth_no_flag = 1 + EndIf + EndIf + + + If img_cold_no_flag = 1 Then + SAVELOG "Cold Image change." + Var img_cold = "/bt_cold_no.png" + Var img_cold_sel = "/bt_cold_selected_no.png" + Var img_cold_dis = "/bt_cold_disable_no.png" + Var img_cold_dis2 = "/bt_cold_disable2_no.png" + Else + Var img_cold = "/bt_cold.png" + Var img_cold_sel = "/bt_cold_selected.png" + Var img_cold_dis = "/bt_cold_disable.png" + Var img_cold_dis2 = "/bt_cold_disable2.png" + EndIf + + If img_smth_no_flag = 1 Then + SAVELOG "Smoothies change img. 1" + Var img_smth = "/bt_smoothie_no.png" + Var img_smth_sel = "/bt_smoothie_selected_no.png" + Var img_smth_dis = "/bt_smoothie_disable_no.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + Else + If img_smth_no_flag = 2 Then + SAVELOG "Smoothies change img. 2" + Var img_smth = "/bt_smoothie_sub2.png" + Var img_smth_sel = "/bt_smoothie_selected_sub2.png" + Var img_smth_dis = "/bt_smoothie_disable_sub2.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_sub2.png" + Else + + Var img_smth = "/bt_smoothie.png" + Var img_smth_sel = "/bt_smoothie_selected.png" + Var img_smth_dis = "/bt_smoothie_disable.png" + Var img_smth_dis2 = "/bt_smoothie_disable2.png" + EndIf + EndIf + + Var img_cold = "/bt_cold_no.png" + Var img_cold_sel = "/bt_cold_selected_no.png" + Var img_cold_dis = "/bt_cold_disable_no.png" + Var img_cold_dis2 = "/bt_cold_disable2_no.png" + + Var img_smth = "/bt_smoothie_no.png" + Var img_smth_sel = "/bt_smoothie_selected_no.png" + Var img_smth_dis = "/bt_smoothie_disable_no.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + + DEBUGVAR menu_name_thai_cold + SAVELOG "FUNCTION2" + + + Var TOPPING_PRICE = 0 + + Var SelectDrinkType = 0 + + ; Set default + If SelectCountDrinkType = 1 Then + If DefaultDrinkType = 1 Then + Var hot_button_state = "PressForever" + Var IndexDrinktType = 0 + EndIf + If DefaultDrinkType = 2 Then + Var cold_button_state = "PressForever" + + If PD_CODE2 = "12-05-02-0016" Then + Var cold_button_state = "Invisible" + Var normal_button_state = "PressForever" + Var SelectDrinkType = 1 + EndIf + + If PD_CODE2 = "51-05-02-0016" Then + Var cold_button_state = "Invisible" + Var normal_button_state = "PressForever" + Var SelectDrinkType = 1 + EndIf + + Var IndexDrinktType = 1 + EndIf + If DefaultDrinkType = 3 Then + Var blend_button_state = "PressForever" + Var IndexDrinktType = 2 + EndIf + + EndIf + + If hot_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD1 + Var UserSelectProductCode = PD_CODE1 + + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" + + Var showname = NameLang[0][LanguageShowByIndex] + Var showdesc = DescLang[0][LanguageShowByIndex] + + Var text_hot_color = "0xFFFFFF" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0x84776F" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + If cold_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD2 + Var UserSelectProductCode = PD_CODE2 + + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + Var showText4 = "Invisible" + + Var showname = NameLang[1][LanguageShowByIndex] + Var showdesc = DescLang[1][LanguageShowByIndex] + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0xFFFFFF" + Var text_blender_color = "0x84776F" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + If blend_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD3 + Var UserSelectProductCode = PD_CODE3 + + If showShotEnable = "Invisible" Then + + Else + Var showShotEnable = "Disable" + EndIf + Var showText4 = "Enable" + + Var showname = NameLang[2][LanguageShowByIndex] + Var showdesc = DescLang[2][LanguageShowByIndex] + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0xFFFFFF" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + BackslashNToEnter showname + BackslashNToEnter showdesc + CRLFToSpace showname + CRLFToSpace showdesc + + + DEBUGVAR PriceDrinkNoTop + DEBUGVAR PriceDiff + DEBUGVAR showShotEnable + Var TOPPING_PRICE = 0 + + If ShotCoffeePremium = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + Var TOPPING_PRICE = 0 + + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select premi normal shot" + + Else + + If showShotEnable = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + + Var TOPPING_PRICE = 0 + + ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select add normal shot" + Else + If blendedState = "Disable" Then + Var blendedState = "Enable" + EndIf + + + Var PriceDrinkTmp = PriceDrinkNoTop + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + + Var showText7 = "Invisible" + + EndIf + + EndIf + + + DEBUGVAR showOreoAddEnable + DEBUGVAR TOPPING_PRICE + + If showOreoAddEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2 + Var topping6 = toppingID6index2 + Var DisableUsingCode = "true" + Else + + ;Var PriceDrinkTmp = PriceDrinkNoTop + + Var topping6 = toppingID6index1 + + Var DisableUsingCode = "false" + + EndIf + + DEBUGVAR OatMilkEnable + DEBUGVAR MenuCodeName1 + DEBUGVAR MenuCodeName1_State + + If OatMilkEnable = "Press" Then + If MenuCodeName1 = "OatMilk" Then + If MenuCodeName1_State = "Enable" Then + Var TOPPING_PRICE = TOPPING_PRICE + OatMilkAddAmount + Var UserSelectProductCode = SubMenuProductCode1 + EndIf + EndIf + EndIf + + + DEBUGVAR SelectDrinkType + + DEBUGVAR showShotEnable + DEBUGVAR PriceDrinkTmpShow + + Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + If SelectDrinkType = 0 Then + Var PriceDrinkTmpShow = "---" + Else + Var PriceDrinkTmpShow !assigned StringFmt( PriceDrinkTmp , DisplayFormatFull, PreScaleConvertShow) + EndIf + SAVELOG PriceDrinkTmp + + If RoadShow = "true" Then + + Var PriceDrinkTmpShow = "Free" + + DEBUGVAR SelectDrink2 + DEBUGVAR PriceDrinkTmpShow + EndIf + + CRLFToSpace showname + CRLFToSpace showdesc + DEBUGVAR showname + DEBUGVAR showdesc + + + Var Timeout = 0 + + RefreshAll + + + + + +; + + diff --git a/ui/lang.tsv b/ui/lang.tsv index f8d45f43..9712b767 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -1203,7 +1203,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. เลือกทิศทาง