diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index fe2e3a5a..67b6772b 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -13,33 +13,7 @@ TopView "hide" - If TNumberTaobinMember = "" Then - - Else - If PayWithQR = 1 Then - Var VendingTSID = VendingTSIDTmp - EndIf - - - Var BmiYear = PointTaobinStr - Var PointCrm = "" - - If FromConsent = 1 Then - Var PointCrm = "pdpa1" - EndIf - - Var GetScore = VendingTSID - If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore - Else - Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore - EndIf - - Var TNumberTaobinMember = "" - Var VendingTSID = "" - - EndIf + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" diff --git a/xml/page_board.xml b/xml/page_board.xml index 11fd3769..38681b20 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -14,8 +14,8 @@ DEBUGVAR SoundVolume - - Var PauseOrder = "false" + Var Seeker = "curr" + Var NextOrder = "false" DEBUGVAR web_ref DEBUGVAR web_payment diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 47dff9e9..c6449b72 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -6,6 +6,9 @@ SoundVolume + + DEBUGVAR MachineStage + If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" @@ -14,7 +17,8 @@ Var PayType = "" EndIf - + Var SelectDrink = Seeker.selected_a_drink + Var ServiceAmount2 = Seeker.ServiceAmount2 ; On open move from page_brewing3.xml Var countClick2 = 0 @@ -37,15 +41,15 @@ Var VendingTSIDProblem = "" Var CreditReference = "" - If PayWithQR = 1 Then + If Seeker.PayWithQR = 1 Then Var VendingTSIDTmp = VendingTSID - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf @@ -60,7 +64,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var VendingDiscount = 0 Var VendingCampaign = 0 Var ServiceType = "credit" @@ -72,16 +76,16 @@ EndIf EndIf - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Var TelephoneNumberProblem = "" Else - Var TelephoneNumberProblem = TNumberTaobinMember + Var TelephoneNumberProblem = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumberProblem = TNumberTaobinCredit + Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit EndIf If TelephoneNumberProblem = "" Then @@ -93,31 +97,35 @@ Var Tel_Confirm_State = "Enable" EndIf + Var AddData = 0 - - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - If PayWithQR = 1 Then + If Seeker.PayWithQR = 1 Then Var VendingTSID = VendingTSIDTmp Else Var VendingTSID = "" EndIf - Var BmiYear = PointTaobinStr + Var BmiYear = Seeker.PointTaobinStr Var PointCrm = "" - If FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSID If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + Var Cid = 11 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore Else Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore + Var Cid = 14 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore EndIf - ;Var TNumberTaobinMember = "" + Var VendingTSID = "" EndIf @@ -135,11 +143,18 @@ EndIf - Var CreditReference = CreditReferenceTmp + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign - Var DirImage = "ROOT/taobin_project/image/complete/" - Var next_pic_bg = DirImage + "/Preparing.png" + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + EndIf + + Var next_pic_bg = DirImage + "/bn_add_order.png" @@ -149,7 +164,7 @@ If ActionOKCase = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -168,10 +183,10 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + IntVendingCampaign + Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -209,7 +224,7 @@ If ActionOKCase = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -228,10 +243,10 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + IntVendingCampaign + Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -325,7 +340,7 @@ If waitAckPay = 2 Then If Timeout > 10 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -344,10 +359,10 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + IntVendingCampaign + Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -370,18 +385,18 @@ If ChangeOK = 2 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf @@ -403,7 +418,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;If CodeChannel = 0 Then + ;If Seeker.CodeChannel = 0 Then ; SAVELOG "back_to_main from line > 315." ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ;EndIf @@ -417,18 +432,18 @@ If ChangeTimeout > 30 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf Var PayDetail = "1/" + HURR_FOREVER @@ -447,7 +462,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;If CodeChannel = 0 Then + ;If Seeker.CodeChannel = 0 Then ; SAVELOG "back_to_main from line > 357." ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" ;EndIf @@ -465,9 +480,9 @@ Var SVT = "coffee" Var ACC = "0899999999" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var ACC = TNumberTaobinMember + Var ACC = Seeker.TNumberTaobinMember EndIf Var PayDetail = "1/" + HURR_FOREVER @@ -484,7 +499,7 @@ PAYEXT SVT ACC VendingTSIDTmp DEE Var ActionOKCase = 1 - If CodeChannel = 0 Then + If Seeker.CodeChannel = 0 Then SAVELOG "back_to_main from line > 391." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf @@ -506,22 +521,25 @@ Var ProcessText = "" - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf + If AddData = 1 Then + AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + EndIf Var ServiceType = "coffee" Var ServiceCredit = SelectDrink @@ -537,18 +555,18 @@ ;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 CodeChannel = 1 - Var VendingCode = "C48" - Var CodeNumber = "0000000000" + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "C48" + Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 EndIf - If PayWithQR = 0 Then - If CodeChannel = 1 Then + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + SelectDrink Var SessionID2 = SessionID2 + "/" @@ -556,16 +574,16 @@ Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "S" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If CodeChannel = 2 Then + If Seeker.CodeChannel = 2 Then Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + SelectDrink Var SessionID2 = SessionID2 + "/" @@ -573,7 +591,7 @@ Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "S" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -594,9 +612,9 @@ Var ACC = "0899999999" Var DEE = PayDetail - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var ACC = TNumberTaobinMember + Var ACC = Seeker.TNumberTaobinMember EndIf PAYEXT SVT ACC VendingTSIDTmp DEE @@ -619,13 +637,17 @@ If ErrTimeout = 0 Then Var ErrTimeout = 1 + If AddData = 1 Then + AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + EndIf - If PayWithQR = 0 Then - If CodeChannel = 0 Then + + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 0 Then If ChangeFlag = 0 Then Var ChangeFlag = 1 - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 Else If GetFreeFromError = 1 Then @@ -644,9 +666,9 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 - Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 Else Change ServiceAmount3 @@ -684,7 +706,6 @@ EndIf EndIf - If MachineStage = "show-menu" Then If MachineState_Result = 0 Then SAVELOG "back_to_main from line > 655." @@ -965,17 +986,19 @@ -; + diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml new file mode 100644 index 00000000..91e4344d --- /dev/null +++ b/xml/page_brewing3Conti.xml @@ -0,0 +1,819 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var ActionOKCase = 0 + Var Seeker = "curr" + + + + + Var PayReference = "" + Var PayType = "" + Var MachineState_Result = 0 + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + + + Var SelectDrink = Seeker.selected_a_drink + Var ServiceAmount2 = Seeker.ServiceAmount2 + + + + + + ; On open move from page_brewing3.xml + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + Var AddData = 0 + + 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 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 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 DirImage = "ROOT/taobin_project/image/complete/" + Var next_pic_bg = DirImage + "/Preparing.png" + + + + + + + + If ActionOKCase = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + 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 + "C00" + 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 + 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 + + 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 + "C00" + 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 = "" + 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 + + 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 + "C00" + 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 + + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + + ;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 + + 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 + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + ;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 + + 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 + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + + + Var DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + + 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 Timeout = 5 + + + + + EndIf + EndIf + + If MachineState_Result = 1 Then + 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 + + + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + ;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 + Seeker.CodeNumber + 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 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + If Seeker.CodeChannel = 2 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 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + 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 + + Var ServiceSuccess = "yes" + If waitAckPay = 0 Then + 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 Seeker.PayWithQR = 0 Then + 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 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 + + 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 + + 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 + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + 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 + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + 60 + 1290 + PictureFile + + + + 60 + 1649 + BottomText + + + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index d0cb1169..0e1515c0 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -59,15 +59,15 @@ Var CreditReference = "" - If PayWithQR = 1 Then + If Seeker.PayWithQR = 1 Then Var VendingTSIDTmp = VendingTSID - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf Var PayType = "" @@ -86,7 +86,7 @@ Var PayReference = PayReferenceTmp Else - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then If CoinAmount > 0 Then Var VendingDiscount = 0 Var VendingCampaign = 0 @@ -103,16 +103,16 @@ EndIf EndIf - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Var TelephoneNumberProblem = "" Else - Var TelephoneNumberProblem = TNumberTaobinMember + Var TelephoneNumberProblem = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumberProblem = TNumberTaobinCredit + Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit EndIf If TelephoneNumberProblem = "" Then @@ -126,19 +126,19 @@ - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - If PayWithQR = 1 Then + If Seeker.PayWithQR = 1 Then Var VendingTSID = VendingTSIDTmp Else Var VendingTSID = "" EndIf - Var BmiYear = PointTaobinStr + Var BmiYear = Seeker.PointTaobinStr Var PointCrm = "" - If FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Var PointCrm = "pdpa1" EndIf Var GetScore = VendingTSID @@ -146,10 +146,10 @@ If AddPointFlag = 0 Then Var AddPointFlag = 1 If TaobinErrorNetwork = 0 Then - AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + AddData 11 Seeker.TNumberTaobinMember BmiYear PointCrm GetScore Else Var PointCrm = "" - AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore + AddData 14 Seeker.TNumberTaobinMember BmiYear PointCrm GetScore EndIf EndIf @@ -180,7 +180,7 @@ If ActionOKCase = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -199,7 +199,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C" Var ServiceParameter = "max" @@ -239,7 +239,7 @@ If ActionOKCase = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -258,7 +258,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C" Var ServiceParameter = "max" @@ -350,7 +350,7 @@ If waitAckPay = 2 Then If Timeout > 10 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -369,7 +369,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C" Var ServiceParameter = "max" @@ -394,18 +394,18 @@ If ChangeOK = 2 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf @@ -427,7 +427,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;If CodeChannel = 0 Then + ;If Seeker.CodeChannel = 0 Then ; SAVELOG "back_to_main from line > 315." ; Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" ;EndIf @@ -441,18 +441,18 @@ If ChangeTimeout > 30 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf Var PayDetail = "1/" + HURR_FOREVER @@ -471,7 +471,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - ;If CodeChannel = 0 Then + ;If Seeker.CodeChannel = 0 Then ; SAVELOG "back_to_main from line > 357." ; Open "ROOT/taobin_project/xml/page_drinkfail2Multi.xml" ;EndIf @@ -495,18 +495,18 @@ Var ProcessText = "" - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" - If TNumberTaobinMember = "" Then + If Seeker.TNumberTaobinMember = "" Then Else - Var TelephoneNumber = TNumberTaobinMember + Var TelephoneNumber = Seeker.TNumberTaobinMember EndIf Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf @@ -526,18 +526,18 @@ ;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 CodeChannel = 1 - Var VendingCode = "C48" - Var CodeNumber = "0000000000" + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "C48" + Var Seeker.CodeNumber = "0000000000" Var VendingCampaign = ServiceAmount2 EndIf - If PayWithQR = 0 Then - If CodeChannel = 1 Then + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + SelectDrink Var SessionID2 = SessionID2 + "/" @@ -545,16 +545,16 @@ Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "S" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Else - If CodeChannel = 2 Then + If Seeker.CodeChannel = 2 Then Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + Seeker.VendingCode Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + SelectDrink Var SessionID2 = SessionID2 + "/" @@ -562,7 +562,7 @@ Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "S" Var SessionID2 = SessionID2 + "/" - Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + Seeker.CodeNumber Var SessionID2 = SessionID2 + "/" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -596,12 +596,12 @@ Var ErrTimeout = 1 - If PayWithQR = 0 Then - If CodeChannel = 0 Then + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 0 Then If ChangeFlag = 0 Then Var ChangeFlag = 1 - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 Else ;Change ServiceAmount2 @@ -616,9 +616,9 @@ If ChangeFlag = 0 Then Var ChangeFlag = 1 - Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 2 Else ;Change ServiceAmount3 diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 7c50cfbd..78bf0e51 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -1,308 +1,317 @@ - - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "PressForever" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - Var showCart = "Invisible" - If MultiPayEnable = "true" Then - - If CART_COUNT = 1 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart1.png" - Var cart_image_bp = DirImageCart + "/bp_cart1.png" - EndIf - - If CART_COUNT = 2 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart2.png" - Var cart_image_bp = DirImageCart + "/bp_cart2.png" - EndIf - - - - If CART_COUNT = 3 Then - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - EndIf - - EndIf - - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - + + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "PressForever" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + Var showCart = "Invisible" + If MultiPayEnable = "true" Then + + If CART_COUNT = 1 Then + Var showCart = "Enable" + Var cart_image_bn = DirImageCart + "/bn_cart1.png" + Var cart_image_bp = DirImageCart + "/bp_cart1.png" + EndIf + + If CART_COUNT = 2 Then + Var showCart = "Enable" + Var cart_image_bn = DirImageCart + "/bn_cart2.png" + Var cart_image_bp = DirImageCart + "/bp_cart2.png" + EndIf + + + + If CART_COUNT = 3 Then + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + EndIf + + EndIf + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + 10 497 @@ -406,12 +415,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -512,12 +521,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_2.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_2.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -618,12 +627,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_3.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_3.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -724,12 +733,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_4.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_4.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -830,12 +839,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_5.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_5.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -936,12 +945,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_6.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_6.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1042,12 +1051,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_7.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_7.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1148,12 +1157,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_8.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_8.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1254,12 +1263,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_9.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_9.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1360,12 +1369,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_10.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_10.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1466,12 +1475,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_11.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_11.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1572,12 +1581,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_12.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_12.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1678,12 +1687,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_13.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_13.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1784,12 +1793,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_14.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_14.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1890,12 +1899,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_15.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_15.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1996,12 +2005,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $best_seller_16.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $best_seller_16.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2020,25 +2029,25 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - - - - + + + + + + + + + + diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index f987f74c..1d7ba068 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -1,288 +1,296 @@ - - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "PressForever" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - - - - Var Timeout = 0 - - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - + + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "PressForever" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + + + + Var Timeout = 0 + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + 10 497 @@ -386,12 +394,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -492,12 +500,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0013.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -598,12 +606,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -704,12 +712,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -810,12 +818,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-11-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-11-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -916,12 +924,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1022,12 +1030,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0014.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1128,12 +1136,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1234,12 +1242,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0021.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1340,12 +1348,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1446,12 +1454,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1552,12 +1560,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1658,12 +1666,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1764,12 +1772,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1870,12 +1878,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1976,12 +1984,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2082,12 +2090,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2188,12 +2196,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-01-0017.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2294,12 +2302,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0018.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2400,12 +2408,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2506,12 +2514,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2612,12 +2620,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-11-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-11-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2718,12 +2726,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2824,12 +2832,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2930,12 +2938,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3036,12 +3044,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0021.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3142,12 +3150,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3248,12 +3256,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-11-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-11-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3354,12 +3362,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3460,12 +3468,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3566,12 +3574,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3672,12 +3680,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3778,12 +3786,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3884,12 +3892,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3990,12 +3998,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0017.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4096,12 +4104,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-01-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-01-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4120,9 +4128,9 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index d6c14e78..8d6e15dc 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -1,284 +1,292 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "PressForever" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "PressForever" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + 10 497 @@ -382,12 +390,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -488,12 +496,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -594,12 +602,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -700,12 +708,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -806,12 +814,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -912,12 +920,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1018,12 +1026,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1124,12 +1132,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1230,12 +1238,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1336,12 +1344,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1442,12 +1450,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1548,12 +1556,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1654,12 +1662,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1760,12 +1768,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1866,12 +1874,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1972,12 +1980,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2078,12 +2086,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2184,12 +2192,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2290,12 +2298,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2396,12 +2404,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2502,12 +2510,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2608,12 +2616,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2714,12 +2722,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2820,12 +2828,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2926,12 +2934,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3032,12 +3040,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3138,12 +3146,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3244,12 +3252,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3350,12 +3358,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3456,12 +3464,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3562,12 +3570,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3668,12 +3676,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3692,10 +3700,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 9de523da..c84f2778 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -1,285 +1,293 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "PressForever" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "PressForever" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + 10 497 @@ -383,12 +391,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -489,12 +497,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-01-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -595,12 +603,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-01-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -701,12 +709,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-01-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -807,12 +815,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-01-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -913,12 +921,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1019,12 +1027,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1125,12 +1133,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1231,12 +1239,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1337,12 +1345,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1443,12 +1451,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-03-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-03-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1549,12 +1557,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-03-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-03-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1655,12 +1663,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1761,12 +1769,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1867,12 +1875,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-03-03-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-03-03-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1891,10 +1899,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index 7672d4c3..b6343a5f 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -1,285 +1,293 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + 10 497 @@ -383,12 +391,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -489,12 +497,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -595,12 +603,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -701,12 +709,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -807,12 +815,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -913,12 +921,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1019,12 +1027,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1125,12 +1133,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1149,10 +1157,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index b529193f..9892d204 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -1,286 +1,294 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "PressForever" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "PressForever" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -384,12 +392,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -490,12 +498,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0019.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -596,12 +604,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0020.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -702,12 +710,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -808,12 +816,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0035.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0035.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -914,12 +922,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1020,12 +1028,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1126,12 +1134,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0033.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0033.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1232,12 +1240,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0028.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0028.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1338,12 +1346,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0012.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1444,12 +1452,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0041.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0041.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1550,12 +1558,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1656,12 +1664,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0031.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0031.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1762,12 +1770,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1868,12 +1876,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1974,12 +1982,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0024.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0024.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2080,12 +2088,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0038.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0038.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2186,12 +2194,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0029.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0029.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2292,12 +2300,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0025.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0025.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2398,12 +2406,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0039.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0039.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2504,12 +2512,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0014.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2610,12 +2618,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0015.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0015.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2716,12 +2724,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2822,12 +2830,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -2928,12 +2936,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0034.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0034.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3034,12 +3042,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3140,12 +3148,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0032.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0032.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3246,12 +3254,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3352,12 +3360,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3458,12 +3466,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3564,12 +3572,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0026.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0026.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3670,12 +3678,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0030.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0030.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3776,12 +3784,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3882,12 +3890,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -3988,12 +3996,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0016.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0016.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4094,12 +4102,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0017.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4200,12 +4208,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-02-0018.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4306,12 +4314,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-05-01-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-05-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -4330,10 +4338,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index f6a7acd0..20e1337f 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -1,285 +1,293 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "PressForever" - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - Var Timeout = 0 - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "PressForever" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + Var Timeout = 0 + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -383,12 +391,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -489,12 +497,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -595,12 +603,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -701,12 +709,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0013.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -807,12 +815,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -913,12 +921,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1019,12 +1027,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1125,12 +1133,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1231,12 +1239,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1337,12 +1345,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1443,12 +1451,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1549,12 +1557,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0011.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1655,12 +1663,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $12-04-02-0014.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $12-04-02-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1679,10 +1687,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 8a4c9e9b..c4754535 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -1,286 +1,294 @@ - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Invisible" - - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "PressForever" - EndIf - - Var Timeout = 0 - - - - - 1000 - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - Open NextPage - EndIf - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "PressForever" + EndIf + + Var Timeout = 0 + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -384,12 +392,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0001.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -490,12 +498,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0002.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -596,12 +604,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0003.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -702,12 +710,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0004.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -808,12 +816,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0005.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -914,12 +922,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0006.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1020,12 +1028,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0007.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1126,12 +1134,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0008.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1232,12 +1240,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0009.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1338,12 +1346,12 @@ 2 2 - eval( STRCONTAIN "Smoothie" $11-99-05-0010.Button SmoRet - If SmoRet = "true" Then - Var return = "Enable" - Else - Var return = "Invisible" - EndIf + eval( STRCONTAIN "Smoothie" $11-99-05-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf ) "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -1574,10 +1582,10 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - + + + + + + + diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index e79253dd..ba085e93 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -85,12 +85,7 @@ Var TNumberTaobinMemberXXX = TelephoneNumber - Trim TNumberTaobinMemberXXX 3 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 + Var CoffeePointRank = Ext1b diff --git a/xml/page_check_member1.xml b/xml/page_check_member1.xml index 65a4032b..c26c9eaa 100644 --- a/xml/page_check_member1.xml +++ b/xml/page_check_member1.xml @@ -73,12 +73,7 @@ Var TNumberTaobinMemberXXX = TelephoneNumber - Trim TNumberTaobinMemberXXX 3 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 - Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 + Var CoffeePointRank = Ext1b diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index e58531ae..3173302f 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -1032,6 +1032,7 @@ KanitRegularTTF 0xFFFFFF TNumberTaobinMemberXXX + Telnum-mask-1 diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index a07c02b3..2b390531 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -22,16 +22,16 @@ EndIf SAVELOG "collect_point1" - SAVELOG TNumberTaobinCredit + SAVELOG Seeker.TNumberTaobinCredit SAVELOG TelephoneNumber SAVELOG "collect_point1_" - Var FromConsent = 0 + Var Seeker.FromConsent = 0 - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var number7 = "" Var number8 = "" Var number9 = "" @@ -57,7 +57,7 @@ EndIf Else - Var TelephoneNumber = TNumberTaobinCredit + Var TelephoneNumber = Seeker.TNumberTaobinCredit Var StepGetPoint = 0 diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 9a69dfb1..27cb68aa 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -22,9 +22,9 @@ If PayOfflineMode = 1 Then Var TaobinErrorNetwork = 1 - Var PointTaobinStr = "" + PayAmount - Var PointTaobinStr = PointTaobinStr + "/1/0" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.PointTaobinStr = "" + PayAmount + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf @@ -47,9 +47,9 @@ Var CoffeePoint = 1 Var TaobinErrorNetwork = 1 - Var PointTaobinStr = "" + PayAmount - Var PointTaobinStr = PointTaobinStr + "/1/0" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.PointTaobinStr = "" + PayAmount + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf @@ -82,11 +82,11 @@ If Ext1a = "" Then ;Var CoffeePoint = 1 - ;Var TNumberTaobinMember = TelephoneNumber + ;Var Seeker.TNumberTaobinMember = TelephoneNumber Var TaobinErrorNetwork = 1 - Var PointTaobinStr = "" + PayAmount - Var PointTaobinStr = PointTaobinStr + "/1/0" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.PointTaobinStr = "" + PayAmount + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" Else @@ -100,13 +100,7 @@ Var TNumberTaobinMemberXXX = TelephoneNumber - ;Trim TNumberTaobinMemberXXX 3 - ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" - ;Var TNumberTaobinMemberXXX = "XXX-XXX-" - ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 - ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 - ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 - ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 + If TaobinLevel = 1 Then Var PointTaobin = PayAmount / 20 @@ -116,9 +110,9 @@ - Var PointTaobinStr = "" + PointTaobin - Var PointTaobinStr = PointTaobinStr + "/" - Var PointTaobinStr = PointTaobinStr + PointTaobin + Var Seeker.PointTaobinStr = "" + PointTaobin + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/" + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + PointTaobin Var CoffeePointRank = Ext1b @@ -136,11 +130,11 @@ Else ;Var CoffeePoint = 1 - ;Var TNumberTaobinMember = TelephoneNumber + ;Var Seeker.TNumberTaobinMember = TelephoneNumber Var TaobinErrorNetwork = 1 - Var PointTaobinStr = "" + PayAmount - Var PointTaobinStr = PointTaobinStr + "/1/0" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.PointTaobinStr = "" + PayAmount + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf @@ -160,9 +154,9 @@ Else ;Var CoffeePoint = 1 Var TaobinErrorNetwork = 1 - Var PointTaobinStr = "" + PayAmount - Var PointTaobinStr = PointTaobinStr + "/1/0" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.PointTaobinStr = "" + PayAmount + Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 4dc9b55a..fc2caf79 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -14,7 +14,7 @@ Var BmiYear = "0/0/0/0/0/0/0/0/0/1" Var PointCrm = "pdpa1" Var GetScore = "" - Var TNumberTaobinMember = TelephoneNumber + Var Seeker.TNumberTaobinMember = TelephoneNumber ;AddData 4 TelephoneNumber BmiYear PointCrm GetScore ;Add after pay @@ -603,6 +603,12 @@ If CoffeePoint >= 30 Then Var taobinP30 = "Enable" EndIf + + If Seeker = "curr" Then + Var CheckCouponState = "Enable" + Else + Var CheckCouponState = "Disable" + EndIf 1000 @@ -625,7 +631,7 @@ If CoffeePoint > 29 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - If FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -773,7 +779,7 @@ ; goto lid straw ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" - If FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else If CoffeePoint > 29 Then @@ -790,8 +796,10 @@ diff --git a/xml/page_member_topupSuccess.xml b/xml/page_member_topupSuccess.xml index bde3effc..1fe6b5ca 100644 --- a/xml/page_member_topupSuccess.xml +++ b/xml/page_member_topupSuccess.xml @@ -11,9 +11,13 @@ Var Timeout = 0 - + DEBUGVAR PayAmount + DEBUGVAR TaobinCredit + + INT TaobinCredit + INT PayAmount - Var SumCreditAmount = CoffeeCredit + PayAmount + Var SumCreditAmount = TaobinCredit + PayAmount Var ServiceAmount2 = PayAmount Var ServiceCharge = 0 Var Donate = "" @@ -46,7 +50,7 @@ If PayCreditChannel = "cash" Then - Var SumCreditAmount = CoffeeCredit + CoinAmount + Var SumCreditAmount = TaobinCredit + CoinAmount Var TelephoneNumber = TelephoneNumber Var PayO2 = PinNumber diff --git a/xml/page_payment.xml b/xml/page_payment.xml index bbbedd33..ed8de8ff 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -32,23 +32,23 @@ Var CountStepPackPayment = 0 - Var VendingCode = "C00" - Var VendingCampaignRI3 = 0 - Var IntVendingCampaign = 0 - Var FreeVendingCampaign = 0 - Var CodeChannel = 0 + Var Seeker.VendingCode = "C00" + Var Seeker.VendingCampaignRI3 = 0 + Var Seeker.IntVendingCampaign = 0 + Var Seeker.FreeVendingCampaign = 0 + Var Seeker.CodeChannel = 0 Var CoinVendingOnFlag = 0 - Var IntVendingCredit = 0 + Var Seeker.IntVendingCredit = 0 - Var StoreCreditFlag = 0 - Var pageStoreCredit0 = 0 - Var TNumberTaobinCredit = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + Var Seeker.StoreCreditFlag = 0 + Var Seeker.pageStoreCredit0 = 0 + Var Seeker.TNumberTaobinCredit = "" + Var Seeker.TNumberTaobinMember = "" + Var Seeker.CoffeePinNumber = "" + ;Var VendingTSIDTmp = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + Var PayType = "" Var CART_INDEX = 0 @@ -86,7 +86,7 @@ Var MachineStage = "-" Var PayReference = "" - Var CreditReferenceTmp = "" + Var Seeker.CreditReferenceTmp = "" If web_app_prepar = "true" Then Var web_app_prepar = "false" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index fdf38230..fe7b5410 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -27,7 +27,7 @@ Var FlagQROpened = 0 Var PayInfoCFlag = 0 Var ActionOKCase = 0 - Var VendingCampaign = IntVendingCampaign + Var VendingCampaign = Seeker.IntVendingCampaign Var PayAmount = PriceDrink @@ -49,9 +49,9 @@ Var CancelNumber = 3 Var PayAmount = PriceDrink - Var RemainAmount = PayAmount - IntVendingCampaign + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var RemainAmountStr = "" + RemainAmount Var Timeout = 0 Var PayOK = 0 @@ -69,12 +69,13 @@ Var ServiceCredit = SelectDrink Var ServiceAmount2 = PayAmount + Var Seeker.ServiceAmount2 = PayAmount Var ServiceCharge = 0 Var Donate = "" Var SuggestID = "" Var CancleState = "Enable" - Var VendingDiscount = DiscountDrink + Var Seeker.VendingDiscount = DiscountDrink Var CashTextWarning = "" @@ -89,12 +90,12 @@ DEBUGVAR QRCODE99 SAVELOG VendingCampaign - SAVELOG VendingCode - SAVELOG CodeChannel + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel - If VendingCode = "C00" Then - Var CodeChannel = 0 + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 EndIf DEBUGVAR QRCODE99KBANK @@ -109,7 +110,7 @@ Else Var PayState1 = "Enable" - If IntVendingCampaign = 0 Then + If Seeker.IntVendingCampaign = 0 Then Var PayState2 = "Enable" Var PayState4 = "Enable" Var PayState5 = "Enable" @@ -130,7 +131,7 @@ Var CoinInFlag = 1 EndIf - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var PayState2 = "Disable" Var PayState4 = "Disable" Var PayState5 = "Disable" @@ -150,7 +151,7 @@ - Var PayWithQR = 0 + Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" @@ -172,28 +173,23 @@ EndIf If GetFreeFromError = 1 Then - Var FreeVendingCampaign = 1 - CoinVending OFF - MakeDrinkV1 SelectDrink SelectSugarID + Var Seeker.FreeVendingCampaign = 1 + CoinVending OFF + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf - If IntVendingCampaign >= PayAmount Then - Var RemainAmount = 0 - Var RemainAmountStr = "" + RemainAmount - CoinVending OFF - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - - EndIf + If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit - Var SumCoinAmount = CoinAmount + IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF @@ -272,7 +268,7 @@ Var pay_with_code_image = DirImage + "/bn_pay_with_codeSmall_error.png" Else - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var pay_with_code_image = DirImage + "/bp_pay_with_code.png" Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png" @@ -333,20 +329,20 @@ - If IntVendingCampaign > 0 Then - Var ECommerceQR = ECommerceQR + VendingCode + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + CodeNumber + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + VendingCampaignRI3 + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 EndIf - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var ECommerceQR = ECommerceQR + "CRD" Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + IntVendingCredit + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit EndIf @@ -389,10 +385,11 @@ VendingQR OFF CoinVending OFF - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - MakeDrinkV1 SelectDrink SelectSugarID - Var PayWithQR = 1 - ;Open "/media/bt/xml/page_page4-1.xml" + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Var Seeker.PayWithQR = 1 + Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" @@ -500,7 +497,7 @@ EndIf If PayInfoCFlag = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -519,10 +516,10 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + IntVendingCampaign + Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -534,10 +531,11 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 EndIf - If PauseOrder = "false" Then + If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf @@ -553,7 +551,7 @@ Var CoinInCounter = CoinInCounter + 1 If CoinInCounter = 1 Then - Var ChangeOK = 1 + ;Var ChangeOK = 1 Var Timeout = 180 Var PayOK = 1 @@ -568,7 +566,10 @@ If Timeout > 180 Then If PayOK = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" Else @@ -584,21 +585,22 @@ Var CancelCounter = 0 If CoinAmount = 0 Then - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf - If IntVendingCampaign = 0 Then + If Seeker.IntVendingCampaign = 0 Then VendingQR OFF - If PauseOrder = "false" Then + If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf EndIf @@ -610,18 +612,18 @@ If CancelFlag = 1 Then - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf Var CancelCounter = CancelCounter + 1 If CancelCounter = CancelNumber Then ;Change CoinAmount If CoinAmount > 0 Then - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 1 Else Change CoinAmount @@ -646,12 +648,12 @@ If ChangeOK = 1 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf Var VendingDiscount = 0 @@ -665,11 +667,12 @@ ; Open "ROOT/taobin_project/xml/page_catalog.xml" ;EndIf Var ActionOKCase = 1 - If IntVendingCampaign = 0 Then - If PauseOrder = "false" Then + If Seeker.IntVendingCampaign = 0 Then + If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf EndIf @@ -719,9 +722,7 @@ Var alphaState = "Invisible" EndIf - ;If StoreCreditFlag = 1 Then - ; Var ViewBill = 0 - ;EndIf + Var CoinInFlag = 1 @@ -735,8 +736,8 @@ Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit If ViewBill > RemainAmount Then Var RemainAmountKeep = ViewBill - RemainAmount @@ -763,11 +764,11 @@ If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit - Var SumCoinAmount = CoinAmount + IntVendingCampaign - Var SumCoinAmount = SumCoinAmount + IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF @@ -1021,20 +1022,20 @@ - If IntVendingCampaign > 0 Then - Var ECommerceQR = ECommerceQR + VendingCode + If Seeker.IntVendingCampaign > 0 Then + Var ECommerceQR = ECommerceQR + Seeker.VendingCode Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + CodeNumber + Var ECommerceQR = ECommerceQR + Seeker.CodeNumber Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + VendingCampaignRI3 + Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 EndIf - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var ECommerceQR = ECommerceQR + "CRD" Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + IntVendingCredit + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit Var ECommerceQR = ECommerceQR + ":" Var ECommerceQR = ECommerceQR + PointCrm EndIf @@ -1156,11 +1157,11 @@ Var ECommerceQR = ECommerceQR + "AIR:2/" ;If IntVendingCampaign > 0 Then - ; Var ECommerceQR = ECommerceQR + VendingCode + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCode ; Var ECommerceQR = ECommerceQR + ":" - ; Var ECommerceQR = ECommerceQR + CodeNumber + ; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber ; Var ECommerceQR = ECommerceQR + ":" - ; Var ECommerceQR = ECommerceQR + VendingCampaignRI3 + ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3 ;EndIf Var ServiceParameter = "max" @@ -1526,53 +1527,7 @@ - diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index c9c0105d..410fe6f2 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -22,7 +22,7 @@ Var FlagQROpened = 0 Var PayInfoCFlag = 0 Var ActionOKCase = 0 - Var VendingCampaign = IntVendingCampaign + Var VendingCampaign = Seeker.IntVendingCampaign Var PayAmount = PriceDrink @@ -43,9 +43,9 @@ Var CancelNumber = 3 Var PayAmount = PriceDrink - Var RemainAmount = PayAmount - IntVendingCampaign + Var RemainAmount = PayAmount - Seeker.IntVendingCampaign Var RemainAmount = RemainAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit Var RemainAmountStr = "" + RemainAmount Var Timeout = 0 Var PayOK = 0 @@ -70,7 +70,7 @@ Var SuggestID = "" Var CancleState = "Enable" - Var VendingDiscount = DiscountDrink + Var Seeker.VendingDiscount = DiscountDrink Var CashTextWarning = "" @@ -84,12 +84,12 @@ SAVELOG QRCODE99 SAVELOG VendingCampaign - SAVELOG VendingCode - SAVELOG CodeChannel + SAVELOG Seeker.VendingCode + SAVELOG Seeker.CodeChannel - If VendingCode = "C00" Then - Var CodeChannel = 0 + If Seeker.VendingCode = "C00" Then + Var Seeker.CodeChannel = 0 EndIf @@ -140,7 +140,7 @@ Else Var PayState1 = "Enable" - If IntVendingCampaign = 0 Then + If Seeker.IntVendingCampaign = 0 Then Var PayState2 = "Enable" Var PayState4 = "Enable" Var PayState5 = "Enable" @@ -161,7 +161,7 @@ Var CoinInFlag = 1 EndIf - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var PayState2 = "Disable" Var PayState4 = "Disable" Var PayState5 = "Disable" @@ -181,7 +181,7 @@ - Var PayWithQR = 0 + Var Seeker.PayWithQR = 0 Var NoGotoMenupage = "false" If show_eng = "true" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png" @@ -203,14 +203,14 @@ EndIf If GetFreeFromError = 1 Then - Var FreeVendingCampaign = 1 + Var Seeker.FreeVendingCampaign = 1 CoinVending OFF MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf - ;If IntVendingCampaign >= PayAmount Then + ;If Seeker.IntVendingCampaign >= PayAmount Then ; Var RemainAmount = 0 ; Var RemainAmountStr = "" + RemainAmount ; CoinVending OFF @@ -222,9 +222,9 @@ If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit - Var SumCoinAmount = CoinAmount + IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF @@ -303,7 +303,7 @@ Var pay_with_code_image = DirImage + "/bp_pay_with_code_error.png" Else - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var pay_with_code_image = DirImage + "/bp_pay_with_code_error2.png" Var pay_with_credit_image = DirImage + "/bp_pay_with_credit_error2.png" @@ -374,7 +374,7 @@ Var CART_INDEX = 1 Var PayReference = MultiTSID ;GenHashWithTimeStamp PayReference - Var PayWithQR = 1 + Var Seeker.PayWithQR = 1 Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -479,7 +479,7 @@ EndIf If PayInfoCFlag = 1 Then - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + ExtendData @@ -498,10 +498,10 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + IntVendingCampaign + Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -528,7 +528,7 @@ Var CoinInCounter = CoinInCounter + 1 If CoinInCounter = 1 Then - Var ChangeOK = 1 + ;Var ChangeOK = 1 Var Timeout = 180 Var PayOK = 1 @@ -568,14 +568,14 @@ Var CancelFlag = 1 Var CancelCounter = 0 If CoinAmount = 0 Then - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf - If IntVendingCampaign = 0 Then + If Seeker.IntVendingCampaign = 0 Then VendingQR OFF Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -589,18 +589,20 @@ If CancelFlag = 1 Then - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf Var CancelCounter = CancelCounter + 1 If CancelCounter = CancelNumber Then ;Change CoinAmount + + DEBUGVAR CoinAmount If CoinAmount > 0 Then - If StoreCreditFlag = 1 Then + If Seeker.StoreCreditFlag = 1 Then Var ChangeOK = 1 Else Change CoinAmount @@ -625,13 +627,15 @@ If ChangeOK = 1 Then If ActionOKCase = 0 Then - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Var TelephoneNumber = "0899999999" Var PayO2 = "" Else - Var TelephoneNumber = TNumberTaobinCredit - Var PayO2 = CoffeePinNumber + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber EndIf + + DEBUGVAR "TUBEKUNG" Var VendingDiscount = 0 Var VendingCampaign = 0 @@ -641,7 +645,7 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Var ActionOKCase = 1 - If IntVendingCampaign = 0 Then + If Seeker.IntVendingCampaign = 0 Then Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf @@ -693,7 +697,7 @@ Var alphaState = "Invisible" EndIf - ;If StoreCreditFlag = 1 Then + ;If Seeker.StoreCreditFlag = 1 Then ; Var ViewBill = 0 ;EndIf @@ -709,8 +713,8 @@ Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit If ViewBill > RemainAmount Then Var RemainAmountKeep = ViewBill - RemainAmount @@ -737,11 +741,11 @@ If CoinInOK = 0 Then Var RemainAmount = PayAmount - CoinAmount - Var RemainAmount = RemainAmount - IntVendingCampaign - Var RemainAmount = RemainAmount - IntVendingCredit + Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign + Var RemainAmount = RemainAmount - Seeker.IntVendingCredit - Var SumCoinAmount = CoinAmount + IntVendingCampaign - Var SumCoinAmount = SumCoinAmount + IntVendingCredit + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit If SumCoinAmount >= PayAmount Then ;Var VendingQRCode = "ERROR" CoinVending OFF @@ -782,9 +786,10 @@ If CoinInFlag = 1 Then - Cart "DeleteMenuID" "ALL" + If CoinInOK = 0 Then If CancelFlag = 0 Then + Cart "DeleteMenuID" "ALL" SAVELOG "VDCancle > Cancle Order." CoinVending OFF Var CancelFlag = 1 @@ -1044,11 +1049,11 @@ If CoinInFlag = 0 Then VendingQR OFF - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf @@ -1163,12 +1168,12 @@ Var ECommerceQR = ECommerceQR + "/" Var ECommerceQR = ECommerceQR + "KBA:2/" - If IntVendingCredit > 0 Then + If Seeker.IntVendingCredit > 0 Then Var ECommerceQR = ECommerceQR + "CRD" Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + TNumberTaobinCredit + Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit Var ECommerceQR = ECommerceQR + ":" - Var ECommerceQR = ECommerceQR + IntVendingCredit + Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit EndIf Var ServiceParameter = "max" @@ -1317,9 +1322,10 @@ SoundVolume - Cart "DeleteMenuID" "ALL" + If CoinInOK = 0 Then If CancelFlag = 0 Then + Cart "DeleteMenuID" "ALL" SAVELOG "ButtonCancleMain > Cancle All Order." CoinVending OFF Var CancelFlag = 1 @@ -1373,13 +1379,15 @@ cart1_en "ROOT/taobin_project/image/page_payment/iconX.png" - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit - Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + If CoinInFlag = 0 Then + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit + Var GetScore = "useCredit" + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 + EndIf + Cart "DeleteMenuID" 1 EndIf - Cart "DeleteMenuID" 1 @@ -1418,13 +1426,15 @@ cart2_en "ROOT/taobin_project/image/page_payment/iconX.png" - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit +If CoinInFlag = 0 Then + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf Cart "DeleteMenuID" 2 +EndIf @@ -1463,13 +1473,15 @@ cart3_en "ROOT/taobin_project/image/page_payment/iconX.png" - If IntVendingCredit > 0 Then - Var BmiYear = IntVendingCredit +If CoinInFlag = 0 Then + If Seeker.IntVendingCredit > 0 Then + Var BmiYear = Seeker.IntVendingCredit Var GetScore = "useCredit" - AddData 24 TNumberTaobinCredit BmiYear PointCrm GetScore - Var IntVendingCredit = 0 + AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore + Var Seeker.IntVendingCredit = 0 EndIf Cart "DeleteMenuID" 3 +EndIf @@ -1572,12 +1584,13 @@ SoundVolume - - Cart "DeleteMenuID" "ALL" + + If CoinInOK = 0 Then If CancelFlag = 0 Then + Cart "DeleteMenuID" "ALL" SAVELOG "ButtonCancleAlpha2 > Cancle Order." CoinVending OFF Var CancelFlag = 1 diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 2e51b9bb..4ee50e8f 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -10,12 +10,12 @@ ; On open Var ECommerce = "" - Var FreeVendingCampaign = 0 + Var Seeker.FreeVendingCampaign = 0 Var Timeout = 0 Var GetPayInfoFlag = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 ;Var VendingQRCode = "ERROR" ;VendingQR ON @@ -49,7 +49,7 @@ Var TelephoneNumber = web_code - Var CodeNumber = TelephoneNumber + Var Seeker.CodeNumber = TelephoneNumber Var RemainAmount = 0 ;PrepareDrink SelectDrink SelectSugarID @@ -71,7 +71,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -85,8 +85,8 @@ GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var Timeout = 0 - Var TelephoneNumber = CodeNumber - Var CodeChannel = 1 + Var TelephoneNumber = Seeker.CodeNumber + Var Seeker.CodeChannel = 1 EndIf EndIf @@ -104,7 +104,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else @@ -148,48 +148,48 @@ - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then - SAVELOG "CodeChannel 1 > ActOK." + SAVELOG "Seeker.CodeChannel 1 > ActOK." SAVELOG ECommerce - SPLIT ECommerce "/" 5 VendingCode - SPLIT ECommerce "/" 7 VendingCampaignRI3 + SPLIT ECommerce "/" 5 Seeker.VendingCode + SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3 SPLIT ECommerce "/" 8 VendingCampaign1 - If VendingCode = "" Then - Var VendingCode = "C00" + If Seeker.VendingCode = "" Then + Var Seeker.VendingCode = "C00" EndIf - If VendingCode = "KBA:2" Then - Var VendingCode = "C00" + If Seeker.VendingCode = "KBA:2" Then + Var Seeker.VendingCode = "C00" EndIf - If VendingCode = "AIR" Then - Var VendingCode = "C00" + If Seeker.VendingCode = "AIR" Then + Var Seeker.VendingCode = "C00" EndIf - SAVELOG VendingCode - SAVELOG VendingCampaignRI3 + SAVELOG Seeker.VendingCode + SAVELOG Seeker.VendingCampaignRI3 - If VendingCode = "C00" Then + If Seeker.VendingCode = "C00" Then Else - Var IntVendingCampaign = VendingCampaignRI3 - INT IntVendingCampaign + Var Seeker.IntVendingCampaign = Seeker.VendingCampaignRI3 + INT Seeker.IntVendingCampaign Var VendingREFID = SessionID - If IntVendingCampaign > 0 Then + If Seeker.IntVendingCampaign > 0 Then Var QRChannel = 0 - If IntVendingCampaign >= PayAmount Then + If Seeker.IntVendingCampaign >= PayAmount Then ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" - Var VendingCampaign = PayAmount - Var FreeVendingCampaign = 1 + 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 @@ -228,11 +228,11 @@ ;Var ECommerce = ECommerce + SelectDrink ;Var ECommerce = ECommerce + "/" ;Var ECommerce = ECommerce + "KBA:2/" - ;Var ECommerce = ECommerce + VendingCode + ;Var ECommerce = ECommerce + Seeker.VendingCode ;Var ECommerce = ECommerce + ":" - ;Var ECommerce = ECommerce + CodeNumber + ;Var ECommerce = ECommerce + Seeker.CodeNumber ;Var ECommerce = ECommerce + ":" - ;Var ECommerce = ECommerce + VendingCampaignRI3 + ;Var ECommerce = ECommerce + Seeker.VendingCampaignRI3 ;Var ServiceParameter = "max" ;Var ServiceCharge = 0 ;Var AccountType = "new" @@ -245,9 +245,9 @@ ;GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 - ;Var CodeChannel = 2 + ;Var Seeker.CodeChannel = 2 - Var CodeChannel = 1 + Var Seeker.CodeChannel = 1 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" @@ -262,21 +262,21 @@ Var ShowErrorText = "Enable" Var text_show_error = DirImage + "/text_show_error.png" Var GetPayInfoFlag = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 EndIf EndIf Else - ;SAVELOG "CodeChannel 2 > ActOK." + ;SAVELOG "Seeker.CodeChannel 2 > ActOK." ; ;Var CreditAmount = 0 ;Var QRCODE99 = SessionID ;Var QRCODE99 = QRCODE99 + Ext1a ;Var QRCODE99 = QRCODE99 + Ext21 ;Var QRCODETMP = QRCODE99 - ;Var CodeChannel = 1 + ;Var Seeker.CodeChannel = 1 ; ;If CART_COUNT >= 1 Then ; Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" @@ -290,7 +290,7 @@ - If CodeChannel = 1 Then + If Seeker.CodeChannel = 1 Then Var TelephoneNumber = "" Var ShowErrorText = "Enable" @@ -304,13 +304,13 @@ EndIf Var GetPayInfoFlag = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable" Refresh EndIf - If CodeChannel = 2 Then - Var CodeChannel = 1 + If Seeker.CodeChannel = 2 Then + Var Seeker.CodeChannel = 1 Var QRCODE99 = "" Var QRCODETMP = "" If CART_COUNT >= 1 Then @@ -598,7 +598,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else @@ -642,7 +642,7 @@ VendingQR OFF - Var CodeNumber = TelephoneNumber + Var Seeker.CodeNumber = TelephoneNumber Var RemainAmount = 0 ;PrepareDrink SelectDrink SelectSugarID @@ -664,7 +664,7 @@ Var ECommerce = ECommerce + "/" Var ECommerce = ECommerce + "C00" Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + Seeker.CodeNumber Var ServiceParameter = "max" Var ServiceCharge = 0 Var AccountType = "new" @@ -678,8 +678,8 @@ GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc Var Timeout = 0 - Var TelephoneNumber = CodeNumber - Var CodeChannel = 1 + Var TelephoneNumber = Seeker.CodeNumber + Var Seeker.CodeChannel = 1 EndIf diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 97730256..1f1ab62f 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -46,7 +46,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else @@ -556,7 +556,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 36f4249f..069b197c 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -76,7 +76,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index c0fc3f7e..91b6420c 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -105,7 +105,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Else @@ -127,17 +127,17 @@ If ReqAdddata22 = 1 Then If NotEnoughFlag = 0 Then - Var CreditReferenceTmp = "" + PayAmount - Var CreditReferenceTmp = CreditReferenceTmp + "/" - Var CreditReferenceTmp = CreditReferenceTmp + PointCrm + Var Seeker.CreditReferenceTmp = "" + PayAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm CoinVending OFF - Var TNumberTaobinCredit = TelephoneNumber - Var CoffeePinNumber = PinNumber + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber - Var StoreCreditFlag = 1 + Var Seeker.StoreCreditFlag = 1 If CART_COUNT >= 1 Then @@ -149,7 +149,11 @@ Else Var CART_INDEX = 0 - MakeDrinkV1 SelectDrink SelectSugarID + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf Else @@ -158,19 +162,19 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 - Var TNumberTaobinCredit = TelephoneNumber - Var CoffeePinNumber = PinNumber + Var Seeker.TNumberTaobinCredit = TelephoneNumber + Var Seeker.CoffeePinNumber = PinNumber - Var IntVendingCredit = SumCreditAmount + Var Seeker.IntVendingCredit = SumCreditAmount - Var CreditReferenceTmp = "" + SumCreditAmount - Var CreditReferenceTmp = CreditReferenceTmp + "/" - Var CreditReferenceTmp = CreditReferenceTmp + PointCrm + Var Seeker.CreditReferenceTmp = "" + SumCreditAmount + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" + Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm - Var StoreCreditFlag = 1 + Var Seeker.StoreCreditFlag = 1 If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" @@ -241,7 +245,7 @@ Var PayState1 = "PressForever" Var PayState2 = "Enable" Var QRChannel = 0 - Var CodeChannel = 0 + Var Seeker.CodeChannel = 0 SAVELOG "payment_credit3-p121." If CART_COUNT >= 1 Then Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index a441bbaf..3575a2a5 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -145,25 +145,25 @@ Var CountStepPackPayment = 0 - Var VendingCode = "C00" - Var VendingCampaignRI3 = 0 - Var IntVendingCampaign = 0 - Var FreeVendingCampaign = 0 - Var CodeChannel = 0 + Var Seeker.VendingCode = "C00" + Var Seeker.VendingCampaignRI3 = 0 + Var Seeker.IntVendingCampaign = 0 + Var Seeker.FreeVendingCampaign = 0 + Var Seeker.CodeChannel = 0 Var CoinVendingOnFlag = 0 - Var IntVendingCredit = 0 + Var Seeker.IntVendingCredit = 0 - Var StoreCreditFlag = 0 - Var pageStoreCredit0 = 0 - Var TNumberTaobinCredit = "" - Var TNumberTaobinMember = "" - Var VendingTSIDTmp = "" + Var Seeker.StoreCreditFlag = 0 + Var Seeker.pageStoreCredit0 = 0 + Var Seeker.TNumberTaobinCredit = "" + Var Seeker.TNumberTaobinMember = "" + ;Var VendingTSIDTmp = "" Var MultiTSID = "" Var PayReference = "" - Var CreditReferenceTmp = "" + Var Seeker.CreditReferenceTmp = "" Var AddPointFlag = 0 Var PayType = "" diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index d9590755..a753a916 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -43,10 +43,10 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then Change StoreCreditAmount Var ChangeFlag2 = 1 - If FreeVendingCampaign = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else Open "ROOT/taobin_project/xml/page_collect_point_1.xml" @@ -87,13 +87,13 @@ If Ext1a = "ok" Then Var CoffeeCredit = Ext1b INT CoffeeCredit - Var CoffeePinNumber = Ext1c + Var Seeker.CoffeePinNumber = Ext1c - Var TNumberTaobinCredit = TelephoneNumber + Var Seeker.TNumberTaobinCredit = TelephoneNumber - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then - Var StoreCreditFlag = 1 + Var Seeker.StoreCreditFlag = 1 @@ -101,7 +101,7 @@ Open "ROOT/taobin_project/xml/page_payment_storeCredit2-2.xml" Else - Var StoreCreditFlag = 1 + Var Seeker.StoreCreditFlag = 1 If ViewBill < RemainAmount Then @@ -126,7 +126,7 @@ Else If Ext1a = "new customer" Then Var CoffeeCreditKeep = 0 - Var TNumberTaobinCredit = TelephoneNumber + Var Seeker.TNumberTaobinCredit = TelephoneNumber Open "ROOT/taobin_project/xml/page_payment_storeCredit2.xml" Else @@ -616,11 +616,11 @@ - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then Change StoreCreditAmount Var ChangeFlag2 = 1 - Var TNumberTaobinCredit = "" - If FreeVendingCampaign = 1 Then + Var Seeker.TNumberTaobinCredit = "" + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else Open "ROOT/taobin_project/xml/page_collect_point_1.xml" diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml index 7dc6bd73..37b00d66 100644 --- a/xml/page_payment_storeCredit0.xml +++ b/xml/page_payment_storeCredit0.xml @@ -21,7 +21,7 @@ Var GetCreditFlag = 0 Var clickedChangeFlag = 0 - Var pageStoreCredit0 = 1 + Var Seeker.pageStoreCredit0 = 1 If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en/page_payment" @@ -43,7 +43,7 @@ Change StoreCreditAmount Var ChangeFlag2 = 1 - If FreeVendingCampaign = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else Open "ROOT/taobin_project/xml/page_collect_point_1.xml" @@ -98,10 +98,10 @@ SoundVolume - If TNumberTaobinCredit = "" Then + If Seeker.TNumberTaobinCredit = "" Then Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" Else - Var StoreCreditFlag = 1 + Var Seeker.StoreCreditFlag = 1 Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf @@ -127,7 +127,7 @@ - If FreeVendingCampaign = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else Open "ROOT/taobin_project/xml/page_collect_point_1.xml" diff --git a/xml/page_payment_storeCredit2-2.xml b/xml/page_payment_storeCredit2-2.xml index b13e79ac..b3aa26d0 100644 --- a/xml/page_payment_storeCredit2-2.xml +++ b/xml/page_payment_storeCredit2-2.xml @@ -514,7 +514,7 @@ Var BmiYear = "" Var PointCrm = "" Var GetScore = "" - AddData 13 TNumberTaobinCredit BmiYear PointCrm GetScore + AddData 13 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore Var ShowTextNumber1 = "Invisible" @@ -656,10 +656,10 @@ Var FlagOKButton = 1 - If CoffeePinNumber = PinNumber Then - Var StoreCreditFlag = 1 - Var CoffeePinNumber = PinNumber - If pageStoreCredit0 = 1 Then + If Seeker.CoffeePinNumber = PinNumber Then + Var Seeker.StoreCreditFlag = 1 + Var Seeker.CoffeePinNumber = PinNumber + If Seeker.pageStoreCredit0 = 1 Then Var CoffeeCreditKeep = StoreCreditAmount + CoffeeCredit Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml" @@ -774,7 +774,7 @@ RobotoBlack 0x513C2F "Enable" - TNumberTaobinCredit + Seeker.TNumberTaobinCredit Telnum Telnum-mask-1 diff --git a/xml/page_payment_storeCredit2.xml b/xml/page_payment_storeCredit2.xml index d98660e9..e3055679 100644 --- a/xml/page_payment_storeCredit2.xml +++ b/xml/page_payment_storeCredit2.xml @@ -585,11 +585,11 @@ Var FlagOKButton = 1 - Var StoreCreditFlag = 1 - Var CoffeePinNumber = PinNumber + Var Seeker.StoreCreditFlag = 1 + Var Seeker.CoffeePinNumber = PinNumber - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then Var CoffeeCreditKeep = StoreCreditAmount + 0 @@ -687,7 +687,7 @@ RobotoBlack 0x513C2F "Enable" - TNumberTaobinCredit + Seeker.TNumberTaobinCredit Telnum Telnum-mask-1 diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 02b193c8..05c13f1c 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -21,7 +21,7 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then Else @@ -37,11 +37,11 @@ Var Timeout = Timeout + 1 If Timeout > 5 Then - If pageStoreCredit0 = 1 Then + If Seeker.pageStoreCredit0 = 1 Then - If FreeVendingCampaign = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else Open "ROOT/taobin_project/xml/page_collect_point_1.xml" @@ -122,7 +122,7 @@ RobotoBlack 0x513C2F "Enable" - TNumberTaobinCredit + Seeker.TNumberTaobinCredit Telnum-mask-1 diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index d36985f9..d385a0cc 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -87,7 +87,7 @@ Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf - Var FromConsent = 1 + Var Seeker.FromConsent = 1 Var StepGetPoint = 1 GETACCEXT TelephoneNumber 14 diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml index c6baee6e..52cd47d2 100644 --- a/xml/page_show_consent2.xml +++ b/xml/page_show_consent2.xml @@ -59,10 +59,10 @@ If Ext1a = "ok" Then - Var FreeVendingCampaign = 1 - Var VendingCode = "C31" - Var CodeChannel = 2 - Var CodeNumber = IDNum + Var Seeker.FreeVendingCampaign = 1 + Var Seeker.VendingCode = "C31" + Var Seeker.CodeChannel = 2 + Var Seeker.CodeNumber = IDNum MakeDrinkV1 SelectDrink SelectSugarID ; Old ;Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 9e78ccbb..c94377ae 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -28,6 +28,9 @@ Var ChangeAmountSum = 0 Var Tel_Confirm_Flag = 0 + If Seeker = "curr" + Var LastMakeDrinkResult = "-" + EndIf If show_eng = "true" Then @@ -57,9 +60,13 @@ EndIf - DEBUGVAR TNumberTaobinCredit + DEBUGVAR Seeker.TNumberTaobinCredit DEBUGVAR TelephoneNumber - DEBUGVAR StoreCreditFlag + DEBUGVAR Seeker.StoreCreditFlag + + If Seeker = "next" Then + Var NextOrder = "true" + EndIf @@ -77,11 +84,11 @@ Cart "MakeID" CART_INDEX EndIf - If PayWithQR = 0 Then - If FreeVendingCampaign = 0 Then - If IntVendingCampaign < PayAmount Then - Var SumCoinAmount = CoinAmount + IntVendingCampaign - Var SumCoinAmount = SumCoinAmount + IntVendingCredit + If Seeker.PayWithQR = 0 Then + If Seeker.FreeVendingCampaign = 0 Then + If Seeker.IntVendingCampaign < PayAmount Then + Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign + Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit If SumCoinAmount >= PayAmount Then Var Canout = SumCoinAmount - PayAmount @@ -157,8 +164,8 @@ Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Else - If StoreCreditFlag = 1 Then - If FreeVendingCampaign = 1 Then + If Seeker.StoreCreditFlag = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else If CART_INDEX >= 2 Then @@ -171,7 +178,7 @@ If GotoStoreCredit0 = 1 Then Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" Else - If FreeVendingCampaign = 1 Then + If Seeker.FreeVendingCampaign = 1 Then Open "ROOT/taobin_project/xml/page_lid_straw.xml" Else If CART_INDEX >= 2 Then diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml new file mode 100644 index 00000000..8408bb1a --- /dev/null +++ b/xml/page_thankyouConti.xml @@ -0,0 +1,159 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + ; On open + Var CountDownThankyou = 3 + Var CountDownBrewing = BrewTime + Var CountUpBrewing = 0 + SAVELOG BrewTime + Var ShowCountDownBrewing = CountDownBrewing + Var Timeout = 0 + Var ChangeFlag = 0 + Var ErrTimeout = 0 + Var ActionOKCase = 0 + Var ChangeTimeout = 0 + + Var MachineState_Result = 0 + + Var FailedCount = 0 + Var ChangeAmountSum = 0 + + Var Tel_Confirm_Flag = 0 + Var LastMakeDrinkResult = "-" + + + If show_eng = "true" Then + Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Var BottomText = PicturePath + "text_bottom_eng.png" + Else + Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var BottomText = PicturePath + "text_bottom_thai2.png" + EndIf + + DEBUGVAR StarwState + DEBUGVAR LidState + DEBUGVAR BottomText + + If StarwState = "Press" Then + Machine StrawWithDelay + LED LedDoorLid Blink 255 255 255 255 + EndIf + If LidState = "Press" Then + Machine LidWithDelay + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + DEBUGVAR Seeker.TNumberTaobinCredit + DEBUGVAR TelephoneNumber + DEBUGVAR Seeker.StoreCreditFlag + + + If Seeker = "curr" Then + Topping "Select" Seeker.selected_a_drink + + ; Set option toppinng and pack + Topping "Select1-ID" Seeker.topping1 + Topping "Select2-ID" Seeker.topping2 + Topping "Select3-ID" Seeker.topping3 + + ; Pack + Topping "Pack" ExtendData + + EndIf + + + + + 1000 + + Var CountDownBrewing = CountDownBrewing - 1 + Var CountDownThankyou = CountDownThankyou - 1 + + Var Timeout = Timeout + 1 + If Timeout = 3 Then + + If CART_INDEX = 0 Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + ;Cart "MakeID" CART_INDEX + EndIf + + + + EndIf + + + ; run test; + If CountDownThankyou = 0 Then + + + + Var CountDownBrewing = BrewTime + Var CountUpBrewing = 0 + SAVELOG BrewTime + Var ShowCountDownBrewing = CountDownBrewing + + Open "ROOT/taobin_project/xml/page_brewing3.xml" + + + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + Refresh + TimerReset + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + 375 + 623 + 331 + 435 + Seeker.PictureDrink + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + Seeker.showname + + + + If ChangeStatus = "payout-end" Then + + EndIf + + + + diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 60b5480d..17d23ce0 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -163,7 +163,13 @@ If Timeout > 40 Then Var Timeout = 0 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf If MultiPayEnable = "true" Then @@ -1417,7 +1423,12 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_catalog.xml" + + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf @@ -1515,7 +1526,7 @@ SoundVolume - Var Seeker = "curr" + ;Var Seeker = "curr" Var Seeker.PriceDrink = PriceDrinkTmp SAVELOG "USER press next ( topping ) - new" @@ -1577,6 +1588,9 @@ EndIf + Var Seeker.PictureDrink = PictureDrink + Var Seeker.showname = showname + If CART_COUNT = 0 Then Open "ROOT/taobin_project/xml/page_payment.xml" Else