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-07-07 10:48:54 +07:00
commit e2960545cd
94 changed files with 161336 additions and 50258 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_payment.xml
View file

@ -405,14 +405,15 @@
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
DEBUGVAR Seeker.NameDrinkPOS
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN
Var param2 = Seeker.NameDrinkPOS
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
STRCONTAIN "size" Seeker.NameDrinkPOS SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.NameDrinkEN "###" 1 PureName
SPLIT Seeker.NameDrinkPOS "###" 1 PureName
Var param2 = PureName
EndIf

33
xml/page_topping_select7.xml
View file

@ -14,7 +14,7 @@
Machine WakeUp
Var EndOfTopping = 0
Var Seeker.orderFromNewTopping = 0
Var TextSelfTestCntColor = "0x746253"
@ -138,9 +138,9 @@
Var CustomCoffeeQuantityText[2] = "16g"
; End Customer Coffee
Var topping12 = 80
Var showShotEnableSoda = "Disable"
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
@ -563,7 +563,7 @@
DEBUGVAR CupRemain
DEBUGVAR CLOSE_ORDER_NOW
If CLOSE_ORDER_NOW = "true" Then
;include="ROOT/taobin_project/inc/return_condition.ev"
EndIf
@ -597,7 +597,7 @@
DEBUGVAR SelectDrinkType
If SelectDrinkType = 1 Then
If MenuReady = "YES" Then
@ -2537,7 +2537,7 @@
DEBUGVAR toppingID2price2
DEBUGVAR toppingID2price3
DEBUGVAR toppingID2price4
DEBUGVAR toppingID9price1
DEBUGVAR toppingID9price2
DEBUGVAR toppingID9price3
@ -7653,6 +7653,7 @@
Var Seeker.NameDrinkEN = menu_name_eng_hot
Var Seeker.NameDrinkTH = menu_name_thai_hot
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot
Var text_hot_color = "0xFFFFFF"
Var text_cold_color = "0x84776F"
@ -7692,6 +7693,7 @@
Var Seeker.NameDrinkEN = menu_name_eng_cold
Var Seeker.NameDrinkTH = menu_name_thai_cold
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold
Var text_hot_color = "0x84776F"
Var text_cold_color = "0xFFFFFF"
@ -7739,6 +7741,7 @@
Var Seeker.NameDrinkEN = menu_name_eng_blender
Var Seeker.NameDrinkTH = menu_name_thai_blender
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender
Var text_hot_color = "0x84776F"
Var text_cold_color = "0x84776F"
@ -8053,7 +8056,7 @@
<FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var PriceDrink = PriceDrinkTmp
SAVELOG "USER press next ( topping ) - new"
@ -8068,27 +8071,27 @@
If StrawState = "Press" Then
Machine StrawOrder
Machine StrawOrder
Var LedLidBlink = "true"
EndIf
If LidState = "Press" Then
Machine LidOrder
Machine LidOrder
Var LedLidBlink = "true"
EndIf
Var StrawState = "Enable"
Var LidState = "Enable"
;
;
Var SelectDrink = UserSelectProductCode
; Set drink
; Set drink
Topping "Select" UserSelectProductCode
; Set option toppinng and pack
; Set option toppinng and pack
Topping "Select1-ID" topping1
Topping "Select2-ID" topping2
Topping "Select3-ID" topping3
@ -8109,7 +8112,7 @@
EndIf
EndIf
EndIf
Var CartUpdate = "true"
</EventClick>
</Button>