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

FIX Var ExtendData

Browse source
This commit is contained in:
kong 2022-05-20 10:27:08 +07:00
parent ec06b3785a
commit 8873cebf00
8 changed files with 73 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xml/page_brewing3.xml
View file

@ -6,7 +6,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG "page_brewing3.xml"
DEBUGVAR MachineStage
Var StrawStateX = "Enable"
@ -21,11 +21,16 @@
EndIf
Var SelectDrink = Seeker.selected_a_drink
Var ExtendData = Seeker.ExtendData
Var ServiceAmount2 = Seeker.ServiceAmount2
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
DEBUGVAR Seeker.ServiceAmount2
DEBUGVAR Seeker.ServiceAmount2
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
; On open move from page_brewing3.xml
Var countClick2 = 0
@ -234,6 +239,8 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
@ -295,6 +302,8 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
@ -423,6 +432,7 @@
If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""

13
xml/page_brewing3Conti.xml
View file

@ -65,15 +65,16 @@
EndIf
Var ExtendData = Seeker.ExtendData
Var SelectDrink = Seeker.selected_a_drink
Var ServiceAmount2 = Seeker.ServiceAmount2
DEBUGVAR Seeker
DEBUGVAR Seeker.selected_a_drink
DEBUGVAR Seeker.ServiceAmount2
DEBUGVAR Seeker.ServiceAmount2
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
; On open move from page_brewing3.xml
@ -145,6 +146,8 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
@ -206,6 +209,8 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
@ -324,6 +329,8 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"

15
xml/page_cannotConti.xml
View file

@ -56,19 +56,20 @@
If Seeker = "curr" Then
SAVELOG "Call from thankyou Conti"
SAVELOG " cannot on curr"
Topping "Select" Seeker.selected_a_drink
;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 "Select1-ID" Seeker.topping1
;Topping "Select2-ID" Seeker.topping2
;Topping "Select3-ID" Seeker.topping3
; Pack
Topping "Pack" ExtendData
; no change
; Topping "Pack" ExtendData
Var ExtendData = Seeker.ExtendData
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData

11
xml/page_drinkok.xml
View file

@ -42,15 +42,8 @@
Machine Lid
EndIf
;If StarwState = "Press" Then
; Machine Straw
; LED LedDoorLid Blink 255 255 255 255
;EndIf
;If LidState = "Press" Then
; Machine Lid
; LED LedDoorLid Blink 255 255 255 255
;EndIf
Var ExtendData = Seeker.ExtendData
; On open
Var LidState = "Enable"

30
xml/page_payment.xml
View file

@ -148,6 +148,7 @@
EndIf
EndIf
EndIf
Else
EndIf
@ -186,8 +187,13 @@
If CountStepPackPayment >= CountStepForCupFlagDelay Then
SAVELOG ExtendData
If Seeker = "curr" Then
Var Seeker.ExtendData = ExtendDataCurr
Else
Var Seeker.ExtendData = ExtendDataNext
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
If GetPayInfoFlag = 0 Then
SaveLog "RoadShow test"
@ -204,7 +210,7 @@
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var SessionID2 = SessionID2 + Seeker.ExtendData
;Var CreditAmount1 = ""
;Var ServiceAmountFlow = ""
@ -244,24 +250,6 @@
DEBUGVAR ExtendData
;If web_readyOK = "true" Then
;
; Var Seeker.selected_a_drink = SelectDrink
; Var Seeker.ServiceAmount2 = PriceDrink
; Var PayAmount = PriceDrink
;
; If web_payment = "CODE" Then
; Open "ROOT/taobin_project/xml/page_payment_code.xml"
; EndIf
;
; If web_payment = "CREDIT" Then
; Open "ROOT/taobin_project/xml/page_payment_credit.xml"
; EndIf
;
;EndIf
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
If Delay = 1 Then

2
xml/page_payment_cash.xml
View file

@ -103,6 +103,8 @@
Var Seeker.CodeChannel = 0
EndIf
Var ExtendData = Seeker.ExtendData
DEBUGVAR QRCODE99KBANK
If RoadShow = "true" Then

32
xml/page_thankyouConti.xml
View file

@ -93,13 +93,18 @@
Topping "Select3-ID" Seeker.topping3
; Pack
Topping "Pack" ExtendData
Topping "Pack" ExtendDataCurr
;Var Seeker.ExtendData = ExtendData ; because save in Seeker.
Var MachineStage = "NextOrder"
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
;Var SessionID2 = SelectSlot + ":"
;Var SessionID2 = SessionID2 + ExtendData
;DEBUGVAR SessionID2
Topping "ClearNextOrder" "-"
EndIf
@ -184,6 +189,25 @@
Var buttonRemoveCup = "Invisible"
EndIf
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
If Timeout = 2 Then

6
xml/page_topping_select4.xml
View file

@ -2269,7 +2269,7 @@
; Pack
Topping "Pack" ExtendDataCurr
Var ExtendData = ExtendDataCurr
Else
Topping "SetNextOrder" UserSelectProductCode
@ -2282,9 +2282,7 @@
; Pack
Topping "__pack" ExtendDataNext
Var ExtendData = ExtendDataNext
EndIf
Var Seeker.PictureDrink = PictureDrink