Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2025-02-20 08:40:02 +07:00
commit 4cb42e148e
157 changed files with 24010 additions and 1712 deletions

View file

@ -1163,8 +1163,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1173,8 +1173,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1231,7 +1231,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -666,8 +666,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -678,8 +678,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -750,7 +750,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -712,8 +712,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -724,8 +724,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -796,7 +796,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -475,7 +475,7 @@
Var XPercent = 0
EndIf
;CashlessReq SUCCESS
;CashlessReq SUCCESS ""
; 945_disable_straw_lid
@ -1078,8 +1078,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1088,8 +1088,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1146,7 +1146,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

View file

@ -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