From d9d0d78e7e5240bb3e42962dabf025b13c7ce231 Mon Sep 17 00:00:00 2001 From: Pakin Date: Thu, 9 Jan 2025 09:09:06 +0700 Subject: [PATCH] AUS: update bug case void credit card from branch ausao --- inter/aus/xml/page_brewing3.lxml | 11 +- inter/aus/xml/page_brewing3Conti.xml | 307 ++++++++++++++------------- 2 files changed, 166 insertions(+), 152 deletions(-) diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index b79d3abc..627efa18 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -15,6 +15,12 @@ SAVELOG "AUS page_brewing3.lxml" DEBUGVAR MachineStage + + If CoffeeFreeEnable = "true" Then + Var RoadShow = "false" + EndIf + + Var PictureFileTextDesctionState = "Enable" @@ -1337,11 +1343,13 @@ Var MachineState_Result = 1 EndIf + DEBUGVAR MachineStage + DEBUGVAR RoadShow + If MachineStage = "drink-failed" Then If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_back_to_error.xml" Else - SAVELOG " drink-failed...." Var MachineState_Result = 2 EndIf EndIf @@ -1677,6 +1685,7 @@ DEBUGVAR MachineStage + DEBUGVAR RoadShow If MachineStage = "drink-failed" Then If RoadShow = "true" Then diff --git a/inter/aus/xml/page_brewing3Conti.xml b/inter/aus/xml/page_brewing3Conti.xml index bdc5284f..1da90519 100644 --- a/inter/aus/xml/page_brewing3Conti.xml +++ b/inter/aus/xml/page_brewing3Conti.xml @@ -6,6 +6,10 @@ SoundVolume + If CoffeeFreeEnable = "true" Then + Var RoadShow = "false" + EndIf + Var ActionOKCase = 0 Var Seeker = "curr" @@ -16,7 +20,7 @@ ;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 DirImage2 = "ROOT/taobin_project/image/topping2_en" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" @@ -46,12 +50,12 @@ Var EnableTopupCreditBetweenBrew = "Invisible" EndIf - If EnableSelectMenuBetweenBrew = "Enable" Then + If EnableSelectMenuBetweenBrew = "Enable" Then Var EnableSelectMenuBetweenBrewBlink = "Enable" Else Var EnableSelectMenuBetweenBrewBlink = "Invisible" EndIf - + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" If Seeker.thankLidFlag = 1 Then @@ -59,8 +63,8 @@ Var LidStateX = "Invisible" EndIf - Var TimeoutWaitPay = 10 - + Var TimeoutWaitPay = 10 + Var PayReference = "" Var PayType = "newpay" Var MachineState_Result = 0 @@ -83,11 +87,11 @@ DEBUGVAR Seeker.ServiceAmount2 DEBUGVAR Seeker.CodeNumber - + Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData - - + + ; On open move from page_brewing3.xml Var countClick2 = 0 @@ -97,7 +101,7 @@ Var AddData = 0 - DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.TNumberTaobinMember DEBUGVAR Seeker.PointTaobinStr If Seeker.TNumberTaobinMember = "" Then @@ -107,12 +111,12 @@ Var VendingTSIDTmp1 = VendingTSIDTmp Else Var VendingTSIDTmp1 = "" - EndIf + EndIf Var BmiYear = Seeker.PointTaobinStr Var PointCrm = "" - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSIDTmp1 @@ -126,13 +130,13 @@ Var AddData = 1 ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore EndIf - + Var VendingTSIDTmp1 = "" EndIf If Seeker.VendingCode = "MKFOO" Then Var AddData = 0 - EndIf + EndIf If MyMintEnable = 1 Then If FromMyMintPro = 1 Then @@ -190,9 +194,9 @@ If CreditCardVoid = 1 Then Var ChangeOK = 2 EndIf - + If ActionOKCase = 1 Then - If Seeker.CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -205,11 +209,11 @@ Var ECommerce = "" Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + "/" @@ -231,31 +235,31 @@ Var ActionOKCase = 2 SAVELOG "back_to_main from line > 142." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - - Else + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else SAVELOG "back_to_main from line > 147." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf - + Else - + EndIf - If waitAckPay = 1 Then + If waitAckPay = 1 Then SAVELOG "waitAckPay = 1" - Open "ROOT/taobin_project/xml/page_drinkok.xml" - + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf If ActionOKCase = 1 Then - If Seeker.CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -268,11 +272,11 @@ Var ECommerce = "" Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + "/" @@ -294,23 +298,23 @@ Var ActionOKCase = 2 SAVELOG "back_to_main from line > 204." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - - Else + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else SAVELOG "back_to_main from line > 173." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf - + Else - + EndIf 1000 - + Var Timeout = Timeout + 1 @@ -336,13 +340,13 @@ If Timeout = 4 Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" EndIf - + ; run test; - ;If CountDownBrewing = 40 Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf If CountDownBrewing = 0 Then - ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf Var ShowCountDownBrewing = CountDownBrewing @@ -350,9 +354,9 @@ If Timeout > 540 Then SAVELOG "back_to_main from line > 217." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf - + If Timeout > 480 Then Var MachineState_Result = 2 @@ -362,25 +366,25 @@ Var ChangeTimeout = ChangeTimeout + 1 EndIf - If waitAckPay = 1 Then + If waitAckPay = 1 Then If Timeout > 60 Then Var VendingTSIDTmp1 = "" SAVELOG "waitAckPay = 1 tineout > 60" - - Open "ROOT/taobin_project/xml/page_drinkok.xml" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf EndIf - If waitAckPay = 2 Then + If waitAckPay = 2 Then If Timeout > TimeoutWaitPay Then - If Seeker.CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData DEBUGVAR SessionID2 - + Var CreditAmount1 = "" Var ServiceAmountFlow = "" Var TelephoneNumber = "0899999999" @@ -388,11 +392,11 @@ Var ECommerce = "" Var ECommerce = ECommerce + PriceDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + DiscountDrink Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + SessionID2 Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + SelectDrink Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + Seeker.VendingCode Var ECommerce = ECommerce + "/" @@ -412,9 +416,9 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 EndIf - + 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 @@ -443,7 +447,7 @@ Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS @@ -459,18 +463,18 @@ Var SuggestID = "" Var SessionID2 = "" - + Var PayDetail2 = Seeker.PayDetail2 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." - ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ;EndIf Var waitAckPay = 2 - Var TimeoutWaitPay = 45 + Var TimeoutWaitPay = 45 Var Timeout = 5 Var ActionOKCase = 1 @@ -499,7 +503,7 @@ EndIf Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" 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 ServiceType = "coffee" Var ServiceCredit = SelectDrink Var SuggestID = "" Var SessionID2 = "" - + Var PayDetail2 = Seeker.PayDetail2 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." - ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ;EndIf Var waitAckPay = 2 - Var TimeoutWaitPay = 45 + Var TimeoutWaitPay = 45 Var Timeout = 5 Var ActionOKCase = 1 @@ -548,7 +552,7 @@ EndIf Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS @@ -561,18 +565,18 @@ Var DEE = PayDetail PAYEXT SVT ACC VendingTSIDTmp DEE - + CoinBack - - + + Var ActionOKCase = 1 - If Seeker.CodeChannel = 0 Then + If Seeker.CodeChannel = 0 Then SAVELOG "back_to_main from line > 391." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf Var waitAckPay = 2 - Var TimeoutWaitPay = 45 + Var TimeoutWaitPay = 45 Var Timeout = 5 @@ -589,13 +593,13 @@ If MachineState_Result = 1 Then DEBUGVAR PaySuccessWithDaemonTask - - If waitAckPay = 0 Then - Var waitAckPay = 0 + If waitAckPay = 0 Then + + Var waitAckPay = 0 Var Timeout = 0 - Var ProcessText = "" + Var ProcessText = "" If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" @@ -605,7 +609,7 @@ Else Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf - + Else Var TelephoneNumber = Seeker.TNumberTaobinCredit Var PayO2 = Seeker.CoffeePinNumber @@ -639,18 +643,18 @@ Var SuggestID = "" Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS Var PayDetail = PayDetail + "/XML|" 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" If GetFreeFromError = 1 Then - Var Seeker.CodeChannel = 1 + Var Seeker.CodeChannel = 1 Var Seeker.VendingCode = "C48" Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 @@ -673,7 +677,7 @@ Var SessionID2 = SessionID2 + "/" If Seeker.CreditCard = 1 Then - + CashlessReq SUCCESS ;CashlessReq FAIL @@ -681,26 +685,26 @@ Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - + If Seeker.CreditCard = 1 Then - + CashlessReq SUCCESS ;CashlessReq FAIL - + EndIf Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf - + Else ;no wait ack pay - Var waitAckPay = 0 + Var waitAckPay = 0 Var SVT = "coffee" Var ACC = "0899999999" @@ -712,12 +716,12 @@ EndIf PAYEXT SVT ACC VendingTSIDTmp DEE - + CoinBack - + EndIf - + EndIf __CMD "clear-stock-data" 0 "-" "-" @@ -726,8 +730,8 @@ If waitAckPay = 0 Then SAVELOG "waitAckPay = 0 Timeout" - - Open "ROOT/taobin_project/xml/page_drinkok.xml" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf EndIf @@ -763,18 +767,19 @@ EndIf - If Seeker.PayWithQR = 0 Then + If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then - CashlessReq FAIL - Var ChangeFlag = 1 + ;CashlessReq FAIL + Var ChangeFlag = 1 Var CreditCardVoid = 1 + Var ChangeOK = 2 Else - + If Seeker.CodeChannel = 0 Then If ChangeFlag = 0 Then - Var ChangeFlag = 1 + Var ChangeFlag = 1 If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 @@ -784,9 +789,9 @@ Else Change ServiceAmount2 EndIf - + EndIf - + EndIf Else @@ -801,9 +806,9 @@ EndIf If CoinAmount > 0 Then - + If ChangeFlag = 0 Then - Var ChangeFlag = 1 + Var ChangeFlag = 1 Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign If Seeker.StoreCreditFlag = 1 Then @@ -811,7 +816,7 @@ Else Change ServiceAmount3 EndIf - + EndIf Else Var ChangeOK = 2 @@ -825,23 +830,23 @@ Var ChangeOK = 3 EndIf - - - - - - + + + + + + ;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/test_video_loop.xml" ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" - + EndIf EndIf @@ -876,13 +881,13 @@ Var EnableTopupCreditBetweenBrew = "Invisible" EndIf - If EnableSelectMenuBetweenBrew = "Enable" Then - If EnableSelectMenuBetweenBrewBlink = "Enable" Then + If EnableSelectMenuBetweenBrew = "Enable" Then + If EnableSelectMenuBetweenBrewBlink = "Enable" Then Var EnableSelectMenuBetweenBrewBlink = "Invisible" Else Var EnableSelectMenuBetweenBrewBlink = "Enable" EndIf - + Else Var EnableSelectMenuBetweenBrewBlink = "Invisible" EndIf @@ -893,7 +898,7 @@ Var CountUpBrewing = CountUpBrewing + 1 Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime - + If PreviseStepVideo = SlotVideo Then ;SAVELOG SlotVideo Else @@ -903,9 +908,9 @@ ;SAVELOG CountUpBrewing ;Var CountDownVideoTime = CountDownVideoTimeReload - + Var StepVideo = SlotVideo + 2 - + ;SAVELOG StepVideo If StepVideo = 1 Then @@ -954,7 +959,7 @@ Var PictureFile = PictureFile + PictureBegin Var PictureFile = PictureFile + videoID Var PictureFile = PictureFile + PictureEnd - + DEBUGVAR VideoPlayFile DEBUGVAR PictureFile EndIf @@ -963,7 +968,7 @@ EndIf - If IgnoreNetCore = "true" Then + If IgnoreNetCore = "true" Then If CountDownBrewing = 0 Then SAVELOG "CountDownBrewing = 0" Open "ROOT/taobin_project/xml/page_drinkok.xml" @@ -989,23 +994,23 @@ Var ButtonGamePressToPlayState = "Invisible" Var Game01Enable = 0 EndIf - - + + Refresh TimerReset - + - + ; this copy in file menu_brew2.xml and menu_lid_straw.xml - If ChangeStatus = "payout-end" Then + If ChangeStatus = "payout-end" Then If ChangeFlag = 1 Then Var ChangeOK = 2 EndIf @@ -1088,9 +1093,9 @@ EnableSelectMenuBetweenBrew next_pic_bn next_pic_bp - + If MachineState_Result = 0 Then - + SAVELOG "User click next button" Var Seeker = "next" @@ -1098,9 +1103,9 @@ CoinPause Var PayCredit = 0 - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - + @@ -1154,7 +1159,7 @@ 526 1680 241 - 204 + 204 ButtonGamePressToPlayState DEBUGVAR Game01Enable @@ -1172,9 +1177,9 @@ 500 bg_strawlid_ST bg_strawlid - + - + ; straw left @@ -1186,14 +1191,14 @@ "ROOT/taobin_project/image/topping2/bn_straw.png" "ROOT/taobin_project/image/topping2/bp_straw.png" "ROOT/taobin_project/image/topping2/bd_straw.png" - + SAVELOG "Click straw cb" If StrawStateX = "Press" Then - ;Var StrawStateX = "Enable" + ;Var StrawStateX = "Enable" Else Var StrawStateX = "Press" Var Seeker.strawAction = 1 - + EndIf Refresh @@ -1207,10 +1212,10 @@ "ROOT/taobin_project/image/topping2/cb_notcheck.png" "ROOT/taobin_project/image/topping2/cb_checked.png" Var( DirImage + "/cb_checkdis.png" ) - + SAVELOG "Click straw cb" If StrawStateX = "Press" Then - ;Var StrawStateX = "Enable" + ;Var StrawStateX = "Enable" Else Var StrawStateX = "Press" Var Seeker.strawAction = 1 @@ -1230,18 +1235,18 @@ "ROOT/taobin_project/image/topping2/bn_lid.png" "ROOT/taobin_project/image/topping2/bp_lid.png" Var( DirImage + "/bd_lid.png" ) - + If Seeker.thankLidFlag = 0 Then - + SAVELOG "Click LID pic" If LidStateX = "Press" Then - ;Var LidStateX = "Enable" + ;Var LidStateX = "Enable" Else Var LidStateX = "Press" Var Seeker.lidAction = 1 EndIf - + DEBUGVAR SugarState1 Refresh @@ -1259,19 +1264,19 @@ "ROOT/taobin_project/image/topping2/cb_notcheck.png" "ROOT/taobin_project/image/topping2/cb_checked.png" Var( DirImage + "/cb_checkdis.png" ) - + If Seeker.thankLidFlag = 0 Then SAVELOG "Click LID cb" If LidStateX = "Press" Then - ;Var LidStateX = "Enable" + ;Var LidStateX = "Enable" Else Var LidStateX = "Press" Var Seeker.lidAction = 1 EndIf Refresh - + EndIf @@ -1284,7 +1289,7 @@ ButtonGameCountDownState "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" - +