diff --git a/inc/video.inc b/inc/video.inc index 3c6a46e4..b1e5d581 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -7,8 +7,8 @@ If showMultiAds = "true" Then - - + + If PreviousFileName = "" Then Var PreviousFileName = PreviseXMLFileName2 EndIf @@ -39,7 +39,7 @@ DEBUGVAR CountDownPauseVideo2 If CountryName = "Singapore" Then If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then - + If CountDownPauseVideo2 < 2 Then Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" @@ -60,7 +60,7 @@ Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf EndIf - + Else Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" @@ -83,7 +83,7 @@ EndIf EndIf - + Else DEBUGVAR a_video_menu[ads_idx] If CountryName = "Singapore" Then @@ -123,7 +123,7 @@ Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf EndIf - + If CountryName = "Malaysia" Then @@ -153,13 +153,13 @@ DEBUGVAR CurrentXMLFileName2 Var video_end = "Video end" - DEBUGVAR video_end + DEBUGVAR video_end If CountDownPauseVideo2 = -1 Then Var CountDownPauseVideo2 = 0 EndIf If showMultiAds = "true" Then - + Var ads_idx = ads_idx + 1 @@ -196,7 +196,7 @@ EndIf Else Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] - Var DisplayAds = AdvTaobinMenu + ".mp4" + Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf If CountryName = "Malaysia" Then @@ -216,7 +216,7 @@ EndIf EndIf - + Else DEBUGVAR a_video_menu[ads_idx] If CountryName = "Singapore" Then diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index 34359cb9..fad1a48a 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -476,7 +476,6 @@ Var XPercent = 0 EndIf - CashlessReq SUCCESS diff --git a/inter/uae_dubai/xml/page_brewing3.lxml b/inter/uae_dubai/xml/page_brewing3.lxml index f6295a4c..b1403d5a 100644 --- a/inter/uae_dubai/xml/page_brewing3.lxml +++ b/inter/uae_dubai/xml/page_brewing3.lxml @@ -19,7 +19,7 @@ If CART_COUNT >= 1 Then - Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" + Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" Else Var PayReference = "" Var PayType = "newpay" @@ -51,8 +51,8 @@ WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--" - If show_eng = "true" Then - + If show_eng = "true" Then + Var IMG_CNT = DirImageDoing + "/img2_eng.png" Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" @@ -65,7 +65,7 @@ Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_en.png" Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_en.png" - + Var bn_get_lid_image = DirImageDoing + "/bn_get_lid_en.png" Var bp_get_lid_image = DirImageDoing + "/bp_get_lid_en.png" @@ -76,14 +76,14 @@ Var XStraw = 274 Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" - + ; Play Sound #zone If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "thankyou.wav" @@ -92,7 +92,7 @@ Play PlaySoundLag Var IMG_CNT = DirImageDoing + "/img2.png" - + Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png" Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png" @@ -101,9 +101,9 @@ Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw.png" Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid.png" - Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid.png" + Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid.png" + - Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png" Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png" @@ -121,7 +121,7 @@ Var CreditReference = "" Var PayCredit = 0 - + If Seeker.PayWithQR = 1 Then Var VendingTSIDTmp = Seeker.VendingTSID @@ -144,7 +144,7 @@ Var SessionID2 = SelectDrink Var ServiceCredit = "coffee" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + Else If Seeker.StoreCreditFlag = 1 Then @@ -154,7 +154,7 @@ Var SessionID2 = SelectDrink Var ServiceCredit = "coffee" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + EndIf EndIf @@ -167,7 +167,7 @@ Else Var TelephoneNumberProblem = Seeker.TNumberTaobinMember EndIf - + Else Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit EndIf @@ -183,9 +183,9 @@ Var AddData = 0 - DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.TNumberTaobinMember DEBUGVAR Seeker.PointTaobinStr - + If Seeker.TNumberTaobinMember = "" Then @@ -194,12 +194,12 @@ Var VendingTSID = VendingTSIDTmp Else Var VendingTSID = "" - EndIf + EndIf Var BmiYear = Seeker.PointTaobinStr Var PointCrm = "" - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSID @@ -213,19 +213,19 @@ Var AddData = 1 ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore EndIf - + Var VendingTSID = "" EndIf If Seeker.VendingCode = "MKFOO" Then Var AddData = 0 - EndIf + EndIf If GetFreeFromError = 1 Then ;Var GetFreeFromError = 0 Var TelephoneNumberProblem = TelephoneNumberGOTFree - + EndIf @@ -242,7 +242,7 @@ DEBUGVAR TxReference - 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" Else @@ -250,13 +250,13 @@ Var DirImage2 = "ROOT/taobin_project/image/topping2" EndIf - DEBUGVAR show_eng + DEBUGVAR show_eng Var next_pic_bn = DirImage + "/bn_add_order.png" Var next_pic_bp = DirImage + "/bp_add_order.png" Var text_next_order = DirImage + "/text_next_order.png" Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" - + Var Seeker.strawAction = 0 Var Seeker.lidAction = 0 @@ -267,7 +267,7 @@ Var Seeker.lidAction = 2 EndIf - + DEBUGVAR LastMakeDrinkResult If LastMakeDrinkResult = "success" Then @@ -293,7 +293,7 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf - If SelectMenuBetweenBrewEnable1 = "Enable" Then + If SelectMenuBetweenBrewEnable1 = "Enable" Then Var EnableGetMoreStrawFileName = "Enable" Var SelectMenuBetweenBrewEnable1Blink = "Enable" Else @@ -310,31 +310,31 @@ Var LidStateX = "Invisible" ; Override from config - If StrawGetMoreState = "Invisible" Then + If StrawGetMoreState = "Invisible" Then Var bg_strawProblem_ST = "Enable" Var EnableGetMoreStrawFileName = "Invisible" EndIf If RoadShow = "true" Then - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf If Seeker.CreditCard = 1 Then - Var SelectMenuBetweenBrewEnable1Blink = "Enable" + Var SelectMenuBetweenBrewEnable1Blink = "Enable" Var SelectMenuBetweenBrewEnable1 = "Enable" EndIf If NeedUpgrade = "true" Then - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf If NeedReboot = "true" Then - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf - ;Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + ;Var SelectMenuBetweenBrewEnable1Blink = "Invisible" ;Var SelectMenuBetweenBrewEnable1 = "Invisible" DEBUGVAR NeedUpgrade @@ -343,7 +343,7 @@ ; copy stage Var bg_lidProblem_ST2 = bg_lidProblem_ST DEBUGVAR bg_lidProblem_ST2 - + ; zone Language If LanguageObjectShow = "Enable" Then Var XStraw = 350 @@ -360,16 +360,16 @@ Var bg_strawProblem_ST2 = "Invisible" - If bg_lidProblem_ST2 = "Invisible" Then + If bg_lidProblem_ST2 = "Invisible" Then Var GetLidButtonState2 = "Enable" Else Var GetLidButtonState2 = "Invisible" EndIf EndIf - - + + If NoLangObjectShow = "Enable" Then Var SelectMenuBetweenBrewEnable2 = "Invisible" @@ -382,7 +382,7 @@ DEBUGVAR bg_lidProblem_ST - If bg_lidProblem_ST = "Invisible" Then + If bg_lidProblem_ST = "Invisible" Then Var GetLidButtonState = "Enable" ;Var XStraw = 265 EndIf @@ -421,14 +421,14 @@ DEBUGVAR SelectMenuBetweenBrewEnable2 Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1 - + ; echo 1 > /mnt/sdcard/game_enable READ_FILE "/mnt/sdcard/game_enable" game_mode_str STRCONTAIN "1" game_mode_str game_mode_enable DEBUGVAR game_mode_enable - + If GameEnableFromTrickerEv = 1 Then Var game_mode_enable = "true" EndIf @@ -447,13 +447,13 @@ DEBUGVAR GameEnableFromTrickerEv DEBUGVAR GameOverrideDisable - + DEBUGVAR Seeker If game_mode_enable = "true" Then - - + + DEBUGVAR GameInstalled - + If GameInstalled = "true" Then If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" @@ -479,7 +479,7 @@ ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://nlb-taobingame-service-40430a2f6317ba2f.elb.ap-southeast-1.amazonaws.com:26969"\r\n" - + If TelephoneNumber = "0899999999" Then ; Coupon or customer not input phone number. Var ACCString !assigned SprintFmt("ACC: ""\r\n", "") @@ -489,7 +489,7 @@ EndIf DEBUGVAR ACCString - + Var LangString = "LANG: "EN"\r\n" ; reset @@ -504,10 +504,10 @@ WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" "" ;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n" APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n" - + Var ACCString !assigned SprintFmt("ACC: ""\r\n", "") DEBUGVAR ACCString - + If show_eng = "true" Then Var LangString = "LANG: "EN"\r\n" Else @@ -524,7 +524,7 @@ EndIf EndIf EndIf - + DEBUGVAR Game01Enable @@ -556,11 +556,11 @@ - ; BREW_CNT > 15 ( pre-time ) + 60 ( Game Time ) Game01Enable - ; BREW_CNT > 15 ( pre-time ) + 50 ( Game Time ) + 10 (Debound Time) Game01Enable + ; BREW_CNT > 15 ( pre-time ) + 60 ( Game Time ) Game01Enable + ; BREW_CNT > 15 ( pre-time ) + 50 ( Game Time ) + 10 (Debound Time) Game01Enable If Game01Enable = 1 Then - + If ButtonGameCountDownState = "Enable" Then If BREW_CNT < 75 Then If Game01Enable = 1 Then @@ -584,8 +584,6 @@ EndIf EndIf - CashlessReq SUCCESS - Var XPosiShowCountDownBrew = 768 @@ -598,9 +596,9 @@ 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 DEBUGVAR SessionID2 @@ -614,11 +612,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 + "/" @@ -640,31 +638,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 DEBUGVAR SessionID2 @@ -678,11 +676,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 + "/" @@ -704,31 +702,31 @@ 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 - + DEBUGVAR IMG_CNT DEBUGVAR LanguageObjectShow DEBUGVAR LanguageShow DEBUGVAR show_eng - + Var Timeout = Timeout + 1 - + If Timeout < 2 Then If Game01Enable = 0 Then If game_mode_enable = "true" Then @@ -737,7 +735,7 @@ Var Game01Enable = 1 Var ButtonGameCountDownState = "Invisible" Var ButtonGamePressToPlayState = "Enable" - + EndIf EndIf EndIf @@ -767,22 +765,22 @@ ; EndIf ;EndIf - + If SelectMenuBetweenBrewEnable1 = "Enable" Then If Timeout = 5 Then - If show_eng = "true" 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 + + If SoundBackToSchoolType = 1 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" EndIf - If SoundBackToSchoolType = 2 Then + If SoundBackToSchoolType = 2 Then Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav" @@ -803,13 +801,13 @@ EndIf EndIf 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 @@ -817,9 +815,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 BREW_CNT = 0 Then If CountUpWhenBREW_CNT > 56 Then @@ -846,19 +844,19 @@ Var ChangeTimeout = ChangeTimeout + 1 EndIf - If waitAckPay = 1 Then + If waitAckPay = 1 Then If Timeout > 60 Then Var VendingTSID = "" SAVELOG "TIMEOUT=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 > 10 Then - If Seeker.CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData DEBUGVAR SessionID2 @@ -870,11 +868,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 + "/" @@ -894,9 +892,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 @@ -932,7 +930,7 @@ Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS @@ -950,13 +948,13 @@ Var SuggestID = "" Var SessionID2 = "" - + 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 @@ -996,7 +994,7 @@ EndIf Var PayDetail = "2/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + SAMESALARY Var PayDetail = PayDetail + "/" Var PayDetail = PayDetail + NOBONUS @@ -1007,19 +1005,19 @@ ;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 + ;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 @@ -1053,13 +1051,13 @@ EndIf 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 - + EndIf @@ -1068,12 +1066,12 @@ Var DEE = PayDetail PAYEXT SVT ACC VendingTSIDTmp DEE - + Var ActionOKCase = 1 SAVELOG "ActionOKCase = change OK 3" - 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 @@ -1092,12 +1090,12 @@ If MachineState_Result = 1 Then DEBUGVAR PaySuccessWithDaemonTask - If waitAckPay = 0 Then + If waitAckPay = 0 Then - Var waitAckPay = 0 + Var waitAckPay = 0 Var Timeout = 0 - Var ProcessText = "" + Var ProcessText = "" If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" @@ -1107,7 +1105,7 @@ Else Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf - + Else Var TelephoneNumber = Seeker.TNumberTaobinCredit Var PayO2 = Seeker.CoffeePinNumber @@ -1119,24 +1117,24 @@ 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 + "/" 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 = "FAU" Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 @@ -1159,7 +1157,7 @@ Var SessionID2 = SessionID2 + "/" If Seeker.CreditCard = 1 Then - + ;CashlessReq SUCCESS ;CashlessReq FAIL @@ -1167,24 +1165,24 @@ 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 waitAckPay = 0 Var SVT = "coffee" Var ACC = "0899999999" @@ -1198,7 +1196,7 @@ PAYEXT SVT ACC VendingTSIDTmp DEE EndIf - + EndIf __CMD "clear-stock-data" 0 "-" "-" @@ -1207,7 +1205,7 @@ Var ServiceSuccess = "yes" If waitAckPay = 0 Then SAVELOG "waitAckPay=0" - Open "ROOT/taobin_project/xml/page_drinkok.xml" + Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf EndIf @@ -1225,17 +1223,17 @@ EndIf - If Seeker.PayWithQR = 0 Then + If Seeker.PayWithQR = 0 Then If Seeker.CreditCard = 1 Then ;CashlessReq FAIL - Var ChangeFlag = 1 + Var ChangeFlag = 1 Var CreditCardVoid = 1 Else If Seeker.CodeChannel = 0 Then If ChangeFlag = 0 Then - Var ChangeFlag = 1 + Var ChangeFlag = 1 If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 @@ -1245,9 +1243,9 @@ Else Change ServiceAmount2 EndIf - + EndIf - + EndIf Else @@ -1263,9 +1261,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 @@ -1273,7 +1271,7 @@ Else Change ServiceAmount3 EndIf - + EndIf Else Var ChangeOK = 2 @@ -1288,34 +1286,34 @@ 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 @@ -1334,26 +1332,26 @@ Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf - If SelectMenuBetweenBrewEnable1 = "Enable" Then - If SelectMenuBetweenBrewEnable1Blink = "Enable" Then + 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 + 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 @@ -1361,15 +1359,15 @@ 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 @@ -1381,9 +1379,9 @@ Var adver_brewing_count_down = 0 ; Next video follow script. - TRY "ROOT/taobin_project/video/script3_brew.ev" + TRY "ROOT/taobin_project/video/script3_brew.ev" + - EndIf EndIf @@ -1393,7 +1391,7 @@ 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 @@ -1413,7 +1411,7 @@ EndIf EndIf - + Else If adver_brewing_playing = 2 Then @@ -1425,12 +1423,12 @@ Var PictureFile = brew_txt2 Var PictureFileTextDesctionState = "Invisible" - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf - - + + Else @@ -1438,7 +1436,7 @@ ;CampaignEnable Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime - + If PreviseStepVideo = SlotVideo Then ;SAVELOG SlotVideo Else @@ -1448,9 +1446,9 @@ ;SAVELOG CountUpBrewing ;Var CountDownVideoTime = CountDownVideoTimeReload - + Var StepVideo = SlotVideo + 2 - + ;SAVELOG StepVideo If StepVideo = 1 Then @@ -1499,29 +1497,29 @@ Var PictureFile = PictureFile + PictureBegin Var PictureFile = PictureFile + videoID Var PictureFile = PictureFile + PictureEnd - + DEBUGVAR VideoPlayFile DEBUGVAR PictureFile EndIf EndIf EndIf EndIf - EndIf + EndIf ; CampaignEnable EndIf ; AnimationOn = true - If IgnoreNetCore = "true" Then + 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" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf @@ -1529,7 +1527,7 @@ If EnableGetMoreStrawFileName = "PressForever" Then DEBUGVAR GetMoreStrawCount - If GetMoreStrawCount > 0 Then + If GetMoreStrawCount > 0 Then If EnableGetMoreStrawFileNameCountDown > 0 Then Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1 @@ -1543,7 +1541,7 @@ If EnableGetMoreStrawFileName2 = "PressForever" Then DEBUGVAR GetMoreStrawCount - If GetMoreStrawCount > 0 Then + If GetMoreStrawCount > 0 Then If EnableGetMoreStrawFileNameCountDown > 0 Then Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1 @@ -1554,11 +1552,11 @@ EndIf EndIf - + If GetMoreStrawCount <= 0 Then If StrawProblemStatus = 1 Then Var StrawProblemStatus = 2 - + If NoLangObjectShow = "Enable" Then Var bg_strawProblem_ST = "Enable" Else @@ -1568,7 +1566,7 @@ EndIf DEBUGVAR bg_lidProblem_ST2 - + If GetLidButtonCountDown > 0 Then Var GetLidButtonCountDown = GetLidButtonCountDown - 1 @@ -1581,7 +1579,7 @@ Var bg_lidProblem_ST = "Invisible" Var GetLidButtonCountDown = 0 EndIf - + If NoLangObjectShow = "Enable" Then If GetLidButtonCountDown = 1 Then @@ -1593,9 +1591,9 @@ EndIf Var bg_lidProblem_ST = "Invisible" - + If LanguageObjectShow = "Enable" Then - + If GetLidButtonCountDown = 1 Then Var GetLidButtonState2 = "Invisible" Var bg_lidProblem_ST2 = "Enable" @@ -1613,7 +1611,7 @@ EndIf - + If ButtonGameCountDownState = "Enable" Then If BREW_CNT < 85 Then If Game01Enable = 1 Then @@ -1637,28 +1635,28 @@ EndIf Var Game01Enable = 0 EndIf - + Refresh TimerReset - + - + ;If MachineStage = "drink-success" Then - ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" ;EndIf ;If MachineStage = "drink-failed" Then - ; Open "ROOT/taobin_project/xml/page_drinkfail.xml" + ; 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 @@ -1671,12 +1669,12 @@ EndIf Refresh - + ; 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 @@ -1797,18 +1795,18 @@ SelectMenuBetweenBrewEnable1 next_pic_bn next_pic_bp - + If MachineState_Result = 0 Then - + SAVELOG "User click next button" Var Seeker = "next" Var MultiPayEnable = "false" CoinPause - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - + @@ -1890,7 +1888,7 @@ ButtonGameCountDownState Var( DirImageDoing + "/bn_game_cnt_down.png") Var( DirImageDoing + "/bn_game_cnt_down.png") - + @@ -1919,7 +1917,7 @@ 526 1680 241 - 204 + 204 ButtonGamePressToPlayState DEBUGVAR Game01Enable @@ -1944,16 +1942,16 @@ bg_lidProblem_ST bnLidProblemReport bpLidProblemReport - + Var lidStr = "แจ้งปัญหาไม่ได้รับฝา" - + __CMD "lid-alert-disable" 0 lidStr "-" __CMD "send-error-code" 1343 "-" "-" Var bg_lidProblem_ST = "Invisible" Refresh - + ;==================================================================== @@ -1984,7 +1982,7 @@ Var( DirImageDoing + "/bn_get_more_straw.png" ) Var( DirImageDoing + "/bp_get_more_straw.png" ) "No" - + Var EnableGetMoreStrawFileNameCountDown = 5 Var EnableGetMoreStrawFileName2 = "PressForever" Var GetMoreStrawCount = GetMoreStrawCount - 1 @@ -1996,7 +1994,7 @@ Else Var EnableGetMoreStrawFileName2 = "Invisible" EndIf - + 50 20 @@ -2013,16 +2011,16 @@ bg_strawProblem_ST2 Var( DirImageDoing + "/bn_send_report.png" ) Var( DirImageDoing + "/bn_send_report.png" ) - + Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด" - + __CMD "straw-alert-disable" 0 strawStr "-" __CMD "send-error-code" 1231 "-" "-" Var bg_strawProblem_ST2 = "Invisible" Refresh - + 0 12 @@ -2039,16 +2037,16 @@ bg_lidProblem_ST2 Var( DirImageDoing + "/bn_send_report.png" ) Var( DirImageDoing + "/bn_send_report.png" ) - + Var lidStr = "แจ้งปัญหาไม่ได้รับฝา" - + __CMD "lid-alert-disable" 0 lidStr "-" __CMD "send-error-code" 1343 "-" "-" Var bg_lidProblem_ST2 = "Invisible" Refresh - + 0 12 @@ -2065,7 +2063,7 @@ "No" Var( DirImageDoing + "/bn_get_lid.png" ) Var( DirImageDoing + "/bp_get_lid.png" ) - + If GetLidButtonState2 = "Enable" Then Machine Lid diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index 2432446f..0a5d4bc4 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -736,6 +736,8 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef + CashlessReq SUCCESS + DEBUGVAR UserChoosePayment Var UserChoosePayment = "" Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index b53b056d..7e9c1434 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -741,6 +741,8 @@ Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef + CashlessReq SUCCESS + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -784,13 +786,17 @@ If VendingCashless = "ERROR" Then - Var Timeout = 0 + If CoinInOK = 1 Then - ;Var QRErrorFlag = 1 - If alphaState = "Enable" Then - Var QRErrorState = "Enable" - Var LOADING_STATE = "Invisible" - EndIf + Else + Var Timeout = 0 + EndIf + + ;Var QRErrorFlag = 1 + If alphaState = "Enable" Then + Var QRErrorState = "Enable" + Var LOADING_STATE = "Invisible" + EndIf EndIf @@ -801,10 +807,7 @@ - - Refresh - @@ -1486,40 +1489,44 @@ SoundVolume -If alphaState = "Invisible" Then - If CoinInFlag = 0 Then - If CancelFlag = 0 Then - Var QR_POPUP = "/img_popup8.png" - Var alphaState = "Enable" - Coin CARD + If alphaState = "Invisible" Then + If CoinInFlag = 0 Then + If CancelFlag = 0 Then + Var QR_POPUP = "/img_popup8.png" + Var alphaState = "Enable" + ;Coin CARD + Var ReqPayInfoFromCashOther = 2 + Var CreditCardRef = "" - Var ReqPayInfoFromCashOther = 2 + GenHashWithTimeStamp CreditCardRef + DEBUGVAR VendingCashless + Var QRCODE99 = "" + Var Timeout = 0 + Var QRErrorState = "Invisible" - Var CreditCardRef = "" - GenHashWithTimeStamp CreditCardRef - DEBUGVAR VendingCashless + ;add-pd-to-ref + Var CreditCardRef = CreditCardRef + "/" + Var CreditCardRef = CreditCardRef + SelectDrink + DEBUGVAR CreditCardRef - Var QRCODE99 = "" - Var Timeout = 0 - Var QRErrorState = "Invisible" + If CoinInOK = 1 Then - ;add-pd-to-ref - Var CreditCardRef = CreditCardRef + "/" - Var CreditCardRef = CreditCardRef + SelectDrink - DEBUGVAR CreditCardRef + Else + Var Timeout = 0 + EndIf - ;Var QR_POPUP = "/img_popup8-2.png" - Var VendingCashless = "-" - ;Var LOADING_STATE = "Enable" - ;Var alphaState = "Enable" - Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign - CashlessPay RemainAmountX CreditCardRef - Var CashlessPayFlag = 1 - EndIf - EndIf + Var QRErrorState = "Invisible" + Var VendingCashless = "-" + Var LOADING_STATE = "Enable" + Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign + CashlessPay RemainAmountX CreditCardRef + Var CashlessPayFlag = 1 + EndIf + EndIf + EndIf -EndIf + Refresh