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

AUS: update bug case void credit card from branch ausao

Browse source
This commit is contained in:
Pakin 2025-01-09 09:09:06 +07:00
parent dcbe965a9d
commit d9d0d78e7e
2 changed files with 166 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

11
inter/aus/xml/page_brewing3.lxml
View file

@ -15,6 +15,12 @@
SAVELOG "AUS page_brewing3.lxml" SAVELOG "AUS page_brewing3.lxml"
DEBUGVAR MachineStage DEBUGVAR MachineStage
If CoffeeFreeEnable = "true" Then
Var RoadShow = "false"
EndIf
Var PictureFileTextDesctionState = "Enable" Var PictureFileTextDesctionState = "Enable"
@ -1337,11 +1343,13 @@
Var MachineState_Result = 1 Var MachineState_Result = 1
EndIf EndIf
DEBUGVAR MachineStage
DEBUGVAR RoadShow
If MachineStage = "drink-failed" Then If MachineStage = "drink-failed" Then
If RoadShow = "true" Then If RoadShow = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_error.xml" Open "ROOT/taobin_project/xml/page_back_to_error.xml"
Else Else
SAVELOG " drink-failed...."
Var MachineState_Result = 2 Var MachineState_Result = 2
EndIf EndIf
EndIf EndIf
@ -1677,6 +1685,7 @@
DEBUGVAR MachineStage DEBUGVAR MachineStage
DEBUGVAR RoadShow
If MachineStage = "drink-failed" Then If MachineStage = "drink-failed" Then
If RoadShow = "true" Then If RoadShow = "true" Then

307
inter/aus/xml/page_brewing3Conti.xml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
If CoffeeFreeEnable = "true" Then
Var RoadShow = "false"
EndIf
Var ActionOKCase = 0 Var ActionOKCase = 0
Var Seeker = "curr" Var Seeker = "curr"
@ -16,7 +20,7 @@
;Var PayCredit = 0 ;Var PayCredit = 0
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_en" Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
@ -46,12 +50,12 @@
Var EnableTopupCreditBetweenBrew = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then If EnableSelectMenuBetweenBrew = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Enable" Var EnableSelectMenuBetweenBrewBlink = "Enable"
Else Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible" Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf EndIf
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
If Seeker.thankLidFlag = 1 Then If Seeker.thankLidFlag = 1 Then
@ -59,8 +63,8 @@
Var LidStateX = "Invisible" Var LidStateX = "Invisible"
EndIf EndIf
Var TimeoutWaitPay = 10 Var TimeoutWaitPay = 10
Var PayReference = "" Var PayReference = ""
Var PayType = "newpay" Var PayType = "newpay"
Var MachineState_Result = 0 Var MachineState_Result = 0
@ -83,11 +87,11 @@
DEBUGVAR Seeker.ServiceAmount2 DEBUGVAR Seeker.ServiceAmount2
DEBUGVAR Seeker.CodeNumber DEBUGVAR Seeker.CodeNumber
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SessionID2 + ExtendData
; On open move from page_brewing3.xml ; On open move from page_brewing3.xml
Var countClick2 = 0 Var countClick2 = 0
@ -97,7 +101,7 @@
Var AddData = 0 Var AddData = 0
DEBUGVAR Seeker.TNumberTaobinMember DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR Seeker.PointTaobinStr DEBUGVAR Seeker.PointTaobinStr
If Seeker.TNumberTaobinMember = "" Then If Seeker.TNumberTaobinMember = "" Then
@ -107,12 +111,12 @@
Var VendingTSIDTmp1 = VendingTSIDTmp Var VendingTSIDTmp1 = VendingTSIDTmp
Else Else
Var VendingTSIDTmp1 = "" Var VendingTSIDTmp1 = ""
EndIf EndIf
Var BmiYear = Seeker.PointTaobinStr Var BmiYear = Seeker.PointTaobinStr
Var PointCrm = "" Var PointCrm = ""
If Seeker.FromConsent = 1 Then If Seeker.FromConsent = 1 Then
Var PointCrm = "pdpa1" Var PointCrm = "pdpa1"
EndIf EndIf
Var GetScore = VendingTSIDTmp1 Var GetScore = VendingTSIDTmp1
@ -126,13 +130,13 @@
Var AddData = 1 Var AddData = 1
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf
Var VendingTSIDTmp1 = "" Var VendingTSIDTmp1 = ""
EndIf EndIf
If Seeker.VendingCode = "MKFOO" Then If Seeker.VendingCode = "MKFOO" Then
Var AddData = 0 Var AddData = 0
EndIf EndIf
If MyMintEnable = 1 Then If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then If FromMyMintPro = 1 Then
@ -190,9 +194,9 @@
If CreditCardVoid = 1 Then If CreditCardVoid = 1 Then
Var ChangeOK = 2 Var ChangeOK = 2
EndIf EndIf
If ActionOKCase = 1 Then If ActionOKCase = 1 Then
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SessionID2 + ExtendData
@ -205,11 +209,11 @@
Var ECommerce = "" Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
@ -231,31 +235,31 @@
Var ActionOKCase = 2 Var ActionOKCase = 2
SAVELOG "back_to_main from line > 142." SAVELOG "back_to_main from line > 142."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
Else Else
SAVELOG "back_to_main from line > 147." SAVELOG "back_to_main from line > 147."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
Else Else
EndIf EndIf
If waitAckPay = 1 Then If waitAckPay = 1 Then
SAVELOG "waitAckPay = 1" SAVELOG "waitAckPay = 1"
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
</EventActionOk> </EventActionOk>
<EventActionError> <EventActionError>
If ActionOKCase = 1 Then If ActionOKCase = 1 Then
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SessionID2 + ExtendData
@ -268,11 +272,11 @@
Var ECommerce = "" Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
@ -294,23 +298,23 @@
Var ActionOKCase = 2 Var ActionOKCase = 2
SAVELOG "back_to_main from line > 204." SAVELOG "back_to_main from line > 204."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
Else Else
SAVELOG "back_to_main from line > 173." SAVELOG "back_to_main from line > 173."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
Else Else
EndIf EndIf
</EventActionError> </EventActionError>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
@ -336,13 +340,13 @@
If Timeout = 4 Then If Timeout = 4 Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
EndIf EndIf
; run test; ; run test;
;If CountDownBrewing = 40 Then ;If CountDownBrewing = 40 Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml" ; Open "ROOT/taobin_project/xml/page_drinkok.xml"
;EndIf ;EndIf
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkok.xml" ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
@ -350,9 +354,9 @@
If Timeout > 540 Then If Timeout > 540 Then
SAVELOG "back_to_main from line > 217." SAVELOG "back_to_main from line > 217."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
If Timeout > 480 Then If Timeout > 480 Then
Var MachineState_Result = 2 Var MachineState_Result = 2
@ -362,25 +366,25 @@
Var ChangeTimeout = ChangeTimeout + 1 Var ChangeTimeout = ChangeTimeout + 1
EndIf EndIf
If waitAckPay = 1 Then If waitAckPay = 1 Then
If Timeout > 60 Then If Timeout > 60 Then
Var VendingTSIDTmp1 = "" Var VendingTSIDTmp1 = ""
SAVELOG "waitAckPay = 1 tineout > 60" SAVELOG "waitAckPay = 1 tineout > 60"
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
EndIf EndIf
If waitAckPay = 2 Then If waitAckPay = 2 Then
If Timeout > TimeoutWaitPay Then If Timeout > TimeoutWaitPay Then
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SessionID2 + ExtendData
DEBUGVAR SessionID2 DEBUGVAR SessionID2
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"
@ -388,11 +392,11 @@
Var ECommerce = "" Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "/"
@ -412,9 +416,9 @@
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0 ;Var Timeout = 0
EndIf EndIf
SAVELOG "back_to_main from line > 309." SAVELOG "back_to_main from line > 309."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
EndIf EndIf
@ -443,7 +447,7 @@
Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS Var PayDetail = PayDetail + NOBONUS
@ -459,18 +463,18 @@
Var SuggestID = "" Var SuggestID = ""
Var SessionID2 = "" Var SessionID2 = ""
Var PayDetail2 = Seeker.PayDetail2 Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then ;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 315." ; SAVELOG "back_to_main from line > 315."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf ;EndIf
Var waitAckPay = 2 Var waitAckPay = 2
Var TimeoutWaitPay = 45 Var TimeoutWaitPay = 45
Var Timeout = 5 Var Timeout = 5
Var ActionOKCase = 1 Var ActionOKCase = 1
@ -499,7 +503,7 @@
EndIf EndIf
Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS Var PayDetail = PayDetail + NOBONUS
@ -508,23 +512,23 @@
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
Var ServiceType = "coffee" Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink Var ServiceCredit = SelectDrink
Var SuggestID = "" Var SuggestID = ""
Var SessionID2 = "" Var SessionID2 = ""
Var PayDetail2 = Seeker.PayDetail2 Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then ;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 357." ; SAVELOG "back_to_main from line > 357."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf ;EndIf
Var waitAckPay = 2 Var waitAckPay = 2
Var TimeoutWaitPay = 45 Var TimeoutWaitPay = 45
Var Timeout = 5 Var Timeout = 5
Var ActionOKCase = 1 Var ActionOKCase = 1
@ -548,7 +552,7 @@
EndIf EndIf
Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS Var PayDetail = PayDetail + NOBONUS
@ -561,18 +565,18 @@
Var DEE = PayDetail Var DEE = PayDetail
PAYEXT SVT ACC VendingTSIDTmp DEE PAYEXT SVT ACC VendingTSIDTmp DEE
CoinBack CoinBack
Var ActionOKCase = 1 Var ActionOKCase = 1
If Seeker.CodeChannel = 0 Then If Seeker.CodeChannel = 0 Then
SAVELOG "back_to_main from line > 391." SAVELOG "back_to_main from line > 391."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
Var waitAckPay = 2 Var waitAckPay = 2
Var TimeoutWaitPay = 45 Var TimeoutWaitPay = 45
Var Timeout = 5 Var Timeout = 5
@ -589,13 +593,13 @@
If MachineState_Result = 1 Then If MachineState_Result = 1 Then
DEBUGVAR PaySuccessWithDaemonTask DEBUGVAR PaySuccessWithDaemonTask
If waitAckPay = 0 Then
Var waitAckPay = 0 If waitAckPay = 0 Then
Var waitAckPay = 0
Var Timeout = 0 Var Timeout = 0
Var ProcessText = "" Var ProcessText = ""
If Seeker.TNumberTaobinCredit = "" Then If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"
@ -605,7 +609,7 @@
Else Else
Var TelephoneNumber = Seeker.TNumberTaobinMember Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf EndIf
Else Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber Var PayO2 = Seeker.CoffeePinNumber
@ -639,18 +643,18 @@
Var SuggestID = "" Var SuggestID = ""
Var PayDetail = "2/" + HURR_FOREVER Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|" Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel Var PayDetail = PayDetail + Seeker.OrderChanel
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If GetFreeFromError = 1 Then If GetFreeFromError = 1 Then
Var Seeker.CodeChannel = 1 Var Seeker.CodeChannel = 1
Var Seeker.VendingCode = "C48" Var Seeker.VendingCode = "C48"
Var Seeker.CodeNumber = "0000000000" Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2 Var VendingCampaign = ServiceAmount2
@ -673,7 +677,7 @@
Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "/"
If Seeker.CreditCard = 1 Then If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS CashlessReq SUCCESS
;CashlessReq FAIL ;CashlessReq FAIL
@ -681,26 +685,26 @@
Var PayDetail2 = Seeker.PayDetail2 Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else Else
If Seeker.CreditCard = 1 Then If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS CashlessReq SUCCESS
;CashlessReq FAIL ;CashlessReq FAIL
EndIf EndIf
Var PayDetail2 = Seeker.PayDetail2 Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf EndIf
Else Else
;no wait ack pay ;no wait ack pay
Var waitAckPay = 0 Var waitAckPay = 0
Var SVT = "coffee" Var SVT = "coffee"
Var ACC = "0899999999" Var ACC = "0899999999"
@ -712,12 +716,12 @@
EndIf EndIf
PAYEXT SVT ACC VendingTSIDTmp DEE PAYEXT SVT ACC VendingTSIDTmp DEE
CoinBack CoinBack
EndIf EndIf
EndIf EndIf
__CMD "clear-stock-data" 0 "-" "-" __CMD "clear-stock-data" 0 "-" "-"
@ -726,8 +730,8 @@
If waitAckPay = 0 Then If waitAckPay = 0 Then
SAVELOG "waitAckPay = 0 Timeout" SAVELOG "waitAckPay = 0 Timeout"
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
EndIf EndIf
@ -763,18 +767,19 @@
EndIf EndIf
If Seeker.PayWithQR = 0 Then If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then If Seeker.CreditCard = 1 Then
CashlessReq FAIL ;CashlessReq FAIL
Var ChangeFlag = 1 Var ChangeFlag = 1
Var CreditCardVoid = 1 Var CreditCardVoid = 1
Var ChangeOK = 2
Else Else
If Seeker.CodeChannel = 0 Then If Seeker.CodeChannel = 0 Then
If ChangeFlag = 0 Then If ChangeFlag = 0 Then
Var ChangeFlag = 1 Var ChangeFlag = 1
If Seeker.StoreCreditFlag = 1 Then If Seeker.StoreCreditFlag = 1 Then
Var ChangeOK = 2 Var ChangeOK = 2
@ -784,9 +789,9 @@
Else Else
Change ServiceAmount2 Change ServiceAmount2
EndIf EndIf
EndIf EndIf
EndIf EndIf
Else Else
@ -801,9 +806,9 @@
EndIf EndIf
If CoinAmount > 0 Then If CoinAmount > 0 Then
If ChangeFlag = 0 Then If ChangeFlag = 0 Then
Var ChangeFlag = 1 Var ChangeFlag = 1
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
If Seeker.StoreCreditFlag = 1 Then If Seeker.StoreCreditFlag = 1 Then
@ -811,7 +816,7 @@
Else Else
Change ServiceAmount3 Change ServiceAmount3
EndIf EndIf
EndIf EndIf
Else Else
Var ChangeOK = 2 Var ChangeOK = 2
@ -825,23 +830,23 @@
Var ChangeOK = 3 Var ChangeOK = 3
EndIf EndIf
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
EndIf EndIf
EndIf EndIf
@ -876,13 +881,13 @@
Var EnableTopupCreditBetweenBrew = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then If EnableSelectMenuBetweenBrew = "Enable" Then
If EnableSelectMenuBetweenBrewBlink = "Enable" Then If EnableSelectMenuBetweenBrewBlink = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Invisible" Var EnableSelectMenuBetweenBrewBlink = "Invisible"
Else Else
Var EnableSelectMenuBetweenBrewBlink = "Enable" Var EnableSelectMenuBetweenBrewBlink = "Enable"
EndIf EndIf
Else Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible" Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf EndIf
@ -893,7 +898,7 @@
Var CountUpBrewing = CountUpBrewing + 1 Var CountUpBrewing = CountUpBrewing + 1
Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
If PreviseStepVideo = SlotVideo Then If PreviseStepVideo = SlotVideo Then
;SAVELOG SlotVideo ;SAVELOG SlotVideo
Else Else
@ -903,9 +908,9 @@
;SAVELOG CountUpBrewing ;SAVELOG CountUpBrewing
;Var CountDownVideoTime = CountDownVideoTimeReload ;Var CountDownVideoTime = CountDownVideoTimeReload
Var StepVideo = SlotVideo + 2 Var StepVideo = SlotVideo + 2
;SAVELOG StepVideo ;SAVELOG StepVideo
If StepVideo = 1 Then If StepVideo = 1 Then
@ -954,7 +959,7 @@
Var PictureFile = PictureFile + PictureBegin Var PictureFile = PictureFile + PictureBegin
Var PictureFile = PictureFile + videoID Var PictureFile = PictureFile + videoID
Var PictureFile = PictureFile + PictureEnd Var PictureFile = PictureFile + PictureEnd
DEBUGVAR VideoPlayFile DEBUGVAR VideoPlayFile
DEBUGVAR PictureFile DEBUGVAR PictureFile
EndIf EndIf
@ -963,7 +968,7 @@
EndIf EndIf
If IgnoreNetCore = "true" Then If IgnoreNetCore = "true" Then
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then
SAVELOG "CountDownBrewing = 0" SAVELOG "CountDownBrewing = 0"
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
@ -989,23 +994,23 @@
Var ButtonGamePressToPlayState = "Invisible" Var ButtonGamePressToPlayState = "Invisible"
Var Game01Enable = 0 Var Game01Enable = 0
EndIf EndIf
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
<EventMachine> <EventMachine>
</EventMachine> </EventMachine>
; this copy in file menu_brew2.xml and menu_lid_straw.xml ; this copy in file menu_brew2.xml and menu_lid_straw.xml
<EventChangeStatus> <EventChangeStatus>
If ChangeStatus = "payout-end" Then If ChangeStatus = "payout-end" Then
If ChangeFlag = 1 Then If ChangeFlag = 1 Then
Var ChangeOK = 2 Var ChangeOK = 2
EndIf EndIf
@ -1088,9 +1093,9 @@
<State>EnableSelectMenuBetweenBrew</State> <State>EnableSelectMenuBetweenBrew</State>
<Filename> next_pic_bn </Filename> <Filename> next_pic_bn </Filename>
<FilenamePress> next_pic_bp </FilenamePress> <FilenamePress> next_pic_bp </FilenamePress>
<EventClick> <EventClick>
If MachineState_Result = 0 Then If MachineState_Result = 0 Then
SAVELOG "User click next button" SAVELOG "User click next button"
Var Seeker = "next" Var Seeker = "next"
@ -1098,9 +1103,9 @@
CoinPause CoinPause
Var PayCredit = 0 Var PayCredit = 0
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf EndIf
</EventClick> </EventClick>
</Button> </Button>
<Button> <Button>
@ -1109,7 +1114,7 @@
<State>EnableTopupCreditBetweenBrew</State> <State>EnableTopupCreditBetweenBrew</State>
<Filename> topup_credit_bn </Filename> <Filename> topup_credit_bn </Filename>
<FilenamePress> topup_credit_bp </FilenamePress> <FilenamePress> topup_credit_bp </FilenamePress>
<EventClick> <EventClick>
If MachineState_Result = 0 Then If MachineState_Result = 0 Then
If NextOrder = "true" Then If NextOrder = "true" Then
@ -1123,20 +1128,20 @@
Var SeekerTmp = "curr" Var SeekerTmp = "curr"
Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
EndIf EndIf
SAVELOG "User click topup-credit button" SAVELOG "User click topup-credit button"
Var Seeker = "topupCredit" Var Seeker = "topupCredit"
CoinPause CoinPause
Var PayCredit = 0 Var PayCredit = 0
If TelephoneNumber = "" Then If TelephoneNumber = "" Then
Open "ROOT/taobin_project/xml/page_topup_credit.xml" Open "ROOT/taobin_project/xml/page_topup_credit.xml"
Else Else
Open "ROOT/taobin_project/xml/page_topup_credit-ChooseNumber.xml" Open "ROOT/taobin_project/xml/page_topup_credit-ChooseNumber.xml"
EndIf EndIf
EndIf EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -1154,7 +1159,7 @@
<X> 526 </X> <X> 526 </X>
<Y> 1680 </Y> <Y> 1680 </Y>
<Width> 241 </Width> <Width> 241 </Width>
<Height> 204 </Height> <Height> 204 </Height>
<State> ButtonGamePressToPlayState </State> <State> ButtonGamePressToPlayState </State>
<EventClick> <EventClick>
DEBUGVAR Game01Enable DEBUGVAR Game01Enable
@ -1172,9 +1177,9 @@
<Y> 500 </Y> <Y> 500 </Y>
<State>bg_strawlid_ST</State> <State>bg_strawlid_ST</State>
<Filename> bg_strawlid </Filename> <Filename> bg_strawlid </Filename>
<EventClick> <EventClick>
</EventClick> </EventClick>
</Button> </Button>
; straw left ; straw left
@ -1186,14 +1191,14 @@
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
<EventClick> <EventClick>
SAVELOG "Click straw cb" SAVELOG "Click straw cb"
If StrawStateX = "Press" Then If StrawStateX = "Press" Then
;Var StrawStateX = "Enable" ;Var StrawStateX = "Enable"
Else Else
Var StrawStateX = "Press" Var StrawStateX = "Press"
Var Seeker.strawAction = 1 Var Seeker.strawAction = 1
EndIf EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -1207,10 +1212,10 @@
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick> <EventClick>
SAVELOG "Click straw cb" SAVELOG "Click straw cb"
If StrawStateX = "Press" Then If StrawStateX = "Press" Then
;Var StrawStateX = "Enable" ;Var StrawStateX = "Enable"
Else Else
Var StrawStateX = "Press" Var StrawStateX = "Press"
Var Seeker.strawAction = 1 Var Seeker.strawAction = 1
@ -1230,18 +1235,18 @@
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
<EventClick> <EventClick>
If Seeker.thankLidFlag = 0 Then If Seeker.thankLidFlag = 0 Then
SAVELOG "Click LID pic" SAVELOG "Click LID pic"
If LidStateX = "Press" Then If LidStateX = "Press" Then
;Var LidStateX = "Enable" ;Var LidStateX = "Enable"
Else Else
Var LidStateX = "Press" Var LidStateX = "Press"
Var Seeker.lidAction = 1 Var Seeker.lidAction = 1
EndIf EndIf
DEBUGVAR SugarState1 DEBUGVAR SugarState1
Refresh Refresh
@ -1259,19 +1264,19 @@
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick> <EventClick>
If Seeker.thankLidFlag = 0 Then If Seeker.thankLidFlag = 0 Then
SAVELOG "Click LID cb" SAVELOG "Click LID cb"
If LidStateX = "Press" Then If LidStateX = "Press" Then
;Var LidStateX = "Enable" ;Var LidStateX = "Enable"
Else Else
Var LidStateX = "Press" Var LidStateX = "Press"
Var Seeker.lidAction = 1 Var Seeker.lidAction = 1
EndIf EndIf
Refresh Refresh
EndIf EndIf
</EventClick> </EventClick>
@ -1284,7 +1289,7 @@
<State> ButtonGameCountDownState </State> <State> ButtonGameCountDownState </State>
<Filename> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </Filename> <Filename> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </FilenamePress>
<EventClick> <EventClick>
</EventClick> </EventClick>
<Text> <Text>