pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Regan

Browse source
This commit is contained in:
wanlop run 2024-12-09 16:32:34 +07:00
parent 86a20990bb
commit 1e1894b1a9
6 changed files with 809 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/tha/menu/lang.tsv
View file

@ -1091,7 +1091,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด

Can't render this file because it has a wrong number of fields in line 21.

94
inter/tha/xml/multi/page_catalog_group_recommend.lxml
View file

@ -16980,101 +16980,7 @@
;BigLogoLayout
<<<<<<< HEAD
<EventUnitTest1>
Var NameDrink = "ICED SANTA GINGER"
Var NameDrinkTH = "ซานต้าจินเจอร์"
Var DrinkDescriptionTH = "ขิง นม น้ำเชื่อมคาราเมล และน้ำ"
Var DrinkDescription = "GINGER , MILK, CARAMEL SYRUP AND WATER"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_santa_ginger.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-23-02-0081.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "12-23-02-0081"
Var PD_CODE3 = "##-##-##-####"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-23-02-0081.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( 12-23-02-0081, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
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
Topping "Load" "12-23-02-0081"
Var menu_name_eng_hot = $##-##-##-####.NameE
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $12-23-02-0081.NameE
Var menu_desc_eng_cold = $12-23-02-0081.descriptionE
Var menu_name_thai_cold = $12-23-02-0081.Name
Var menu_desc_thai_cold = $12-23-02-0081.description
Var menu_name_eng_blender = $##-##-##-####.NameE
Var menu_desc_eng_blender = $##-##-##-####.descriptionE
Var menu_name_thai_blender = $##-##-##-####.Name
Var menu_desc_thai_blender = $##-##-##-####.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
DEBUGVAR NameDrink
DEBUGVAR $12-23-02-0081.Button
TabMenuVisibleInst 99
If RedirectToNormalVersion = 1 Then
Var menu_name_eng_hot = NameLang[0][0]
Var menu_desc_eng_hot = DescLang[0][0]
Var menu_name_thai_hot = NameLang[0][1]
Var menu_desc_thai_hot = DescLang[0][1]
Var menu_name_eng_cold = NameLang[1][0]
Var menu_desc_eng_cold = DescLang[1][0]
Var menu_name_thai_cold = NameLang[1][1]
Var menu_desc_thai_cold = DescLang[1][1]
Var menu_name_eng_blender = NameLang[2][0]
Var menu_desc_eng_blender = DescLang[2][0]
Var menu_name_thai_blender = NameLang[2][1]
Var menu_desc_thai_blender = DescLang[2][1]
If show_eng = "true" then
Var NameDrink = aliasName[0]
Var DrinkDescription = aliasDesc[0]
Else
Var NameDrinkTH = aliasName[1]
Var DrinkDescriptionTH = aliasDesc[1]
EndIf
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select7.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
EndIf
</EventUnitTest1>
=======
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
</Popup>