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

67
inc/button_topping_select_confirm_order.inc
View file

@ -227,6 +227,14 @@ EndIf
Var Seeker.get_a_straw = StrawState
Var Seeker.get_a_lid = LidState
Var Seeker.strMulti6_1 = strMulti6_1
Var Seeker.strMulti6_2 = strMulti6_2
Var Seeker.strMulti6_3 = strMulti6_3
Var Seeker.strMulti6_4 = strMulti6_4
Var Seeker.strMulti6_5 = strMulti6_5
Var Seeker.strMulti6_6 = strMulti6_6
DEBUGVAR Seeker.topping1
DEBUGVAR Seeker.topping2
@ -242,6 +250,12 @@ EndIf
DEBUGVAR Seeker.get_a_straw
DEBUGVAR Seeker.get_a_lid
DEBUGVAR Seeker.strMulti6_1
DEBUGVAR Seeker.strMulti6_2
DEBUGVAR Seeker.strMulti6_3
DEBUGVAR Seeker.strMulti6_4
DEBUGVAR Seeker.strMulti6_5
DEBUGVAR LidState
DEBUGVAR StrawState
DEBUGVAR UserSelectProductCode
@ -284,59 +298,12 @@ EndIf
If Seeker = "curr" Then
;include="ROOT/taobin_project/inc/select_drink_current.inc"
If SelectToppingType = 0 Then
Else
Topping "ClearMultiTopping" "Test 4"
Topping "Multiply6-ID" strMulti6_1
Topping "Multiply6-ID" strMulti6_2
Topping "Multiply6-ID" strMulti6_3
Topping "Multiply6-ID" strMulti6_5
Topping "Multiply6-ID" strMulti6_6
Topping "Pack" ExtendDataCurr
EndIf
;include="ROOT/taobin_project/inc/select_drink_current_multi_topping.inc"
Else
Topping "SetNextOrder" UserSelectProductCode
Topping "__select" UserSelectProductCode
; Set option toppinng and pack
Topping "__select1-id" topping1
Topping "__select2-id" topping2
Topping "__select3-id" topping3
Topping "__select6-id" topping6
Topping "__select7-id" topping7
Topping "__select8-id" topping8
Topping "__select9-id" topping9
Topping "__select10-id" topping10
Topping "__select11-id" topping11
Topping "__select12-id" topping12
Topping "__select13-id" topping13
Topping "__posttopping1-ID" sugarToppingID
; Pack
Topping "__pack" ExtendDataNext
Var NextUserSelectDrinkFromPaid = UserSelectProductCode
Var NextUserSelecttopping1Paid = topping1
Var NextUserSelecttopping2Paid = topping2
Var NextUserSelecttopping3Paid = topping3
Var NextUserSelecttopping6Paid = topping6
Var NextUserSelecttopping7Paid = topping7
Var NextUserSelecttopping8Paid = topping8
Var NextUserSelecttopping9Paid = topping9
Var NextUserSelecttopping10Paid = topping10
Var NextUserSelecttopping11Paid = topping11
Var NextUserSelecttopping12Paid = topping12
Var NextUserSelecttopping13Paid = topping13
; next ignore
EndIf
DEBUGVAR Seeker

40
inc/select_drink_current_multi_topping.inc Normal file
View file

@ -0,0 +1,40 @@
SAVELOG " select_drink_current.inc select_drink_current.inc "
Topping "Select" Seeker.selected_a_drink
; Set option toppinng and pack
Topping "Select1-ID" Seeker.topping1
Topping "Select2-ID" Seeker.topping2
Topping "Select3-ID" Seeker.topping3
Topping "Select6-ID" Seeker.topping6
Topping "Select7-ID" Seeker.topping7
Topping "Select8-ID" Seeker.topping8
Topping "Select9-ID" Seeker.topping9
Topping "Select10-ID" Seeker.topping10
Topping "Select11-ID" Seeker.topping11
Topping "Select12-ID" Seeker.topping12
Topping "Select13-ID" Seeker.topping13
Topping "PostTopping1-ID" Seeker.PostTopping1
; Pack
Topping "ClearMultiTopping" "Current"
Topping "Multiply6-ID" Seeker.strMulti6_1
Topping "Multiply6-ID" Seeker.strMulti6_2
Topping "Multiply6-ID" Seeker.strMulti6_3
Topping "Multiply6-ID" Seeker.strMulti6_5
Topping "Multiply6-ID" Seeker.strMulti6_6
Topping "Pack" ExtendDataCurr
If SaveOrderNameAndPictureEnable = 1 Then
Menu "set-name" Seeker.showname
Menu "set-image" Seeker.PictureDrink
EndIf