Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
4cb42e148e
157 changed files with 24010 additions and 1712 deletions
|
|
@ -512,8 +512,8 @@
|
|||
|
||||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
CashlessReq SUCCESS
|
||||
;CashlessReq FAIL
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
EndIf
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
|
|
@ -524,8 +524,8 @@
|
|||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
|
||||
CashlessReq SUCCESS
|
||||
;CashlessReq FAIL
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
EndIf
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
|
|
|
|||
|
|
@ -602,8 +602,8 @@
|
|||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
|
||||
CashlessReq SUCCESS
|
||||
;CashlessReq FAIL
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -613,8 +613,8 @@
|
|||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
|
||||
CashlessReq SUCCESS
|
||||
;CashlessReq FAIL
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -673,7 +673,7 @@
|
|||
If Seeker.CreditCard = 1 Then
|
||||
;DEBUGVAR "Credit::void.switch(app: finexus)"
|
||||
;WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
|
||||
;CashlessReq FAIL
|
||||
;CashlessReq FAIL ""
|
||||
;Var ChangeFlag = 1
|
||||
;Var CreditCardVoid = 1
|
||||
|
||||
|
|
|
|||
|
|
@ -69,9 +69,9 @@
|
|||
|
||||
If CashlessPayFlag = 1 Then
|
||||
Var CashlessPayFlag = 0
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
Else
|
||||
CashlessReq OFF
|
||||
CashlessReq OFF ""
|
||||
EndIf
|
||||
|
||||
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
|
||||
<EventActionOk>
|
||||
If VendingCashless = "OK" Then
|
||||
CashlessReq SUCCESS
|
||||
CashlessReq SUCCESS ""
|
||||
|
||||
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
|
||||
Open ToppupSuccessPage
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -277,7 +277,7 @@
|
|||
|
||||
If CashlessPayFlag = 1 Then
|
||||
Var CashlessPayFlag = 0
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
EndIf
|
||||
|
||||
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
|
||||
|
|
@ -332,11 +332,11 @@
|
|||
Var QRErrorState = "Invisible"
|
||||
Var alphaState = "Invisible"
|
||||
|
||||
CashlessReq OFF
|
||||
CashlessReq OFF ""
|
||||
|
||||
If CashlessPayFlag = 1 Then
|
||||
Var CashlessPayFlag = 0
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
EndIf
|
||||
|
||||
DEBUGVAR LOADING_STATE
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
DEBUGVAR "Credit::void.switch(app: finexus)"
|
||||
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
Var ChangeFlag = 1
|
||||
Var CreditCardVoid = 1
|
||||
</EventOpen>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
DEBUGVAR "Credit::void.switch(app: finexus).next(true)"
|
||||
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
|
||||
CashlessReq FAIL
|
||||
CashlessReq FAIL ""
|
||||
Var ChangeFlag = 1
|
||||
Var CreditCardVoid = 1
|
||||
</EventOpen>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue