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

Add make not wait

Browse source
This commit is contained in:
kong 2022-08-23 16:48:41 +07:00
parent 43f1521a1e
commit 7a73561ec6
18 changed files with 124 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -52,6 +52,10 @@
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
DEBUGVAR PaySuccessWithDaemonTask
Var PaidPaymentFromNextStage = 0
Var DrinkPaid = "-"
; On open

6
xml/page_brewing3.xml
View file

@ -5,6 +5,7 @@
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var SendNotiPaySuccess = 2
DEBUGVAR TxRef1
@ -678,6 +679,8 @@
EndIf
If MachineState_Result = 1 Then
DEBUGVAR PaySuccessWithDaemonTask
If waitAckPay = 0 Then
Var waitAckPay = 0
@ -790,6 +793,9 @@
EndIf
__CMD "clear-stock-data" 0 "-" "-"
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then
SAVELOG "waitAckPay=0"

4
xml/page_brewing3Conti.xml
View file

@ -538,6 +538,8 @@
EndIf
If MachineState_Result = 1 Then
DEBUGVAR PaySuccessWithDaemonTask
If waitAckPay = 0 Then
Var waitAckPay = 0
@ -651,6 +653,8 @@
EndIf
__CMD "clear-stock-data" 0 "-" "-"
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then

55
xml/page_main_blank.xml
View file

@ -1,4 +1,59 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<EventOpen>
DEBUGVAR PaySuccessWithDaemonTask
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
If PaySuccessWithDaemonTask = 1 Then
DEBUGVAR PaidPaymentFromNextStage
DEBUGVAR LastMakeDrinkResult
; from
If LastMakeDrinkResult = "success" Then
If PaidPaymentFromNextStage = 1 Then
Var DelayForMakeDrink = 0
Var PaidPaymentFromNextStage = 2
EndIf
EndIf
If PaidPaymentFromNextStage = 2 Then
DEBUGVAR HaveCup
DEBUGVAR MachineStage
DEBUGVAR DoorCupPosition
If HaveCup = "false" Then
If DoorCupPosition = "bottom" Then
Topping "Select" next.UserSelectDrinkFromPaid
; Set option toppinng and pack
Topping "Select1-ID" next.UserSelecttopping1Paid
Topping "Select2-ID" next.UserSelecttopping2Paid
Topping "Select3-ID" next.UserSelecttopping3Paid
; Pack
Topping "Pack" ExtendDataCurr
Var DelayForMakeDrink = 2
Var PaidPaymentFromNextStage = 3
EndIf
EndIf
EndIf
EndIf
DEBUGVAR DelayForMakeDrink
If DelayForMakeDrink > 3 Then
DEBUGVAR DelayForMakeDrink
Var DelayForMakeDrink = DelayForMakeDrink - 1
If DelayForMakeDrink = 0 Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
EndIf
; hurr
TimerReset
</EventTimeout>
</Page>

9
xml/page_payment_cash.xml
View file

@ -243,12 +243,17 @@
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -802,12 +807,16 @@
If PayOK = 1 Then
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"

3
xml/page_payment_code.xml
View file

@ -232,6 +232,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeDtac.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeGLX.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeLotus.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeSCG.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeThe1.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeTrue.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_credit2.xml
View file

@ -195,6 +195,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_credit3.xml
View file

@ -170,6 +170,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_storeCredit3.xml
View file

@ -73,6 +73,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"

4
xml/page_thankyouConti.xml
View file

@ -246,7 +246,9 @@
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
If MachineStage = "show-menu" Then
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
;MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf

7
xml/page_topping_select4.xml
View file

@ -2327,6 +2327,13 @@
; Pack
Topping "__pack" ExtendDataNext
next.UserSelectDrinkFromPaid = UserSelectProductCode
next.UserSelecttopping1Paid = topping1
next.UserSelecttopping2Paid = topping2
next.UserSelecttopping3Paid = topping3
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData

6
xml/vending_info.xml
View file

@ -123,6 +123,12 @@
Var Text1_9 = Text1_9 + " "
Var Text1_9 = Text1_9 + SystemDate
Var skr = "curr"
DEBUGVAR skr.NOBONUS
Var skr = "next"
DEBUGVAR skr.NOBONUS
Refresh
TimerReset