diff --git a/inter/uae_dubai/image/page_doing/img2.png b/inter/uae_dubai/image/page_doing/img2.png new file mode 100644 index 00000000..99822d48 Binary files /dev/null and b/inter/uae_dubai/image/page_doing/img2.png differ diff --git a/inter/uae_dubai/image/page_doing/img2_eng.png b/inter/uae_dubai/image/page_doing/img2_eng.png new file mode 100644 index 00000000..0652e86a Binary files /dev/null and b/inter/uae_dubai/image/page_doing/img2_eng.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_back.png b/inter/uae_dubai/image/page_payment_cash/bn_back.png new file mode 100644 index 00000000..ef9a7af7 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_back.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_back2.png b/inter/uae_dubai/image/page_payment_cash/bn_back2.png new file mode 100644 index 00000000..449c8021 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_back2.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_back_arrow2.png b/inter/uae_dubai/image/page_payment_cash/bn_back_arrow2.png new file mode 100644 index 00000000..1b38f0bf Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_back_arrow2.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_cancel.png b/inter/uae_dubai/image/page_payment_cash/bn_cancel.png new file mode 100644 index 00000000..13478bc6 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_cancel.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_cancel2.png b/inter/uae_dubai/image/page_payment_cash/bn_cancel2.png new file mode 100644 index 00000000..06ae31b8 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_cancel2.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_cancel3.png b/inter/uae_dubai/image/page_payment_cash/bn_cancel3.png new file mode 100644 index 00000000..46fbd33a Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_cancel3.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/bn_cancel_all.png b/inter/uae_dubai/image/page_payment_cash/bn_cancel_all.png new file mode 100644 index 00000000..a301199a Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/bn_cancel_all.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI.png b/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI.png new file mode 100644 index 00000000..fb6d4929 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI.png differ diff --git a/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png b/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png new file mode 100644 index 00000000..215f1f30 Binary files /dev/null and b/inter/uae_dubai/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png differ diff --git a/inter/uae_dubai/note.txt b/inter/uae_dubai/note.txt new file mode 100644 index 00000000..4297f363 --- /dev/null +++ b/inter/uae_dubai/note.txt @@ -0,0 +1 @@ +adb push ./taobin_project/inter/uae_dubai/support_langs /sdcard/coffeevening/country/support_langs \ No newline at end of file diff --git a/inter/uae_dubai/xml/menu_catalog_new.lxml b/inter/uae_dubai/xml/menu_catalog_new.lxml index 56c42176..815087b8 100644 --- a/inter/uae_dubai/xml/menu_catalog_new.lxml +++ b/inter/uae_dubai/xml/menu_catalog_new.lxml @@ -41,8 +41,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_brewing3.lxml b/inter/uae_dubai/xml/page_brewing3.lxml index 0465b5a9..1984741c 100644 --- a/inter/uae_dubai/xml/page_brewing3.lxml +++ b/inter/uae_dubai/xml/page_brewing3.lxml @@ -113,6 +113,8 @@ Var XStraw = 274 EndIf + DEBUGVAR IMG_CNT + Var waitAckPay = 0 Var VendingTSIDTmp = "" Var VendingTSIDProblem = "" @@ -720,6 +722,10 @@ 1000 + DEBUGVAR IMG_CNT + DEBUGVAR LanguageObjectShow + DEBUGVAR LanguageShow + DEBUGVAR show_eng Var Timeout = Timeout + 1 diff --git a/inter/uae_dubai/xml/page_brewing3Conti.lxml b/inter/uae_dubai/xml/page_brewing3Conti.lxml new file mode 100644 index 00000000..325dea37 --- /dev/null +++ b/inter/uae_dubai/xml/page_brewing3Conti.lxml @@ -0,0 +1,1240 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var ActionOKCase = 0 + Var Seeker = "curr" + + If PayCredit = 0 Then + Var PayCredit = 1 + CoinBack + EndIf + + ;Var PayCredit = 0 + + SAVELOG "page_brewing3Conti.lxml" + + 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" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2" + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + If LanguageShow = "UAE_DUBAI" Then + Var DirImage = CountryRootPath + "/image/page_payment_cash/" + Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png" + EndIf + + DEBUGVAR Seeker + DEBUGVAR IMG_CNT + + 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" + + If NextOrder = "true" Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Else + Var EnableSelectMenuBetweenBrew = "Enable" + EndIf + + If GetFreeFromError = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + + If EnableSelectMenuBetweenBrew = "Enable" Then + Var EnableSelectMenuBetweenBrewBlink = "Enable" + Else + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + EndIf + + + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + EndIf + + Var TimeoutWaitPay = 10 + + Var PayReference = "" + Var PayType = "newpay" + Var MachineState_Result = 0 + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + + Var ExtendData = Seeker.ExtendData + Var SelectDrink = Seeker.selected_a_drink + Var ServiceAmount2 = Seeker.ServiceAmount2 + + DEBUGVAR Seeker + DEBUGVAR Seeker.selected_a_drink + DEBUGVAR Seeker.ServiceAmount2 + + DEBUGVAR Seeker.CodeNumber + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + + ; On open move from page_brewing3.lxml + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + Var AddData = 0 + + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.PointTaobinStr + + If Seeker.TNumberTaobinMember = "" Then + + Else + If Seeker.PayWithQR = 1 Then + Var VendingTSIDTmp1 = VendingTSIDTmp + Else + Var VendingTSIDTmp1 = "" + EndIf + + + Var BmiYear = Seeker.PointTaobinStr + Var PointCrm = "" + If Seeker.FromConsent = 1 Then + Var PointCrm = "pdpa1" + EndIf + Var GetScore = VendingTSIDTmp1 + If Seeker.TaobinErrorNetwork = 0 Then + Var Cid = 11 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + Else + Var PointCrm = "" + Var Cid = 14 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + EndIf + + Var VendingTSIDTmp1 = "" + EndIf + + If Seeker.VendingCode = "MKFOO" Then + Var AddData = 0 + EndIf + + If LedLidBlink = "true" Then + Var LedLidBlink = "no" + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + DEBUGVAR TxReference + + + Var DirImage = "ROOT/taobin_project/image/complete/" + Var next_pic_bg = DirImage + "/Preparing.png" + + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" + + If Seeker.CreditCard = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + + Var CreditCardVoid = 0 + + DEBUGVAR ButtonGameCountDownState + + + + + + + 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 + + + DEBUGVAR IMG_CNT + + 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 = "" + + + + 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 = "" + + + + 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 + + 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 + + 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" + 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/inc/video.inc" + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + 60 + 1290 + PictureFile + + +; +; 60 +; 1649 +; BottomText +; + + + 0 + 1655 +EnableSelectMenuBetweenBrew + text_next_order + + + + 835 + 1735 +EnableSelectMenuBetweenBrewBlink + "ROOT/taobin_project/image/page_payment/arrow_1.png" + + + + + +; zone show time remaining + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + + + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + "ROOT/taobin_project/app/game/TAMATIAN-01.gif" + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + + DEBUGVAR Game01Enable + SAVELOG "Press play game conti" + Var Game01Enable = 0 + Var ButtonGamePressToPlayState = "Invisible" + RunApp "com.NDF.taobin" + + + + + + + +; straw left + + + + + + +; LID left + + + + + + + + diff --git a/inter/uae_dubai/xml/page_catalog_group_appfast.lxml b/inter/uae_dubai/xml/page_catalog_group_appfast.lxml index 5f984ca2..31833ece 100644 --- a/inter/uae_dubai/xml/page_catalog_group_appfast.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_appfast.lxml @@ -208,8 +208,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml b/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml index 4f880d6f..51e943be 100644 --- a/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml @@ -181,8 +181,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml index 2fcb6d15..aa74b4fd 100644 --- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml @@ -200,8 +200,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml index bb014fa7..3dceb1e8 100644 --- a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml @@ -209,8 +209,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml index 37a4f4f0..6ed4f5cf 100644 --- a/inter/uae_dubai/xml/page_catalog_group_health.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml @@ -200,8 +200,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_milk.lxml b/inter/uae_dubai/xml/page_catalog_group_milk.lxml index 1c2ba4d2..af866ae2 100644 --- a/inter/uae_dubai/xml/page_catalog_group_milk.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_milk.lxml @@ -198,8 +198,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml index 70d9898e..f301d7e0 100644 --- a/inter/uae_dubai/xml/page_catalog_group_other.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml @@ -199,8 +199,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml index faad22cf..875855c6 100644 --- a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml @@ -198,8 +198,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_tea.lxml b/inter/uae_dubai/xml/page_catalog_group_tea.lxml index 396fea1e..df616bcf 100644 --- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml @@ -200,8 +200,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_catalog_group_whey.lxml b/inter/uae_dubai/xml/page_catalog_group_whey.lxml index 22e9bb3e..cbb7ae57 100644 --- a/inter/uae_dubai/xml/page_catalog_group_whey.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_whey.lxml @@ -205,8 +205,11 @@ If Timeout > 60 Then SAVELOG "Timeout" + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else SAVELOG "Back" Open "ROOT/taobin_project/xml/page_back_to_main.xml" diff --git a/inter/uae_dubai/xml/page_topping_select6.lxml b/inter/uae_dubai/xml/page_topping_select6.lxml index 811f46c1..6d06f7ce 100644 --- a/inter/uae_dubai/xml/page_topping_select6.lxml +++ b/inter/uae_dubai/xml/page_topping_select6.lxml @@ -329,9 +329,12 @@ If Timeout > 40 Then Var Timeout = 0 + + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Open brewing3ContiInter Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" Open "ROOT/taobin_project/xml/page_catalog.xml" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 6e41fcf3..2b95b37e 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -36,6 +36,12 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + If InternationalEnable = 1 Then + If LanguageShow = "UAE_DUBAI" Then + Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png" + EndIf + EndIf + SAVELOG "collect_point1" SAVELOG Seeker.TNumberTaobinCredit SAVELOG TelephoneNumber diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 5a5ab24d..7517daa6 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -739,7 +739,23 @@ If CheckCoupons = 2 Then Var TaobinCredit = Ext1b - Open "ROOT/taobin_project/xml/page_check_member2.xml" + + If InternationalEnable = 1 Then + Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml" + + If CountryName = "Malaysia" Then + Open ChackMemberPage + EndIf + + If CountryName = "UnitedArabEmirates Dubai" Then + Open ChackMemberPage + EndIf + + + Else + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf + EndIf diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 45376f6c..c1f9dcf0 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -62,6 +62,17 @@ Var DirImage = "ROOT/taobin_project/image/complete/" EndIf + If LanguageShow = "UAE_DUBAI" Then + + Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png" + + Else + + Var text_bottom = DirImage + "text_bottom.png" + + EndIf + DEBUGVAR text_bottom + Var VideoPlayFile = VideoPath Var VideoPlayFile = VideoPlayFile + VideoFileBegin Var VideoPlayFile = VideoPlayFile + "24" @@ -612,7 +623,7 @@ 0 1418 TextBottomShow - Var( DirImage + "text_bottom.png") + text_bottom diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 0f8f49d4..69816181 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -75,6 +75,14 @@ Var PictureBegin = "txt_" Var PictureEnd = "_en.png" + ;inter-has-alter-anim + If CountryName = "UnitedArabEmirates Dubai" Then + ;check LanguageShow + If LanguageShow = "ENG" Then + Var PicturePath = "ROOT/taobin_project/image/page_doing/" + EndIf + + EndIf Else Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" @@ -132,7 +140,14 @@ UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2 EndIf - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + If CountryName = "UnitedArabEmirates Dubai" Then + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + + Open brewing3ContiInter + Else + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + Else Open "ROOT/taobin_project/xml/page_get_yourchange.xml" EndIf diff --git a/xml/page_payment_cash-SGP.xml b/xml/page_payment_cash-SGP.xml index e2e10d7a..7b7fb218 100644 --- a/xml/page_payment_cash-SGP.xml +++ b/xml/page_payment_cash-SGP.xml @@ -452,6 +452,15 @@ Var PayState6 = "Invisible" EndIf + + ;Disable taobin credit + + Var TopRowY = 1276 + Var BotRowY = 1499 + + If DisableTaobinCredit = "true" Then + Var PayState4 = "Invisible" + EndIf @@ -1504,7 +1513,13 @@ EndIf ; cash Singapore -; cash Singapore +; cash Dubai