Merege
This commit is contained in:
commit
8fd1d4971b
201 changed files with 8997 additions and 18780 deletions
|
|
@ -16,7 +16,7 @@
|
|||
;EndIf
|
||||
|
||||
Var ErrorCause = ""
|
||||
Var MAX_EMA_CODE = 5
|
||||
Var MAX_UKB_CODE = 5
|
||||
|
||||
Var PreScaleCanculate = 100
|
||||
|
||||
|
|
@ -176,14 +176,14 @@
|
|||
Var PayWithCreditCardState = "Disable"
|
||||
Var PayWithTaoCreditState = "Disable"
|
||||
Var PayWithCouponState = "Disable"
|
||||
Var PayWithAUBState = "Disable"
|
||||
Var PayWithUKBState = "Disable"
|
||||
Var PayWithFatzebraState = "Disable"
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Var PayWithCreditCardState = "Invisible"
|
||||
Var PayWithTaoCreditState = "Invisible"
|
||||
Var PayWithCouponState = "Invisible"
|
||||
Var PayWithAUBState = "Invisible"
|
||||
Var PayWithUKBState = "Invisible"
|
||||
Var PayWithFatzebraState = "Invisible"
|
||||
Var showRemaining = "Free"
|
||||
Else
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
Var PayWithCreditCardState = "Enable"
|
||||
Var PayWithTaoCreditState = "Enable"
|
||||
Var PayWithCouponState = "Enable"
|
||||
Var PayWithAUBState = "Enable"
|
||||
Var PayWithUKBState = "Enable"
|
||||
Var PayWithFatzebraState = "Enable"
|
||||
|
||||
If Seeker.IntVendingCredit > 0 Then
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
Var PayWithCreditCardState = "Enable"
|
||||
Var PayWithTaoCreditState = "Disable"
|
||||
Var PayWithCouponState = "Disable"
|
||||
Var PayWithAUBState = "Disable"
|
||||
Var PayWithUKBState = "Disable"
|
||||
Var PayWithFatzebraState = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -343,7 +343,7 @@
|
|||
Var PayWithCreditCardState = "Enable"
|
||||
Var PayWithTaoCreditState = "Disable"
|
||||
Var PayWithCouponState = "Disable"
|
||||
Var PayWithAUBState = "Disable"
|
||||
Var PayWithUKBState = "Disable"
|
||||
Var PayWithFatzebraState = "Disable"
|
||||
|
||||
Var PayOfflineMode = 1
|
||||
|
|
@ -404,12 +404,12 @@
|
|||
Var PayWithCreditCardState = "Disable"
|
||||
Var PayWithTaoCreditState = "Disable"
|
||||
Var PayWithCouponState = "Disable"
|
||||
Var PayWithAUBState = "Disable"
|
||||
Var PayWithUKBState = "Disable"
|
||||
Var PayWithFatzebraState = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If EMAMemberID = "" Then
|
||||
If UKBMemberID = "" Then
|
||||
|
||||
Else
|
||||
Var CameraState = "Invisible"
|
||||
|
|
@ -444,8 +444,8 @@
|
|||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "AUB:2:"
|
||||
Var ECommerceQR = ECommerceQR + EMAMemberID
|
||||
Var ECommerceQR = ECommerceQR + "UKB:2:"
|
||||
Var ECommerceQR = ECommerceQR + UKBMemberID
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
Var Seeker.CampaignPayChanel = "linepay"
|
||||
EndIf
|
||||
If ReqPayInfoFlag2 = 6 Then
|
||||
Var Seeker.CampaignPayChanel = "aubpay"
|
||||
Var Seeker.CampaignPayChanel = "ukbpay"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -690,7 +690,7 @@
|
|||
|
||||
SPLIT ECommerceQR "/" 6 MemberData
|
||||
|
||||
If VendingQRTypeResult = "AUB" Then
|
||||
If VendingQRTypeResult = "UKB" Then
|
||||
Var CashTextWarning = ""
|
||||
Var QRErrorState = "Invisible"
|
||||
Var ReqPayInfoFlag = 0
|
||||
|
|
@ -922,7 +922,7 @@
|
|||
If RoadShow = "true" Then
|
||||
Else
|
||||
Var PayWithTaoCreditState = "Press"
|
||||
Var PayWithAUBState = "Press"
|
||||
Var PayWithUKBState = "Press"
|
||||
Var PayWithFatzebraState = "Press"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1455,7 +1455,7 @@
|
|||
|
||||
If textLen = MAX_EMA_CODE Then
|
||||
|
||||
Var EMAMemberID = scanmsg
|
||||
Var UKBMemberID = scanmsg
|
||||
|
||||
If Timeout < 120 Then
|
||||
If CoinInFlag = 0 Then
|
||||
|
|
@ -1485,8 +1485,8 @@
|
|||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "AUB:2:"
|
||||
Var ECommerceQR = ECommerceQR + EMAMemberID
|
||||
Var ECommerceQR = ECommerceQR + "UKB:2:"
|
||||
Var ECommerceQR = ECommerceQR + UKBMemberID
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
|
|
@ -1828,10 +1828,10 @@ EndIf
|
|||
;<Y> 1399 </Y>
|
||||
<X> 328 </X>
|
||||
<Y> 1399 </Y>
|
||||
<State> PayWithAUBState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
|
||||
<State> PayWithUKBState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -1851,7 +1851,7 @@ EndIf
|
|||
|
||||
Var scanresult = ""
|
||||
Var scanmsg = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
|
||||
If IsCardlessEnable = 1 Then
|
||||
CashlessReq OFF ""
|
||||
|
|
@ -1989,11 +1989,11 @@ EndIf
|
|||
<X> 398 </X>
|
||||
<Y> 1275 </Y>
|
||||
<State> EMAEnterNumberButtonState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_staff_pass_number.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_staff_pass_number.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_staff_pass_number.png" </FilenameDisable>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
|
||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ukb.lxml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -2055,7 +2055,7 @@ EndIf
|
|||
|
||||
Var scanresult = ""
|
||||
Var scanmsg = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
INITSCANQR
|
||||
|
||||
Var CameraState = "Enable"
|
||||
|
|
@ -2091,7 +2091,7 @@ EndIf
|
|||
Var EMAEnterNumberButtonState = "Invisible"
|
||||
Var EMAPopupErrorState = "Invisible"
|
||||
Var QRCODE99 = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
|
||||
Var popup_cancel_button_y = 1345
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -21,6 +21,13 @@
|
|||
Var EnableTestCoinBank = "Invisible"
|
||||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var EnableCheckin = "Enable"
|
||||
Var EnableTestCoinBank = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
SAVELOG "VendingPreMain"
|
||||
|
||||
</EventOpen>
|
||||
|
|
@ -48,7 +55,7 @@
|
|||
DEBUGVAR tmpPassPhrase
|
||||
|
||||
__CMD "still-stay-on-pre-main" "-" "-" "-"
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
@ -128,7 +135,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 80 </Height>
|
||||
<State> EnableTestSystem </State>
|
||||
<State> EnableTestSystem </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename>
|
||||
|
|
@ -144,7 +151,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableServiceOp </State>
|
||||
<State> EnableServiceOp </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename>
|
||||
|
|
@ -160,7 +167,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableMaintenance </State>
|
||||
<State> EnableMaintenance </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename>
|
||||
|
|
@ -176,7 +183,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableConfigureMachine </State>
|
||||
<State> EnableConfigureMachine </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue