Regan
This commit is contained in:
wanlop run
parent
86a20990bb
commit
1e1894b1a9
6 changed files with 809 additions and 941 deletions
|
|
@ -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.
|
|
|
@ -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>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1091,10 +1091,10 @@ Name=Thick_Tea_By_Brewer,file=page_catalog_group_pro_thick_tea_by_brewer.skt
|
|||
|
||||
|
||||
Name=Winter Wonder
|
||||
IGNORE ซานต้าจินเจอร์ ICED SANTA GINGER ขิง นม น้ำเชื่อมคาราเมล และน้ำ GINGER , MILK, CARAMEL SYRUP AND WATER - 12-03-02-0081 -
|
||||
IGNORE ช็อกโกสโนว์เฟลก CHOCO SNOWFLAKE SMOOTHIE โกโก้ นม น้ำเชื่อมคาราเมล และโอรีโอ้ COCOA, MILK, CARAMEL SYRUP , \nOREO AND ICE - - 12-03-03-0088
|
||||
IGNORE เรนเดียร์เปปเปอร์มินต์ REINDEER PEPPERMINT SMOOTHIE น้ำเชื่อมมินต์ นม น้ำเชื่อมสตรอเบอร์รี่ MINT SYRUP, MILK, STRAWBERRY SYRUP \nAND ICE - - 12-03-03-0089
|
||||
IGNORE คริสมาสต์ คาเฟ ลาเต้ ICED CHRISTMAS CAFE LATTE กาแฟ นม มะนาว น้ำเชื่อมคาราเมล และน้ำ COFFEE, MILK, LIME, CARAMEL SYRUP \nAND WATER - 12-01-02-0084 - 12-21-02-0084
|
||||
ซานต้าจินเจอร์ ICED SANTA GINGER ขิง นม น้ำเชื่อมคาราเมล และน้ำ GINGER , MILK, CARAMEL SYRUP AND WATER - 12-03-02-0081 -
|
||||
ช็อกโกสโนว์เฟลก CHOCO SNOWFLAKE SMOOTHIE โกโก้ นม น้ำเชื่อมคาราเมล และโอรีโอ้ COCOA, MILK, CARAMEL SYRUP , \nOREO AND ICE - - 12-03-03-0088
|
||||
เรนเดียร์เปปเปอร์มินต์ REINDEER PEPPERMINT SMOOTHIE น้ำเชื่อมมินต์ นม น้ำเชื่อมสตรอเบอร์รี่ MINT SYRUP, MILK, STRAWBERRY SYRUP \nAND ICE - - 12-03-03-0089
|
||||
คริสมาสต์ คาเฟ ลาเต้ ICED CHRISTMAS CAFE LATTE กาแฟ นม มะนาว น้ำเชื่อมคาราเมล และน้ำ COFFEE, MILK, LIME, CARAMEL SYRUP \nAND WATER - 12-01-02-0084 - 12-21-02-0084
|
||||
-
|
||||
|
||||
Name=BISCOFF
|
||||
|
|
@ -1108,6 +1108,18 @@ IGNORE คุกกี้ลิ้นจี่นมสดปั่น LYCHEE M
|
|||
IGNORE เซเว่นอัพคุกกี้บัตเตอร์ปั่น 7UP BISCOFF SMOOTHIE 7UP นม บิสคอฟ และน้ำตาล 7UP, MILK, BISCOFF, SUGAR - - 12-03-03-0092
|
||||
|
||||
|
||||
Name=OVALTINE
|
||||
IGNORE โอวัลติน OVALTINE โอวัลติน นม โกโก้ และน้ำตาล OVALTINE, MILK, COCOA, AND SUGAR 12-03-01-0019 12-03-02-0019 12-03-03-0019
|
||||
IGNORE โอวันตินรถโรงเรียนภูเขาไฟ MINI BUS OVANTINE VOLCANO โอวัลติน นม โกโก้ และน้ำตาล OVALTINE, MILK, COCOA, AND SUGAR - - 12-03-03-0094
|
||||
IGNORE โอวันตินรถโรงเรียนซุปเปอร์ภูเขาไฟ MINI BUS OVANTINE SUPER VOLCANO โอวัลติน นม โกโก้ และน้ำตาล OVALTINE, MILK, COCOA, AND SUGAR - - 12-03-03-0095
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
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 - -
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 3.
|
|
|
@ -37,10 +37,7 @@
|
|||
Var block_index_override = 0
|
||||
Var block_index_move = 0
|
||||
</Script>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
;dummy_layout.inc
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
; menu_new_list 53
|
||||
; ==================> Len = 19
|
||||
; 12-03-01-0005 12-03-02-0005 12-03-03-0005
|
||||
|
|
@ -5369,11 +5366,7 @@ VOLCANO" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0094.Button,$Sum1203030094) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0094.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030094) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030094 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
|
||||
|
|
@ -5626,11 +5619,7 @@ VOLCANO" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0095.Button,$Sum1203030095) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0095.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030095) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030095 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </Filename>
|
||||
|
|
@ -10461,11 +10450,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-01-03-0085.Button,$Sum1201030085) </State>
|
||||
=======
|
||||
<State> Flag( 12-01-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1201030085) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1201030085 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -10714,11 +10699,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-21-03-0085.Button,$Sum1221030085) </State>
|
||||
=======
|
||||
<State> Flag( 12-21-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1221030085) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1221030085 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -10968,11 +10949,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-02-03-0086.Button,$Sum1202030086) </State>
|
||||
=======
|
||||
<State> Flag( 12-02-03-0086.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030086) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1202030086 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Thai_Tea_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -11223,11 +11200,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-02-03-0087.Button,$Sum1202030087) </State>
|
||||
=======
|
||||
<State> Flag( 12-02-03-0087.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030087) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1202030087 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -11478,11 +11451,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0090.Button,$Sum1203030090) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0090.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030090) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030090 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -11733,11 +11702,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0091.Button,$Sum1203030091) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0091.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030091) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030091 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Sala_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -11988,11 +11953,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0061.Button,$Sum1203030061) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0061.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030061) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030061 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Cocoa_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -12243,11 +12204,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0093.Button,$Sum1203030093) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0093.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030093) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030093 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Lychee_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
@ -12498,11 +12455,7 @@ Sugar, Biscof" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<<<<<<< HEAD
|
||||
<State> Flag( 12-03-03-0092.Button,$Sum1203030092) </State>
|
||||
=======
|
||||
<State> Flag( 12-03-03-0092.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030092) </State>
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
<Button>
|
||||
<State> $Sum1203030092 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Milk_Sugar_BISCOFF.png" </Filename>
|
||||
|
|
|
|||
|
|
@ -33,10 +33,7 @@
|
|||
Var block_index_override = 0
|
||||
Var block_index_move = 0
|
||||
</Script>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
;dummy_layout.inc
|
||||
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
|
||||
; menu_new_list 12
|
||||
; ==================> Len = 14
|
||||
; - - 12-03-03-0067
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue