Merge
This commit is contained in:
commit
9c264a6213
16 changed files with 233 additions and 61 deletions
BIN
image/pos_midnight/pos_close_midnight_en.png
Normal file
BIN
image/pos_midnight/pos_close_midnight_en.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
image/pos_midnight/pos_close_midnight_th.png
Normal file
BIN
image/pos_midnight/pos_close_midnight_th.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
|
|
@ -4,6 +4,7 @@ If CatalogLayoutV3 = 1 Then
|
|||
Var layoutVersion = "v3/"
|
||||
EndIf
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
TRY "ROOT/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
SAVELOG "=================== Control language and switch instance ========================="
|
||||
|
|
|
|||
|
|
@ -179,3 +179,8 @@
|
|||
|
||||
DEBUGVAR MenuVSelected2
|
||||
EndIf
|
||||
Var ButtonLanguageCurrentXPosition = 1015
|
||||
Var ButtonLanguageCurrentYPosition = 458 - 38
|
||||
|
||||
Var ButtonLanguageListXPosition = 990
|
||||
Var ButtonLanguageListYPosition = 450 - 38
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<EventOpen>
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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" "-"
|
|||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
;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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
<Y> 938 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<Align> Center </Align>
|
||||
<MaxSize> 66 </MaxSize>
|
||||
<MaxSize> 66 </MaxSize>
|
||||
<Size> Auto </Size>
|
||||
<MaxLine> 1 </MaxLine>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
80
xml/page_pos_machine_midnight_close.xml
Normal file
80
xml/page_pos_machine_midnight_close.xml
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
<Page>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1540 </Height>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Background> "0x2C2F4E" </Background>
|
||||
|
||||
<EventOpen>
|
||||
|
||||
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
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
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
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
<Video>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Filename> "ROOT/taobin_project/video/Taobin_Sleep_Screen.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Button>
|
||||
<X> 990 </X>
|
||||
<Y> 380 </Y>
|
||||
<Filename> show_btn </Filename>
|
||||
<FilenamePress> show_btp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
; eng
|
||||
If show_eng = "true" Then
|
||||
Var show_eng = "false"
|
||||
Else
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
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 show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||
EndIf
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<X> 156 </X>
|
||||
<Y> 380 </Y>
|
||||
<Filename> title_image </Filename>
|
||||
</Image>
|
||||
|
||||
</Page>
|
||||
|
|
@ -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"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -222,18 +222,18 @@
|
|||
Var ENABLE_CHINA = "Invisible"
|
||||
Var ENABLE_MALAY = "Invisible"
|
||||
Var ENABLE_MTC = "Invisible"
|
||||
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/xml/multi/control_and_lang_swith.ev"
|
||||
EndIf
|
||||
If CountryName = "HongKong" Then
|
||||
If EnableMultiInstance = "true" Then
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
Var ENABLE_THAI = "Invisible"
|
||||
Var ENABLE_JAPAN = "Invisible"
|
||||
Var ENABLE_CHINA = "Invisible"
|
||||
Var ENABLE_MALAY = "Invisible"
|
||||
Var ENABLE_MYANMAR = "Invisible"
|
||||
TRY "ROOT/taobin_project/inter/hkg/xml/multi/control_and_lang_swith.ev"
|
||||
EndIf
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
Var ENABLE_THAI = "Invisible"
|
||||
Var ENABLE_JAPAN = "Invisible"
|
||||
Var ENABLE_CHINA = "Invisible"
|
||||
Var ENABLE_MALAY = "Invisible"
|
||||
Var ENABLE_MYANMAR = "Invisible"
|
||||
TRY "ROOT/taobin_project/inter/hkg/xml/multi/control_and_lang_swith.ev"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue