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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2025-03-20 11:02:35 +07:00
commit 9b90b9a6f6
21 changed files with 687 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xml/page_catalog_group_pro_kingdom_thai_tea.xml
View file

@ -308,7 +308,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northern Cocoa"
Var NameDrink = "Western Cocoa Thai Milk Tea"
Var NameDrinkTH = "โกโก้หริกุญชัย"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล โกโก้ คาราเมล"
Var DrinkDescription = "Thai Tea Milk Sugar Cocoa Caramel"
@ -403,7 +403,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Cocoa" </Value>
<Value> "Western Cocoa Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -563,7 +563,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northern Strawberry Tea"
Var NameDrink = "Northern Strawberry Thai Milk Tea"
Var NameDrinkTH = "สตรอว์เบอร์รีล้านนา"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม สตรอเบอรี"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Strawberry"
@ -658,7 +658,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Strawberry Tea" </Value>
<Value> "Northern Strawberry Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -818,7 +818,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Southern Coconut Thai Tea"
Var NameDrink = "Southern Coconut Thai Milk Tea"
Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@ -913,7 +913,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Southern Coconut Thai Tea" </Value>
<Value> "Southern Coconut Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1073,7 +1073,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northeastern Lychee Thai Tea"
Var NameDrink = "Northeastern Lychee Thai Milk Tea"
Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
@ -1168,7 +1168,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northeastern Lychee Thai Tea" </Value>
<Value> "Northeastern Lychee Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1328,7 +1328,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Western Ume Tea"
Var NameDrink = "Eastern Ume Thai Milk Tea"
Var NameDrinkTH = "ชาบ๊วยทวารวดี"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล บ๊วย"
Var DrinkDescription = "Thai Tea Milk Sugar Ume"
@ -1423,7 +1423,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Western Ume Tea" </Value>
<Value> "Eastern Ume Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>

20
xml/page_catalog_group_tea.xml
View file

@ -1336,7 +1336,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northern Cocoa"
Var NameDrink = "Western Cocoa Thai Milk Tea"
Var NameDrinkTH = "โกโก้หริกุญชัย"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล โกโก้ คาราเมล"
Var DrinkDescription = "Thai Tea Milk Sugar Cocoa Caramel"
@ -1431,7 +1431,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Cocoa" </Value>
<Value> "Western Cocoa Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1591,7 +1591,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northern Strawberry Tea"
Var NameDrink = "Northern Strawberry Thai Milk Tea"
Var NameDrinkTH = "สตรอว์เบอร์รีล้านนา"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม สตรอเบอรี"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Strawberry"
@ -1686,7 +1686,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Strawberry Tea" </Value>
<Value> "Northern Strawberry Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1846,7 +1846,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Southern Coconut Thai Tea"
Var NameDrink = "Southern Coconut Thai Milk Tea"
Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@ -1941,7 +1941,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Southern Coconut Thai Tea" </Value>
<Value> "Southern Coconut Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2101,7 +2101,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northeastern Lychee Thai Tea"
Var NameDrink = "Northeastern Lychee Thai Milk Tea"
Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
@ -2196,7 +2196,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northeastern Lychee Thai Tea" </Value>
<Value> "Northeastern Lychee Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2356,7 +2356,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Western Ume Tea"
Var NameDrink = "Eastern Ume Thai Milk Tea"
Var NameDrinkTH = "ชาบ๊วยทวารวดี"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล บ๊วย"
Var DrinkDescription = "Thai Tea Milk Sugar Ume"
@ -2451,7 +2451,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Western Ume Tea" </Value>
<Value> "Eastern Ume Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>

5
xml/page_thankyouConti.xml
View file

@ -88,7 +88,10 @@
Var bg_lidProblem_ST = "Enable"
EndIf
;include="ROOT/taobin_project/inc/select_drink_current.inc"
;include="ROOT/taobin_project/inc/select_drink_current_multi_topping.inc"
Topping "ClearNextOrder" "-"

16
xml/page_topping_select8.xml
View file

@ -1461,6 +1461,13 @@
DEBUGVAR toppingID6index5
DEBUGVAR toppingID6index6
DEBUGVAR toppingID6index1Status
DEBUGVAR toppingID6index2Status
DEBUGVAR toppingID6index3Status
DEBUGVAR toppingID6index4Status
DEBUGVAR toppingID6index5Status
DEBUGVAR toppingID6index6Status
DEBUGVAR toppingID7index1
DEBUGVAR toppingID7index2
DEBUGVAR toppingID7index3
@ -10057,11 +10064,14 @@
DEBUGVAR TOPPING_PRICE
; Oreo
Var strMulti6_1 = "TPID:321+multiply:0"
Var strMulti6_1 = ""
; Ovaltine
Var strMulti6_2 = "TPID:323+multiply:0"
Var strMulti6_2 = ""
; Coaco
Var strMulti6_3 = "TPID:322+multiply:0"
Var strMulti6_3 = ""
Var strMulti6_4 = ""
Var strMulti6_5 = ""
Var strMulti6_6 = ""
If showOreoAddEnable = "Press" Then