diff --git a/xml/page_board.xml b/xml/page_board.xml index 229490f9..95f3b088 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -52,6 +52,10 @@ Var Seeker.CurrCreditTelNum = "" Var Seeker.CurrCreditPinNum = "" + DEBUGVAR PaySuccessWithDaemonTask + + Var PaidPaymentFromNextStage = 0 + Var DrinkPaid = "-" ; On open diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 1aa96bf3..208c92a9 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -5,6 +5,7 @@ "0xeae6e1" SoundVolume + 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" diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 9b1678a6..cfb25024 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -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 diff --git a/xml/page_main_blank.xml b/xml/page_main_blank.xml index aa58d1c3..eb645588 100644 --- a/xml/page_main_blank.xml +++ b/xml/page_main_blank.xml @@ -1,4 +1,59 @@ 1080 1312 + + DEBUGVAR PaySuccessWithDaemonTask + + + 1000 + + + 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 + diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 7cab1b46..4fdfaf60 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -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" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 1bf3db03..2f3ca35c 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -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 diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index f3373f60..e099f964 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -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 diff --git a/xml/page_payment_codeGLX.xml b/xml/page_payment_codeGLX.xml index 540f4504..7feb2f2b 100644 --- a/xml/page_payment_codeGLX.xml +++ b/xml/page_payment_codeGLX.xml @@ -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 diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index dec85be2..2634f834 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -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 diff --git a/xml/page_payment_codeSCG.xml b/xml/page_payment_codeSCG.xml index 10f55540..493a5f2a 100644 --- a/xml/page_payment_codeSCG.xml +++ b/xml/page_payment_codeSCG.xml @@ -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 diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index b0c2e8b8..594c1ae0 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -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 diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml index 741db3f2..d01d1a13 100644 --- a/xml/page_payment_codeTrue.xml +++ b/xml/page_payment_codeTrue.xml @@ -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 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 647d7e5d..03290804 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -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 diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index bd200b1d..bfdd4f4b 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -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 diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 956c8649..3f18f8be 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -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" diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 607bf290..5949e362 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -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 diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 7e6eb407..612600a5 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -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 diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 7972cc70..fdf1d6e9 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -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