diff --git a/inter/mys/xml/page_brewing3.lxml b/inter/mys/xml/page_brewing3.lxml
index 5ceb3788..ea7ebdb2 100644
--- a/inter/mys/xml/page_brewing3.lxml
+++ b/inter/mys/xml/page_brewing3.lxml
@@ -591,1093 +591,8 @@
Refresh
-
-
- If CreditCardVoid = 1 Then
- Var ChangeOK = 2
- EndIf
-
-
- If ActionOKCase = 1 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
- DEBUGVAR SessionID2
-
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
- ;Var Timeout = 0
- Var ActionOKCase = 2
-
- SAVELOG "back_to_main from line > 142."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
-
- Else
-
- SAVELOG "back_to_main from line > 147."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Else
-
-
-
- EndIf
-
- If waitAckPay = 1 Then
- SAVELOG "waitAckPay = 1"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
-
- EndIf
-
-
-
-
- If ActionOKCase = 1 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
- DEBUGVAR SessionID2
-
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
- ;Var Timeout = 0
- Var ActionOKCase = 2
-
- SAVELOG "back_to_main from line > 204."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
-
- Else
- SAVELOG "back_to_main from line > 173."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Else
-
-
-
- EndIf
-
-
-
- 1000
-
-
-
- Var Timeout = Timeout + 1
-
- If Timeout < 2 Then
- If Game01Enable = 0 Then
- If game_mode_enable = "true" Then
- If BREW_CNT > 75 Then
- SAVELOG "Button game enable from EventTimeout"
- Var Game01Enable = 1
- Var ButtonGameCountDownState = "Invisible"
- Var ButtonGamePressToPlayState = "Enable"
-
- EndIf
- EndIf
- EndIf
-
- EndIf
-
- DEBUGVAR MachineState_Result
- DEBUGVAR BREW_COUNT_DOWN_FROM_APP
-
-
- If MOVE_CUP_TO_DOOR = "true" Then
- Var MOVE_CUP_TO_DOOR = "false"
- EndIf
-
- If BREW_COUNT_DOWN_FROM_APP = "on" Then
- Var CountDownBrewing = BREW_CNT
- Else
-
- If CountDownBrewing > 0 Then
- Var CountDownBrewing = CountDownBrewing - 1
- EndIf
- Endif
-
- ;If Simulation = "true" Then
- ; If CountDownBrewing = 0 Then
- ; ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
- ; EndIf
- ;EndIf
-
-
- If SelectMenuBetweenBrewEnable1 = "Enable" Then
- If Timeout = 5 Then
- If show_eng = "true" Then
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
- Else
-
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
-
- ; Play Sound #zone
- If SoundBackToSchoolEnable = 1 Then
-
- If SoundBackToSchoolType = 1 Then
- Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
- EndIf
- If SoundBackToSchoolType = 2 Then
- Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
- EndIf
- Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav"
- EndIf
-
- PlayLong PlaySoundLag
- EndIf
- EndIf
- If Timeout = 9 Then
- If OpenFromCollectPoint3 = 0 Then
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
- EndIf
- EndIf
- Else
- If Timeout = 4 Then
- If OpenFromCollectPoint3 = 0 Then
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
- EndIf
- EndIf
- EndIf
-
- ; run test;
- ;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"
- ;EndIf
-
- Var ShowCountDownBrewing = CountDownBrewing
-
-
- If Timeout > 540 Then
- SAVELOG "back_to_main from line > 217."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
-
- If BREW_CNT = 0 Then
- If CountUpWhenBREW_CNT > 56 Then
- Var CountUpWhenBREW_CNT = 0
- Var drink_success_set = "-"
- READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
- DEBUGVAR drink_success_set
- If drink_success_set = "1" Then
- Var MachineState_Result = 1
- EndIf
-
- EndIf
-
- Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
-
- EndIf
-
- If Timeout > 480 Then
- SAVELOG " Timeout > 480"
- Var MachineState_Result = 2
- EndIf
-
- If ChangeFlag = 1 Then
- Var ChangeTimeout = ChangeTimeout + 1
- EndIf
-
- If waitAckPay = 1 Then
- If Timeout > 60 Then
- Var VendingTSID = ""
- SAVELOG "TIMEOUT=60"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
-
- EndIf
- EndIf
-
- If waitAckPay = 2 Then
- If Timeout > 10 Then
-
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- 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"
- EndIf
- EndIf
-
-
- If ChangeOK = 2 Then
- If ActionOKCase = 0 Then
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
-
- If NextOrderStatus = "Disable" Then
- Var PayDetail="2/F:1221/0/"
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
- Else
-
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
- EndIf
-
-
-
- ;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 = ""
-
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- ;If Seeker.CodeChannel = 0 Then
- ; SAVELOG "back_to_main from line > 315."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
- Var waitAckPay = 2
- Var Timeout = 5
- Var ActionOKCase = 1
- SAVELOG "ActionOKCase = change OK 2"
-
- EndIf
- EndIf
-
- If ChangeTimeout > 30 Then
- If ActionOKCase = 0 Then
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
-
- If NextOrderStatus = "Disable" Then
- Var PayDetail="2/F:1221/0/"
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
- Else
-
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
- EndIf
-
- ;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 = ""
-
-
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
- ;If Seeker.CodeChannel = 0 Then
- ; SAVELOG "back_to_main from line > 357."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
- Var waitAckPay = 2
- Var Timeout = 5
- Var ActionOKCase = 1
- SAVELOG "ActionOKCase = change time out"
-
- EndIf
- EndIf
-
- If ChangeOK = 3 Then
- If ActionOKCase = 0 Then
-
- Var SVT = "coffee"
- Var ACC = "0899999999"
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
-
-
- If NextOrderStatus = "Disable" Then
- Var PayDetail="2/F:1221/0/"
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
- Else
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
- EndIf
-
-
-
-
- Var DEE = PayDetail
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- Var ActionOKCase = 1
- SAVELOG "ActionOKCase = change OK 3"
- If Seeker.CodeChannel = 0 Then
- SAVELOG "back_to_main from line > 391."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Var waitAckPay = 2
- Var Timeout = 5
-
-
-
-
- EndIf
- EndIf
-
- If MachineState_Result = 1 Then
- ;Var MachineState_Result = 2
- EndIf
-
- If MachineState_Result = 1 Then
- DEBUGVAR PaySuccessWithDaemonTask
-
- If waitAckPay = 0 Then
-
- Var waitAckPay = 0
- Var Timeout = 0
-
- Var ProcessText = ""
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
-
-
- If AddData = 1 Then
- Var Cid = 26
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
-
- Var PayDetail = "2/" + HURR_FOREVER
- 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.VendingCode = "FAU"
- Var Seeker.CodeNumber = "0000000000"
- Var VendingCampaign = ServiceAmount2
- EndIf
-
- If Seeker.PayWithQR = 0 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + ""
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.VendingCode
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + SelectDrink
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + BoxID
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + "S"
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.CodeNumber
- Var SessionID2 = SessionID2 + "/"
-
- If Seeker.CreditCard = 1 Then
-
- CashlessReq SUCCESS
- ;CashlessReq FAIL
-
- EndIf
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
- Else
-
- If Seeker.CreditCard = 1 Then
-
- CashlessReq SUCCESS
- ;CashlessReq FAIL
-
- EndIf
-
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-
-
- EndIf
-
-
- Else
-
- ;no wait ack pay
- Var waitAckPay = 0
-
- Var SVT = "coffee"
- Var ACC = "0899999999"
- Var DEE = PayDetail
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- EndIf
-
- EndIf
-
- __CMD "clear-stock-data" 0 "-" "-"
-
-
- Var ServiceSuccess = "yes"
- If waitAckPay = 0 Then
- SAVELOG "waitAckPay=0"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
-
- EndIf
-
- If MachineState_Result = 2 Then
-
- SAVELOG MachineStage
-
- If ErrTimeout = 0 Then
- Var ErrTimeout = 1
-
- If AddData = 1 Then
- Var Cid = 26
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
-
- If Seeker.PayWithQR = 0 Then
-
- If Seeker.CreditCard = 1 Then
- CashlessReq FAIL
- Var ChangeFlag = 1
- Var CreditCardVoid = 1
- Else
-
- If Seeker.CodeChannel = 0 Then
- If ChangeFlag = 0 Then
- Var ChangeFlag = 1
-
- If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
- Else
- If GetFreeFromError = 1 Then
- Var ChangeOK = 2
- Else
- Change ServiceAmount2
- EndIf
-
- EndIf
-
- EndIf
-
- Else
-
-
- If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 33
- Var PointCrm = "0"
- Var GetScore = "1"
- Var TelephoneNumberx = "0899999999"
- AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
- Var Seeker.CodeChannel = 0
- EndIf
-
- If CoinAmount > 0 Then
-
- If ChangeFlag = 0 Then
- Var ChangeFlag = 1
- Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
-
- If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
- Else
- Change ServiceAmount3
- EndIf
-
- EndIf
- Else
- Var ChangeOK = 2
- EndIf
-
-
- EndIf
-
- EndIf
-
- Else
- 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
-
-
- If MachineStage = "close-maintenance" Then
- If MachineState_Result = 0 Then
- SAVELOG "back_to_main from line > 663."
- Var MachineState_Result = 2
- EndIf
- EndIf
-
- If MachineStage = "drink-success" Then
- Var MachineState_Result = 1
- EndIf
-
- 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
-
- If MachineState_Result > 0 Then
- Var SelectMenuBetweenBrewEnable1 = "Invisible"
- Var SelectMenuBetweenBrewEnable1Text = "Invisible"
- EndIf
-
- If SelectMenuBetweenBrewEnable1 = "Enable" Then
- If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
- Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
- Else
- Var SelectMenuBetweenBrewEnable1Blink = "Enable"
- EndIf
-
- Else
- If SelectMenuBetweenBrewEnable2 = "Enable" Then
- If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
- Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
- Else
- Var SelectMenuBetweenBrewEnable1Blink = "Enable"
- EndIf
-
- Else
- Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
- EndIf
- EndIf
-
- DEBUGVAR CountUpBrewing
-
- ; animation video loop
- If AnimationOn = "true" Then
-
-
- If adver_brewing_playing = 1 Then
-
- DEBUGVAR adver_brewing_play_index
- If adver_brewing_play_index = 2 Then
- DEBUGVAR adver_brewing_count_down
-
- If adver_brewing_count_down > 0 Then
- Var adver_brewing_count_down = adver_brewing_count_down - 1
-
-
- Var PictureFile = brew_txt1
-
- EndIf
-
- If adver_brewing_count_down = 0 Then
-
-
- Var adver_brewing_play_index = 1
- Var adver_brewing_count_down = 0
-
- ; Next video follow script.
- TRY "ROOT/taobin_project/video/script3_brew.ev"
-
-
- EndIf
- EndIf
-
- If adver_brewing_play_index = 1 Then
- DEBUGVAR adver_brewing_count_down
- DEBUGVAR brew_vdo2
-
- If adver_brewing_count_down > 0 Then
- Var adver_brewing_count_down = adver_brewing_count_down - 1
-
- If brew_vdo2 = "" Then
- Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv3.mp4"
- Else
- Var VideoPlayFile = brew_vdo2
- EndIf
- Var PictureFile = brew_txt2
-
- EndIf
-
- If adver_brewing_count_down = 0 Then
- Var adver_brewing_play_index = 0
- If adver_brewing_video_full_file_name = "" Then
- Var adver_brewing_playing = 0
- Else
- Var adver_brewing_playing = 2
- EndIf
- EndIf
- EndIf
-
-
-
- Else
- If adver_brewing_playing = 2 Then
- DEBUGVAR adver_brewing_video_full_file_name
- If adver_brewing_video_full_file_name = "" Then
- Var adver_brewing_playing = 0
- Else
- Var VideoPlayFile = adver_brewing_video_full_file_name
- Var PictureFile = brew_txt2
- Var PictureFileTextDesctionState = "Invisible"
-
- Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
- Var SelectMenuBetweenBrewEnable1Text = "Invisible"
- EndIf
-
-
-
-
- Else
-
- Var CountUpBrewing = CountUpBrewing + 1
-
- ;CampaignEnable
- Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
-
- If PreviseStepVideo = SlotVideo Then
- ;SAVELOG SlotVideo
- Else
- Var PreviseStepVideo = SlotVideo
- ;SAVELOG PreviseStepVideo
- ;SAVELOG SlotVideo
- ;SAVELOG CountUpBrewing
-
- ;Var CountDownVideoTime = CountDownVideoTimeReload
-
- Var StepVideo = SlotVideo + 2
-
- ;SAVELOG StepVideo
-
- If StepVideo = 1 Then
- Var videoID = VideoID1
- EndIf
- If StepVideo = 2 Then
- Var videoID = VideoID2
- EndIf
- If StepVideo = 3 Then
- Var videoID = VideoID3
- EndIf
- If StepVideo = 4 Then
- Var videoID = VideoID4
- EndIf
- If StepVideo = 5 Then
- Var videoID = VideoID5
- EndIf
- If StepVideo = 6 Then
- Var videoID = VideoID6
- EndIf
- If StepVideo = 7 Then
- Var videoID = VideoID7
- EndIf
- If StepVideo = 8 Then
- Var videoID = VideoID8
- EndIf
- If StepVideo = 9 Then
- Var videoID = VideoID9
- EndIf
-
- ;SAVELOG videoID
-
- If videoID = 0 Then
-
- Else
- If videoID = "---" Then
-
- Else
-
- Var VideoPlayFile = VideoPath
- Var VideoPlayFile = VideoPlayFile + VideoFileBegin
- Var VideoPlayFile = VideoPlayFile + videoID
- Var VideoPlayFile = VideoPlayFile + VideoFileEnd
-
- Var PictureFile = PicturePath
- Var PictureFile = PictureFile + PictureBegin
- Var PictureFile = PictureFile + videoID
- Var PictureFile = PictureFile + PictureEnd
-
- DEBUGVAR VideoPlayFile
- DEBUGVAR PictureFile
- EndIf
- EndIf
- EndIf
- EndIf
- EndIf
- ; CampaignEnable
- EndIf
- ; AnimationOn = true
-
-
- If IgnoreNetCore = "true" Then
- If CountDownBrewing = 0 Then
- SAVELOG "CountDownBrewing=0"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
- EndIf
-
-
- If RoadShow = "true" Then
- Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
- EndIf
-
-
- DEBUGVAR EnableGetMoreStrawFileName
-
- If EnableGetMoreStrawFileName = "PressForever" Then
- DEBUGVAR GetMoreStrawCount
- If GetMoreStrawCount > 0 Then
- If EnableGetMoreStrawFileNameCountDown > 0 Then
- Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
-
- If EnableGetMoreStrawFileNameCountDown = 0 Then
- Var EnableGetMoreStrawFileName = "Enable"
- EndIf
- EndIf
-
- EndIf
- EndIf
-
- If EnableGetMoreStrawFileName2 = "PressForever" Then
- DEBUGVAR GetMoreStrawCount
- If GetMoreStrawCount > 0 Then
- If EnableGetMoreStrawFileNameCountDown > 0 Then
- Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
-
- If EnableGetMoreStrawFileNameCountDown = 0 Then
- Var EnableGetMoreStrawFileName2 = "Enable"
- EndIf
- EndIf
-
- EndIf
- EndIf
-
- If GetMoreStrawCount <= 0 Then
- If StrawProblemStatus = 1 Then
- Var StrawProblemStatus = 2
-
- If NoLangObjectShow = "Enable" Then
- Var bg_strawProblem_ST = "Enable"
- Else
- Var bg_strawProblem_ST2 = "Enable"
- EndIf
- EndIf
-
- EndIf
- DEBUGVAR bg_lidProblem_ST2
-
-
- If GetLidButtonCountDown > 0 Then
- Var GetLidButtonCountDown = GetLidButtonCountDown - 1
- DEBUGVAR GetLidButtonCountDown
- EndIf
-
- If DoorLidSensorDetect = "true" Then
- Var DoorLidSensorDetect = "-"
- Var GetLidButtonState = "Invisible"
- Var bg_lidProblem_ST = "Invisible"
- Var GetLidButtonCountDown = 0
- EndIf
-
- If NoLangObjectShow = "Enable" Then
-
- If GetLidButtonCountDown = 1 Then
- Var GetLidButtonState = "Invisible"
- Var bg_lidProblem_ST = "Enable"
- ;Var XStraw = 356
-
- EndIf
- EndIf
-
- Var bg_lidProblem_ST = "Invisible"
-
- If LanguageObjectShow = "Enable" Then
-
- If GetLidButtonCountDown = 1 Then
- Var GetLidButtonState2 = "Invisible"
- Var bg_lidProblem_ST2 = "Enable"
- Var XStraw = 365
-
- EndIf
- EndIf
-
- If ButtonGameCountDown > 0 Then
- If ButtonGameCountDown = 1 Then
- Var ButtonGameCountDownState = "Invisible"
- Var ButtonGamePressToPlayState = "Enable"
- EndIf
- Var ButtonGameCountDown = ButtonGameCountDown - 1
-
- EndIf
-
-
- If ButtonGameCountDownState = "Enable" Then
- If BREW_CNT < 85 Then
- If Game01Enable = 1 Then
- SAVELOG "Game01Enable set zero event timeout 2"
- EndIf
- Var Game01Enable = 0
- Var ButtonGameCountDownState = "Invisible"
- Var ButtonGamePressToPlayState = "Invisible"
- EndIf
- EndIf
-
-
- DEBUGVAR ButtonGamePressToPlayState
- DEBUGVAR BREW_CNT
- If BREW_CNT > 60 Then
-
- Else
- Var ButtonGamePressToPlayState = "Invisible"
- If Game01Enable = 1 Then
- SAVELOG "Game01Enable set zero event timeout"
- EndIf
- Var Game01Enable = 0
- EndIf
-
-
-
- Refresh
- TimerReset
-
-
-
-
-
- ;If MachineStage = "drink-success" Then
- ; Open "ROOT/taobin_project/xml/page_drinkok.xml"
- ;EndIf
- ;If MachineStage = "drink-failed" Then
- ; Open "ROOT/taobin_project/xml/page_drinkfail.xml"
- ;EndIf
-
- If MachineStage = "drink-success" Then
- Var MachineState_Result = 1
- EndIf
-
-
- DEBUGVAR MachineStage
-
- If MachineStage = "drink-failed" Then
- If RoadShow = "true" Then
- Open "ROOT/taobin_project/xml/page_back_to_error.xml"
- Else
- SAVELOG "Event Machine drink fail"
- Var MachineState_Result = 2
- EndIf
- EndIf
-
- Refresh
-
-
-
-; this copy in file menu_brew2.xml and menu_lid_straw.xml
-
- If ChangeStatus = "payout-end" Then
- If ChangeFlag = 1 Then
- Var ChangeOK = 2
- EndIf
- EndIf
-
+;include="ROOT/taobin_project/inter/mys/xml/page_brewing3_event.lxml"
@@ -2091,4 +1006,15 @@
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+ DEBUGVAR "TestVoidCredit"
+ ;TestSwitchApp "com.finexuscards.yippiepos.VOID" "true" "page_brewing3.lxml::EventUnitTest5"
+ ;com.forthvending.newui
+ ;TestSwitchApp "com.forthvending.newui" "true" "page_brewing3.lxml::EventUnitTest5"
+
+ Open "ROOT/taobin_project/inter/mys/xml/page_void_credit_card.lxml"
+
+
+
+
diff --git a/inter/mys/xml/page_brewing3Conti.xml b/inter/mys/xml/page_brewing3Conti.xml
index 2c578ee8..0ae83512 100644
--- a/inter/mys/xml/page_brewing3Conti.xml
+++ b/inter/mys/xml/page_brewing3Conti.xml
@@ -16,7 +16,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 +46,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 +59,8 @@
Var LidStateX = "Invisible"
EndIf
- Var TimeoutWaitPay = 10
-
+ Var TimeoutWaitPay = 10
+
Var PayReference = ""
Var PayType = "newpay"
Var MachineState_Result = 0
@@ -83,11 +83,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 +97,7 @@
Var AddData = 0
- DEBUGVAR Seeker.TNumberTaobinMember
+ DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR Seeker.PointTaobinStr
If Seeker.TNumberTaobinMember = "" Then
@@ -107,12 +107,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 +126,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
@@ -179,7 +179,7 @@
Var LidStateX = "Invisible"
If Seeker.CreditCard = 1 Then
- Var EnableSelectMenuBetweenBrew = "Invisible"
+ Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
Var CreditCardVoid = 0
@@ -189,818 +189,7 @@
-
-
- If CreditCardVoid = 1 Then
- Var ChangeOK = 2
- EndIf
-
- If ActionOKCase = 1 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
-
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
- ;Var Timeout = 0
- Var ActionOKCase = 2
-
- SAVELOG "back_to_main from line > 142."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
-
- Else
-
- SAVELOG "back_to_main from line > 147."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Else
-
-
-
- EndIf
-
- If waitAckPay = 1 Then
- SAVELOG "waitAckPay = 1"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
-
- EndIf
-
-
-
-
- If ActionOKCase = 1 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
-
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
- ;Var Timeout = 0
- Var ActionOKCase = 2
-
- SAVELOG "back_to_main from line > 204."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
-
- Else
- SAVELOG "back_to_main from line > 173."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Else
-
-
-
- EndIf
-
-
-
- 1000
-
-
- Var Timeout = Timeout + 1
-
- If MOVE_CUP_TO_DOOR = "true" Then
- Var MOVE_CUP_TO_DOOR = "false"
- EndIf
-
- If BREW_COUNT_DOWN_FROM_APP = "on" Then
- Var CountDownBrewing = BREW_CNT
- Else
-
- If CountDownBrewing > 0 Then
- Var CountDownBrewing = CountDownBrewing - 1
- EndIf
- Endif
-
- If Simulation = "true" Then
- If CountDownBrewing = 0 Then
- ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
- EndIf
-
- 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"
- ;EndIf
- If CountDownBrewing = 0 Then
- ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
-
- Var ShowCountDownBrewing = CountDownBrewing
-
-
- If Timeout > 540 Then
- SAVELOG "back_to_main from line > 217."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
-
- If Timeout > 480 Then
- Var MachineState_Result = 2
- EndIf
-
- If ChangeFlag = 1 Then
- Var ChangeTimeout = ChangeTimeout + 1
- EndIf
-
- If waitAckPay = 1 Then
- If Timeout > 60 Then
- Var VendingTSIDTmp1 = ""
- SAVELOG "waitAckPay = 1 tineout > 60"
-
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
-
- EndIf
- EndIf
-
- If waitAckPay = 2 Then
- If Timeout > TimeoutWaitPay Then
-
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + ExtendData
-
- DEBUGVAR SessionID2
-
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.VendingCode
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + Seeker.CodeNumber
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C:"
- Var ECommerce = ECommerce + Seeker.IntVendingCampaign
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
-
- 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"
- EndIf
- EndIf
-
-
- If ChangeOK = 2 Then
- If ActionOKCase = 0 Then
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
-
- Var PayDetail = "2/" + HURR_FOREVER
- 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/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
- ; SAVELOG "back_to_main from line > 315."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
- Var waitAckPay = 2
- Var TimeoutWaitPay = 45
- Var Timeout = 5
- Var ActionOKCase = 1
-
- EndIf
- EndIf
-
- If ChangeTimeout > 30 Then
- If ActionOKCase = 0 Then
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- 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/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
- ; SAVELOG "back_to_main from line > 357."
- ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- ;EndIf
-
- Var waitAckPay = 2
- Var TimeoutWaitPay = 45
- Var Timeout = 5
- Var ActionOKCase = 1
-
- EndIf
- EndIf
-
- If ChangeOK = 3 Then
- If ActionOKCase = 0 Then
-
- Var SVT = "coffee"
- Var ACC = "0899999999"
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
-
-
- If HURR_FOREVER = "S:0" Then
- Var HURR_FOREVER = "F:1303"
- EndIf
-
- Var PayDetail = "2/" + HURR_FOREVER
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + SAMESALARY
- Var PayDetail = PayDetail + "/"
- Var PayDetail = PayDetail + NOBONUS
- Var PayDetail = PayDetail + "/XML|"
- Var PayDetail = PayDetail + Seeker.OrderChanel
-
-
-
-
- Var DEE = PayDetail
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- CoinBack
-
-
- Var ActionOKCase = 1
- If Seeker.CodeChannel = 0 Then
- SAVELOG "back_to_main from line > 391."
- Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
- EndIf
-
- Var waitAckPay = 2
- Var TimeoutWaitPay = 45
- Var Timeout = 5
-
-
-
-
- EndIf
- EndIf
-
- If MachineState_Result = 1 Then
-
- ;Var MachineState_Result = 2
-
- EndIf
-
- If MachineState_Result = 1 Then
- DEBUGVAR PaySuccessWithDaemonTask
-
- If waitAckPay = 0 Then
-
- Var waitAckPay = 0
- Var Timeout = 0
-
- Var ProcessText = ""
-
- If Seeker.TNumberTaobinCredit = "" Then
- Var TelephoneNumber = "0899999999"
- Var PayO2 = ""
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinMember
- EndIf
-
- Else
- Var TelephoneNumber = Seeker.TNumberTaobinCredit
- Var PayO2 = Seeker.CoffeePinNumber
- EndIf
-
- If AddData = 1 Then
- Var Cid = 26
- DEBUGVAR "Brewing3Conti"
- DEBUGVAR Seeker
- DEBUGVAR Seeker.UseGet15Discount
- If NewCollectPoint = 1 Then
- If Seeker.UseGet15Discount = 1 Then
- Var Cid = 39
- Else
- Var Cid = 40
- Var PreviousSeeker.UseGetDrink5Bath = 0
- EndIf
- EndIf
-
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
-
- Var PayDetail = "2/" + HURR_FOREVER
- 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.VendingCode = "C48"
- Var Seeker.CodeNumber = "0000000000"
- Var VendingCampaign = ServiceAmount2
- EndIf
-
- If Seeker.PayWithQR = 0 Then
- If Seeker.CodeChannel = 1 Then
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + ""
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.VendingCode
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + SelectDrink
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + BoxID
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + "S"
- Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + Seeker.CodeNumber
- Var SessionID2 = SessionID2 + "/"
-
- If Seeker.CreditCard = 1 Then
-
- CashlessReq SUCCESS
- ;CashlessReq FAIL
-
- EndIf
- 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 SVT = "coffee"
- Var ACC = "0899999999"
- Var DEE = PayDetail
-
- If Seeker.TNumberTaobinMember = "" Then
- Else
- Var ACC = Seeker.TNumberTaobinMember
- EndIf
-
- PAYEXT SVT ACC VendingTSIDTmp DEE
-
- CoinBack
-
-
- EndIf
-
- EndIf
-
- __CMD "clear-stock-data" 0 "-" "-"
-
- Var ServiceSuccess = "yes"
- If waitAckPay = 0 Then
-
- SAVELOG "waitAckPay = 0 Timeout"
-
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
-
- EndIf
-
- If MachineState_Result = 2 Then
-
- SAVELOG MachineStage
-
- If ErrTimeout = 0 Then
- Var ErrTimeout = 1
-
- If AddData = 1 Then
- Var Cid = 26
-
- If NewCollectPoint = 1 Then
- If Seeker.UseGet15Discount = 1 Then
- Var Cid = 39
- Else
- Var Cid = 40
- Var PreviousSeeker.UseGetDrink5Bath = 0
- EndIf
- EndIf
-
- AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
- EndIf
-
-
- If Seeker.PayWithQR = 0 Then
-
- If Seeker.CreditCard = 1 Then
- CashlessReq FAIL
- Var ChangeFlag = 1
- Var CreditCardVoid = 1
- Else
-
-
- If Seeker.CodeChannel = 0 Then
- If ChangeFlag = 0 Then
- Var ChangeFlag = 1
-
- If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
- Else
- If GetFreeFromError = 1 Then
- Var ChangeOK = 2
- Else
- Change ServiceAmount2
- EndIf
-
- EndIf
-
- EndIf
-
- Else
-
- If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 33
- Var PointCrm = "0"
- Var GetScore = "1"
- Var TelephoneNumberx = "0899999999"
- AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
- Var Seeker.CodeChannel = 0
- EndIf
-
- If CoinAmount > 0 Then
-
- If ChangeFlag = 0 Then
- Var ChangeFlag = 1
- Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
-
- If Seeker.StoreCreditFlag = 1 Then
- Var ChangeOK = 2
- Else
- Change ServiceAmount3
- EndIf
-
- EndIf
- Else
- Var ChangeOK = 2
- EndIf
-
-
- EndIf
- EndIf
-
- Else
- 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
-
-
-
- DEBUGVAR LastMakeDrinkResult
- DEBUGVAR MachineStage
-
-
- If LastMakeDrinkResult = "success" Then
- Var MachineState_Result = 1
- EndIf
-
- If LastMakeDrinkResult = "fail" Then
- Var MachineState_Result = 2
- EndIf
-
- If MachineStage = "drink-success" Then
- Var MachineState_Result = 1
- EndIf
-
- If MachineStage = "drink-failed" Then
- If RoadShow = "true" Then
- Open "ROOT/taobin_project/xml/page_back_to_error.xml"
- Else
- Var MachineState_Result = 2
- EndIf
- EndIf
-
- If MachineState_Result > 0 Then
- Var EnableSelectMenuBetweenBrew = "Invisible"
- Var EnableTopupCreditBetweenBrew = "Invisible"
- EndIf
-
- If EnableSelectMenuBetweenBrew = "Enable" Then
- If EnableSelectMenuBetweenBrewBlink = "Enable" Then
- Var EnableSelectMenuBetweenBrewBlink = "Invisible"
- Else
- Var EnableSelectMenuBetweenBrewBlink = "Enable"
- EndIf
-
- Else
- Var EnableSelectMenuBetweenBrewBlink = "Invisible"
- EndIf
-
- DEBUGVAR CountUpBrewing
- ; animation video loop
- If AnimationOn = "true" Then
- Var CountUpBrewing = CountUpBrewing + 1
-
- Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
-
- If PreviseStepVideo = SlotVideo Then
- ;SAVELOG SlotVideo
- Else
- Var PreviseStepVideo = SlotVideo
- ;SAVELOG PreviseStepVideo
- ;SAVELOG SlotVideo
- ;SAVELOG CountUpBrewing
-
- ;Var CountDownVideoTime = CountDownVideoTimeReload
-
- Var StepVideo = SlotVideo + 2
-
- ;SAVELOG StepVideo
-
- If StepVideo = 1 Then
- Var videoID = VideoID1
- EndIf
- If StepVideo = 2 Then
- Var videoID = VideoID2
- EndIf
- If StepVideo = 3 Then
- Var videoID = VideoID3
- EndIf
- If StepVideo = 4 Then
- Var videoID = VideoID4
- EndIf
- If StepVideo = 5 Then
- Var videoID = VideoID5
- EndIf
- If StepVideo = 6 Then
- Var videoID = VideoID6
- EndIf
- If StepVideo = 7 Then
- Var videoID = VideoID7
- EndIf
- If StepVideo = 8 Then
- Var videoID = VideoID8
- EndIf
- If StepVideo = 9 Then
- Var videoID = VideoID9
- EndIf
-
- ;SAVELOG videoID
-
- If videoID = 0 Then
-
- Else
- If videoID = "---" Then
-
- Else
-
- Var VideoPlayFile = VideoPath
- Var VideoPlayFile = VideoPlayFile + VideoFileBegin
- Var VideoPlayFile = VideoPlayFile + videoID
- Var VideoPlayFile = VideoPlayFile + VideoFileEnd
-
- Var PictureFile = PicturePath
- Var PictureFile = PictureFile + PictureBegin
- Var PictureFile = PictureFile + videoID
- Var PictureFile = PictureFile + PictureEnd
-
- DEBUGVAR VideoPlayFile
- DEBUGVAR PictureFile
- EndIf
- EndIf
- EndIf
- EndIf
-
-
- If IgnoreNetCore = "true" Then
- If CountDownBrewing = 0 Then
- SAVELOG "CountDownBrewing = 0"
- Open "ROOT/taobin_project/xml/page_drinkok.xml"
- EndIf
- EndIf
-
-
- If ButtonGameCountDown > 0 Then
- If ButtonGameCountDown = 1 Then
- Var ButtonGameCountDownState = "Invisible"
- Var ButtonGamePressToPlayState = "Enable"
- EndIf
- Var ButtonGameCountDown = ButtonGameCountDown - 1
- DEBUGVAR ButtonGameCountDown
- EndIf
-
-
- DEBUGVAR BREW_CNT
- DEBUGVAR ButtonGamePressToPlayState
- If BREW_CNT > 60 Then
-
- Else
- 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 ChangeFlag = 1 Then
- Var ChangeOK = 2
- EndIf
- EndIf
-
+;include="ROOT/taobin_project/inter/mys/xml/page_brewing3Conti_event.lxml"
@@ -1740,9 +1790,9 @@
If LanguageShow = "UAE_DUBAI" Then
Var return = DirImage + QR_POPUP
Else
- Var return = "ROOT/taobin_project/image/page_payment_en/page_payment/" + QR_POPUP
+ Var return = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page_payment/img_tap_card_5_sec.png"
EndIf
- DEBUGVAR return
+ ;DEBUGVAR return
)
@@ -1790,7 +1840,7 @@
0
380
alphaState2
- "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png"
+ "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page_payment_en/page_payment/alpha.png"
@@ -1834,7 +1884,7 @@
Var return = "Enable"
EndIf
EndIf
- DEBUGVAR return
+ ;DEBUGVAR return
)
@@ -1956,21 +2006,13 @@
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
- EndIf
- EndIf
- If UserChoosePayment = "" Then
- Var CashlessPayFlag = 0
- CashlessReq FAIL
- EndIf
-
- If UserChoosePayment = "" Then
- Var CashlessPayFlag = 0
- CashlessReq FAIL
- EndIf
- EndIf
+ If UserChoosePayment = "" Then
+ Var CashlessPayFlag = 0
+ CashlessReq FAIL
EndIf
+
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
@@ -1980,21 +2022,6 @@
EndIf
EndIf
- DEBUGVAR UserChoosePayment
- Var UserChoosePayment = ""
-
- Var CancelContinue = 1
- EndIf
- EndIf
-
- If CashlessPayFlag = 1 Then
- Var CashlessPayFlag = 0
- CashlessReq FAIL
- EndIf
-
-
- EndIf
- EndIf
DEBUGVAR UserChoosePayment
Var UserChoosePayment = ""
@@ -2028,14 +2055,14 @@
0
380
alphaState3
- "ROOT/taobin_project/image/page_payment/alpha.png"
+ "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page_payment_en/page_payment/alpha.png"
182
748
alphaState3
- Var( DirImage2 + "/img_popup12_uae.png" )
+ notEnoughChangePop12
;
@@ -2072,18 +2100,18 @@
0
380
alphaState3_offline
- "ROOT/taobin_project/image/page_payment/alpha.png"
+ "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page_payment_en/page_payment/alpha.png"
182
748
alphaState3_offline
- Var( DirImage2 + "/img_popup12_offline.png" )
+ pop12Offline
@@ -2151,6 +2180,7 @@
cancelState
;Var( DirImage + "/CancelOrder.png" )
eval(
+ ;DEBUGVAR DirImage
If LanguageShow = "UAE_DUBAI" Then
Var return = DirImage + "/CancelOrder-UAE_DUBAI.png"
Else
@@ -2239,8 +2269,20 @@
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
-
+
+ Var TelephoneNumber = ""
+ Var Tel_Confirm_State = "Disable"
+ Open "ROOT/taobin_project/inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml"
+
+
+ Var PayState5 = "Enable"
+
+
+ Var EnoughChange = "nay"
+
+
+ Var EnoughChange = "yes"
+
diff --git a/inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml b/inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml
index 8370e38e..5082464a 100644
--- a/inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml
+++ b/inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml
@@ -13,7 +13,7 @@
Var Seeker.FreeVendingCampaign = 0
Var Timeout = 0
-
+
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
Var Seeker.CollectPointMain = 0
@@ -22,25 +22,25 @@
;Var VendingQRCode = "ERROR"
;VendingQR ON
;Var QRCODE99 = ""
-
+
;CoinVending OFF
VendingQR OFF
-
+
Var ShowTextNumber = "Enable"
Var ShowErrorText = "Invisible"
Var Tel_Confirm_State = "Invisible"
Var ErrorCause = ""
-
- If show_eng = "true" Then
- Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en"
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/collectiing_en"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf
If web_readyOK = "true" Then
Var web_readyOK = "false"
-
+
If web_code = "" Then
Else
Var ShowTextNumber = "Invisible"
@@ -70,11 +70,11 @@
Var ECommerce = ECommerce + TOPPING_PRICE
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 + "C00"
Var ECommerce = ECommerce + "/"
@@ -91,7 +91,7 @@
GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
-
+
Var TelephoneNumber = Seeker.CodeNumber
Var Seeker.CodeChannel = 1
EndIf
@@ -101,49 +101,56 @@
Var Mode# = 0
Var Str# = ""
Var TelephoneNumber# = ""
-
+
+
+ If LanguageShow = "UAE_DUBAI" Then
+ Var header_text = DirImage + "/text_11_uae.png"
+ Else
+ Var header_text = DirImage + "/text_11.png"
+ EndIf
+
1000
-
- ;Open "ROOT/xml/page_board.xml"
+
+ ;Open "ROOT/xml/page_board.xml"
+
-
Var Timeout = Timeout + 1
If Timeout > 30 Then
;VendingQR OFF
- ;Open menu_back_to_main
+ ;Open menu_back_to_main
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Var Seeker.CodeChannel = 0
- If CART_COUNT >= 1 Then
- Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
+ If CART_COUNT >= 1 Then
+ Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
- Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+ Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
Refresh
EndIf
TimerReset
-
+
-
+
If IDCardStatus = "OK" Then
If IDCardReady = "OK" Then
If IDCardData = "START" Then
CoinVending OFF
- Open "ROOT/taobin_project/xml/page_show_consent2.xml"
+ Open "ROOT/taobin_project/xml/page_show_consent2.xml"
EndIf
EndIf
EndIf
-
+
@@ -159,7 +166,7 @@
-
+
If Seeker.CodeChannel = 1 Then
@@ -174,24 +181,24 @@
SPLIT ECommerce "/" 9 ShouldCollectPoint
If Seeker.VendingCode = "" Then
- Var Seeker.VendingCode = "C00"
+ Var Seeker.VendingCode = "C00"
EndIf
If Seeker.VendingCode = "KBA:2" Then
- Var Seeker.VendingCode = "C00"
+ Var Seeker.VendingCode = "C00"
EndIf
If Seeker.VendingCode = "AIR:2" Then
- Var Seeker.VendingCode = "C00"
+ Var Seeker.VendingCode = "C00"
EndIf
If Seeker.VendingCode = "TWN:2" Then
- Var Seeker.VendingCode = "C00"
+ Var Seeker.VendingCode = "C00"
EndIf
SAVELOG Seeker.VendingCode
SAVELOG Seeker.VendingCampaignRI3
-
+
SAVELOG ShouldCollectPoint
INT ShouldCollectPoint
@@ -208,7 +215,7 @@
If IntVendingCampaign1 > 0 Then
Var VendingCreditRemain = VendingCampaign1
- EndIf
+ EndIf
EndIf
@@ -216,7 +223,7 @@
Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3
INT Seeker.IntVendingCampaign
-
+
Var VendingREFID = SessionID
@@ -227,11 +234,11 @@
If Seeker.IntVendingCampaign > 0 Then
Var QRChannel = 0
- If Seeker.IntVendingCampaign >= PayAmount Then
+ If Seeker.IntVendingCampaign >= PayAmount Then
If ShouldCollectPoint = 1 Then
Var Seeker.CollectPointMain = 1
-
+
If PayMentCodeShouldCollectPromotionPoint = 1 Then
Var Seeker.CollectPointPromotion = 1
EndIf
@@ -240,24 +247,24 @@
TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
- ;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+ ;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
Var Seeker.VendingCampaign = PayAmount
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
- ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
- If CART_COUNT >= 1 Then
+ ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+ If CART_COUNT >= 1 Then
Cart "PreparID" 1
Var CART_INDEX = 1
Var PayReference = ""
GenHashWithTimeStamp PayReference
Cart "MakeID" CART_INDEX
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
+ Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
- If New_Payment = 1 Then
+ If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
@@ -271,7 +278,7 @@
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
+ Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Else
If ShouldCollectPoint = 1 Then
@@ -284,8 +291,8 @@
EndIf
-
-
+
+
;Var SessionID2 = SelectSlot + ":"
;Var SessionID2 = SessionID2 + Seeker.ExtendData
@@ -297,11 +304,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 + "KBA:2/"
;Var ECommerce = ECommerce + Seeker.VendingCode
@@ -324,11 +331,11 @@
;Var Seeker.CodeChannel = 2
Var Seeker.CodeChannel = 1
-
- If CART_COUNT >= 1 Then
- Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
+
+ If CART_COUNT >= 1 Then
+ Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
- Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+ Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
@@ -343,7 +350,7 @@
EndIf
EndIf
- Else
+ Else
;SAVELOG "Seeker.CodeChannel 2 > ActOK."
;
@@ -354,12 +361,12 @@
;Var QRCODETMP = QRCODE99
;Var Seeker.CodeChannel = 1
;
- ;If CART_COUNT >= 1 Then
- ; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
+ ;If CART_COUNT >= 1 Then
+ ; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
;Else
- ; Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+ ; Open "ROOT/taobin_project/xml/page_payment_cash.xml"
;EndIf
-
+
EndIf
@@ -368,33 +375,39 @@
If Seeker.CodeChannel = 1 Then
Var TelephoneNumber = ""
-
+
Var ShowErrorText = "Enable"
SAVELOG ShowErrorText
- Var text_show_error = DirImage + "/text_show_error2.png"
+ Var text_show_error = DirImage + "/text_show_error2"
+ Var extension_end = ".png"
+ If LanguageShow = "UAE_DUBAI" Then
+ Var extension_end = "_uae.png"
+ EndIf
If ErrorCause = "failed_fromoper_0002" Then
- Var text_show_error = DirImage + "/text_show_error.png"
+ Var text_show_error = DirImage + "/text_show_error"
EndIf
If ErrorCause = "failed_fromoper_0005" Then
- Var text_show_error = DirImage + "/text_show_error3.png"
+ Var text_show_error = DirImage + "/text_show_error3"
EndIf
If ErrorCause = "failed_fromoper_0006" Then
- Var text_show_error = DirImage + "/text_show_error4.png"
+ Var text_show_error = DirImage + "/text_show_error4"
EndIf
-
+
If ErrorCause = "failed_fromoper_0007" Then
- Var text_show_error = DirImage + "/text_show_error7.png"
+ Var text_show_error = DirImage + "/text_show_error7"
EndIf
If ErrorCause = "failed_fromoper_0008" Then
- Var text_show_error = DirImage + "/text_show_error8.png"
+ Var text_show_error = DirImage + "/text_show_error8"
EndIf
+ Var text_show_error = text_show_error + extension_end
+
Var GetPayInfoFlag = 0
Var Seeker.CodeChannel = 0
Var Tel_Confirm_State = "Disable"
@@ -405,10 +418,10 @@
Var Seeker.CodeChannel = 1
Var QRCODE99 = ""
Var QRCODETMP = ""
- If CART_COUNT >= 1 Then
- Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
+ If CART_COUNT >= 1 Then
+ Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
- Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+ Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
@@ -420,7 +433,7 @@
0
380
- "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+ "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/collectiing_en/alpha.png"
@@ -434,11 +447,11 @@