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

DO

Browse source
This commit is contained in:
kong 2022-05-19 18:10:37 +07:00
parent be2d7faddb
commit 5e5a371953
5 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_brewing3.xml
View file

@ -233,6 +233,7 @@
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData Var SessionID2 = SessionID2 + Seeker.ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
@ -294,6 +295,7 @@
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData Var SessionID2 = SessionID2 + Seeker.ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
@ -423,7 +425,7 @@
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData Var SessionID2 = SessionID2 + Seeker.ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"

5
xml/page_cannotConti.xml
View file

@ -66,13 +66,16 @@
Topping "Select3-ID" Seeker.topping3 Topping "Select3-ID" Seeker.topping3
; Pack ; Pack
Topping "Pack" Seeker.ExtendData Topping "Pack" ExtendDataCurr
DEBUGVAR ExtendDataCurr
Var Seeker.ExtendData = ExtendDataCurr
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData Var SessionID2 = SessionID2 + Seeker.ExtendData
DEBUGVAR SessionID2
Topping "ClearNextOrder" "-" Topping "ClearNextOrder" "-"
EndIf EndIf

4
xml/page_payment.xml
View file

@ -187,7 +187,7 @@
If CountStepPackPayment >= CountStepForCupFlagDelay Then If CountStepPackPayment >= CountStepForCupFlagDelay Then
SAVELOG Seeker.ExtendData SAVELOG ExtendData
If GetPayInfoFlag = 0 Then If GetPayInfoFlag = 0 Then
SaveLog "RoadShow test" SaveLog "RoadShow test"
@ -240,7 +240,7 @@
; Reset ; Reset
Var MachineState_Result = 0 Var MachineState_Result = 0
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData DEBUGVAR Seeker.ExtendData

13
xml/page_thankyouConti.xml
View file

@ -93,13 +93,16 @@
Topping "Select3-ID" Seeker.topping3 Topping "Select3-ID" Seeker.topping3
; Pack ; Pack
Topping "Pack" Seeker.ExtendData Topping "Pack" ExtendDataCurr
Var Seeker.ExtendData = ExtendDataCurr
Var MachineStage = "NextOrder" Var MachineStage = "NextOrder"
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData Var SessionID2 = SessionID2 + Seeker.ExtendData
DEBUGVAR SessionID2
Topping "ClearNextOrder" "-" Topping "ClearNextOrder" "-"
EndIf EndIf
@ -127,6 +130,7 @@
;Var CountDownThankyou = CountDownThankyou - 1 ;Var CountDownThankyou = CountDownThankyou - 1
DEBUGVAR MachineStage DEBUGVAR MachineStage
DEBUGVAR stop_now
DEBUGVAR CupOnArm DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT DEBUGVAR CART_COUNT
@ -139,6 +143,13 @@
DEBUGVAR NextOrder DEBUGVAR NextOrder
DEBUGVAR DoorCupPosition DEBUGVAR DoorCupPosition
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
If HaveCup = "true" Then If HaveCup = "true" Then
Var Timeout = 0 Var Timeout = 0
Else Else

20
xml/page_topping_select4.xml
View file

@ -947,7 +947,10 @@
If ToppingGotoPayment = "true" Then If ToppingGotoPayment = "true" Then
Topping "Select" SelectDrink Topping "Select" SelectDrink
; Pack ; Pack
Topping "Pack" Seeker.ExtendData
Topping "Pack" ExtendDataCurr
Var Seeker.ExtendDataCurr = ExtendDataCurr
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml" Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf EndIf
@ -2088,7 +2091,9 @@
Topping "Select3-ID" topping3 Topping "Select3-ID" topping3
; Pack ; Pack
Topping "Pack" Seeker.ExtendData Topping "Pack" ExtendData
Var Seeker.ExtendData = ExtendData
If CART1_STATUS = "EMPTY" Then If CART1_STATUS = "EMPTY" Then
Cart "AddMenuID" 1 Cart "AddMenuID" 1
@ -2267,9 +2272,10 @@
Topping "Select3-ID" topping3 Topping "Select3-ID" topping3
; Pack ; Pack
Topping "Pack" Seeker.ExtendDataCurr Topping "Pack" ExtendDataCurr
Var Seeker.ExtendData = ExtendDataCurr
Var Seeker.ExtendData = Seeker.ExtendDataCurr
Else Else
Topping "SetNextOrder" UserSelectProductCode Topping "SetNextOrder" UserSelectProductCode
@ -2280,12 +2286,14 @@
Topping "__select2-id" topping2 Topping "__select2-id" topping2
Topping "__select3-id" topping3 Topping "__select3-id" topping3
; Pack ; Pack
Topping "__pack" Seeker.ExtendDataNext Topping "__pack" ExtendDataNext
Var Seeker.ExtendData = Seeker.ExtendDataNext Var Seeker.ExtendData = ExtendDataNext
EndIf EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
Var Seeker.PictureDrink = PictureDrink Var Seeker.PictureDrink = PictureDrink
Var Seeker.showname = showname Var Seeker.showname = showname