diff --git a/image/pos_midnight/pos_close_midnight_en.png b/image/pos_midnight/pos_close_midnight_en.png new file mode 100644 index 00000000..d84b80db Binary files /dev/null and b/image/pos_midnight/pos_close_midnight_en.png differ diff --git a/image/pos_midnight/pos_close_midnight_th.png b/image/pos_midnight/pos_close_midnight_th.png new file mode 100644 index 00000000..e1592c1d Binary files /dev/null and b/image/pos_midnight/pos_close_midnight_th.png differ diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 574569e3..daa4b813 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -7,7 +7,7 @@ RootLayoutVisible 3 "hide" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" Var SendNotiPaySuccess = 2 @@ -288,6 +288,15 @@ Var EnableTopupCreditBetweenBrew = "Enable" EndIf + + If ConnectWithPOSMachine = 1 Then + If POS_SELL_STATUS = "NORMAL" Then + + Else + Var SelectMenuBetweenBrewEnable1 = "Invisible" + EndIf + EndIf + If GetFreeFromError = 1 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible" @@ -426,7 +435,7 @@ DEBUGVAR GameEnableFromTrickerEv DEBUGVAR GameOverrideDisable DEBUGVAR game_mode_enable - + DEBUGVAR Seeker @@ -618,11 +627,11 @@ Var IgnoreLidStrawAll = 0 Var bg_lidProblem_ST = "Invisible" Var GetLidButtonState = "Invisible" - + Var bg_strawProblem_ST = "Invisible" Var EnableGetMoreStrawFileName = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible" - + EndIf __CMD "SetErrorCodeHandleByXML" 1028 "-" "-" @@ -670,7 +679,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -723,7 +732,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -885,7 +894,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -930,7 +939,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -969,7 +978,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -1411,6 +1420,14 @@ EndIf + If SelectMenuBetweenBrewEnable1 = "Enable" Then + If ConnectWithPOSMachine = 1 Then + If POS_SELL_STATUS = "NORMAL" Then + Else + Var SelectMenuBetweenBrewEnable1 = "Invisible" + EndIf + EndIf + EndIf Refresh TimerReset diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index ccb49325..2b901c7f 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -55,6 +55,14 @@ Var EnableSelectMenuBetweenBrew = "Enable" EndIf + If ConnectWithPOSMachine = 1 Then + If POS_SELL_STATUS = "NORMAL" Then + + Else + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + EndIf + If GetFreeFromError = 1 Then Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible" @@ -186,7 +194,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -243,7 +251,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -342,7 +350,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -388,7 +396,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -427,7 +435,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -584,6 +592,16 @@ Var EnableTopupCreditBetweenBrew = "Invisible" EndIf + If EnableSelectMenuBetweenBrew = "Enable" Then + If ConnectWithPOSMachine = 1 Then + If POS_SELL_STATUS = "NORMAL" Then + + Else + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + EndIf + EndIf + If EnableSelectMenuBetweenBrew = "Enable" Then If EnableSelectMenuBetweenBrewBlink = "Enable" Then Var EnableSelectMenuBetweenBrewBlink = "Invisible" diff --git a/xml/page_NewCannotConti.xml b/xml/page_NewCannotConti.xml index e143910f..e1574c4f 100644 --- a/xml/page_NewCannotConti.xml +++ b/xml/page_NewCannotConti.xml @@ -188,7 +188,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -245,7 +245,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -322,7 +322,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -397,7 +397,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -438,7 +438,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 diff --git a/xml/page_board.xml b/xml/page_board.xml index d8f9305d..9dd75ebe 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -599,10 +599,24 @@ EndIf If ConnectWithPOSMachine = 1 Then - OpenInst 0 "ROOT/taobin_project/xml/page_network_down_pos_machine.xml" + OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml" EndIf EndIf + + If ConnectWithPOSMachine = 1 Then + DEBUGVAR POS_SELL_MODE + Var POSSellCountdown = 5 + If POS_SELL_MODE = "NORMAL" Then + + Else + Var BackgroundColor = "0x2C2F4E" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml" + EndIf + EndIf + + DEBUGVAR ButtontoTopupMenu STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup STRCONTAIN "taobin_notopping" XMLProfile taobin_notopping @@ -1127,7 +1141,7 @@ EnableLanguage "MTC" EnableLanguage "MSC" EnableLanguage "ENG" - + Var LanguageShow = "MTC" SetLanguage "MTC" LanguageControl "UpdateList" "-" @@ -1361,10 +1375,10 @@ Var CatalogLayoutV3 = 1 - + If BoxID = 123456 Then Var SpiralOnline = "true" - + Var InternationalShow = 0 EndIf @@ -1711,7 +1725,7 @@ Machine NewPaymentOpenBrewingXMLEnable - + If EnablePepsiFullscreen = 1 Then DEBUGVAR EnablePepsiFullscreen @@ -1893,7 +1907,7 @@ PRICE "Reset" "-" 1000 - + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" If CNTDOWN_PROTECT_SCREEN_BLANK > 0 Then @@ -2125,7 +2139,7 @@ PRICE "Reset" "-" DEBUGVAR InternationalEnable DEBUGVAR CountryName - + If CurrHelpCenter = 1 Then OpenInst 0 "ROOT/taobin_project/xml/page_board.xml" Else @@ -2294,6 +2308,22 @@ PRICE "Reset" "-" Open "ROOT/taobin_project/xml/page_sleepmode.xml" EndIf + If ConnectWithPOSMachine = 1 Then + If POSSellCountdown > 0 Then + Var POSSellCountdown = POSSellCountdown - 1 + Else + DEBUGVAR POS_SELL_MODE + Var POSSellCountdown = 5 + If POS_SELL_MODE = "NORMAL" Then + + Else + Var BackgroundColor = "0x2C2F4E" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml" + EndIf + EndIf + EndIf + ; for count helper show If EnableHelperShow = 1 Then If FromDrinkOk = 1 Then diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 67206da1..fca7a02e 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -209,6 +209,7 @@ If Seeker.PayWithQR = 0 Then DEBUGVAR TxRef1 Var PayDetail2 = ToppingDetail + Var ServiceCharge = Seeker.ServiceCharge DEBUGVAR PayDetail DEBUGVAR PayDetail2 @@ -257,6 +258,7 @@ If Seeker.PayWithQR = 0 Then DEBUGVAR TxRef1 Var PayDetail2 = ToppingDetail + Var ServiceCharge = Seeker.ServiceCharge DEBUGVAR PayDetail DEBUGVAR PayDetail2 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 91aada9e..2ddf0dea 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -10,7 +10,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" - + If Seeker = "curr" Then If MachineStage = "remove-cup" Then SAVELOG "MachineStage = remove-cup" @@ -37,7 +37,7 @@ EndIf - + Var IndoQR = 0 Var PaymentEnableAll = "true" @@ -79,7 +79,7 @@ SAVELOG BoxID - Var ServiceCharge = 0 + Var Seeker.ServiceCharge = 0 Var AdultFlag = 0 @@ -247,6 +247,17 @@ Var ReadyForBrew = "false" EndIf + If ConnectWithPOSMachine = 1 Then + If POS_SELL_STATUS = "NORMAL" Then + + Else + 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 + EndIf ; Test @@ -343,7 +354,7 @@ Var RoadShowMarketCode = "" Var Seeker.VendingCode = RoadShowMarketCode - + DEBUGVAR PriceDrink Var Seeker.IntVendingCampaign = PriceDrink @@ -632,7 +643,7 @@ 938 1080 Center - 66 + 66 Auto 1 KanitMediumTTF diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 0ebe01e2..746726b9 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -202,7 +202,7 @@ Var ServiceCredit = SelectDrink Var ServiceAmount2 = PayAmount Var Seeker.ServiceAmount2 = PayAmount - Var ServiceCharge = 0 + Var Seeker.ServiceCharge = 0 Var Donate = "" Var SuggestID = "" Var CancleState = "Enable" @@ -707,7 +707,7 @@ Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -762,7 +762,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -816,7 +816,7 @@ Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -869,7 +869,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -922,7 +922,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -975,7 +975,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1029,7 +1029,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1083,7 +1083,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1136,7 +1136,7 @@ EndIf Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1190,7 +1190,7 @@ Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1244,7 +1244,7 @@ Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -1975,7 +1975,7 @@ Var LOADING_STATE = "Invisible" Var CreditCardLoading = 0 - Var ServiceCharge = 0 + Var Seeker.ServiceCharge = 0 CoinVending XBILL Else @@ -2017,9 +2017,9 @@ Var QRErrorState = "Invisible" Var VendingCashless = "-" - Var ServiceCharge = 3 + Var Seeker.ServiceCharge = 3 Var RemainAmountX = RemainAmount - Var RemainAmountX = RemainAmountX + ServiceCharge + Var RemainAmountX = RemainAmountX + Seeker.ServiceCharge CashlessPay RemainAmountX CreditCardRef Var CashlessPayFlag = 1 EndIf @@ -2146,7 +2146,7 @@ Var ECommerce = ECommerce + "C:" Var ECommerce = ECommerce + Seeker.IntVendingCampaign Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -2335,6 +2335,7 @@ Var ServiceType = "credit" Var SessionID2 = SelectDrink Var ServiceCredit = "coffee" + Var ServiceCharge = Seeker.ServiceCharge Var PayDetail2 = Seeker.PayDetail2 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -3051,7 +3052,7 @@ Var ServiceParameter = "max" - Var ServiceCharge = 0 + Var ServiceCharge = Seeker.ServiceCharge Var AccountType = "new" Var testservice = "kbank" Var tc = "" @@ -3364,9 +3365,7 @@ eval( If KBankCashlessMachine = "1" Then If ReqPayInfoFromCashOther = 2 Then - If ServiceCharge > 0 Then - Var ServiceCharge = 0 - EndIf + Var Seeker.ServiceCharge = 0 CoinVending XBILL EndIf EndIf diff --git a/xml/page_pos_machine_midnight_close.xml b/xml/page_pos_machine_midnight_close.xml new file mode 100644 index 00000000..09e81b61 --- /dev/null +++ b/xml/page_pos_machine_midnight_close.xml @@ -0,0 +1,80 @@ + + 0 + 380 + 1080 + 1540 + SoundVolume + "Enable" + "0x2C2F4E" + + + + Var Timeout = 0 + + Var title_image = "ROOT/taobin_project/image/pos_midnight/pos_close_midnight_th.png" + If show_eng = "true" Then + Var title_image = "ROOT/taobin_project/image/pos_midnight/pos_close_midnight_en.png" + EndIf + + + + 1000 + + + If Timeout > 5 Then + DEBUGVAR POS_SELL_MODE + If POS_SELL_MODE = "NORMAL" Then + RootLayoutVisible 3 "show" + Open "ROOT/taobin_project/xml/page_board.xml" + EndIf + + Var Timeout = 0 + Else + Var Timeout = Timeout + 1 + EndIf + + TimerReset + + + + + + + + + 156 + 380 + title_image + + + \ No newline at end of file diff --git a/xml/page_network_down_pos_machine.xml b/xml/page_pos_machine_network_down.xml similarity index 97% rename from xml/page_network_down_pos_machine.xml rename to xml/page_pos_machine_network_down.xml index 39d16de6..52a9c558 100644 --- a/xml/page_network_down_pos_machine.xml +++ b/xml/page_pos_machine_network_down.xml @@ -67,7 +67,7 @@ EndIf - Open "ROOT/taobin_project/xml/page_network_down_pos_machine.xml" + Open "ROOT/taobin_project/xml/page_pos_machine_network_down.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 4ba25dc0..f5b29821 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -360,6 +360,9 @@ Var VendingDiscount = Seeker.VendingDiscount Var VendingCampaign = Seeker.VendingCampaign + DEBUGVAR Seeker.ServiceCharge + Var ServiceCharge = Seeker.ServiceCharge + DEBUGVAR ServiceCharge Var PayDetail = "2/F:1311/0//XML|" + Seeker.OrderChanel Var PayType = "" @@ -381,6 +384,7 @@ Var SessionID2 = SessionID2 + "/" Var PayDetail2 = ToppingDetail + DEBUGVAR PayDetail DEBUGVAR PayDetail2 diff --git a/xml/process/payment.ev b/xml/process/payment.ev index f9ee1e91..bb680b0f 100644 --- a/xml/process/payment.ev +++ b/xml/process/payment.ev @@ -8,6 +8,7 @@ If Seeker.PayWithQR = 1 Then Var VendingCampaign = 0 Var SelectDrink = Seeker.selected_a_drink Var SuggestID = "" + Var ServiceCharge = Seeker.ServiceCharge If ChangeFlag2 = 1 Then Var TelephoneNumber = "0899999999" @@ -54,6 +55,8 @@ If Seeker.PayWithQR = 1 Then Var ServiceCredit = SelectDrink Var SuggestID = "" + Var ServiceCharge = Seeker.ServiceCharge + Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel If GetFreeFromError = 1 Then @@ -90,6 +93,8 @@ If Seeker.PayWithQR = 1 Then Var ServiceCredit = SelectDrink Var SuggestID = "" + Var ServiceCharge = Seeker.ServiceCharge + Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel If GetFreeFromError = 1 Then