Mulitple updated MYS: new payment & update lang SGP: update lang &

remove season pass bug UAE_DUBAI: update lang NewUI: move init ipc
service
This commit is contained in:
Pakin 2025-08-04 08:16:10 +07:00
parent 6316d785c6
commit 847a4660fa
22 changed files with 2732 additions and 661 deletions

View file

@ -1,5 +1,22 @@
<EventActionOk>
DEBUGVAR Seeker.VendingTSID
DEBUGVAR VendingTSID
If Seeker.VendingTSID = "" Then
DEBUGVAR Seeker.VendingTSID
DEBUGVAR VendingTSID
If VendingTSID = "" Then
Else
Var Seeker.VendingTSID = VendingTSID
EndIf
DEBUGVAR Seeker.VendingTSID
DEBUGVAR VendingTSID
EndIf
If CreditCardVoid = 1 Then
Var ChangeOK = 2
; check-if-void-switch-finish
@ -39,6 +56,10 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
If New_PaymentInter = 1 Then
Var ServiceCharge = Seeker.ServiceCharge
EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@ -65,18 +86,25 @@
EndIf
If waitAckPay = 1 Then
If New_PaymentInter = 1 Then
; temp:redirect-show-qr
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
Else
SAVELOG "waitAckPay = 1"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
If waitAckPay = 1 Then
EndIf
; temp:redirect-show-qr
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
SAVELOG "waitAckPay = 1"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf
</EventActionOk>
@ -110,6 +138,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
If New_PaymentInter = 1 Then
Var ServiceCharge = Seeker.ServiceCharge
EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@ -141,6 +172,7 @@
<EventTimeout>
DEBUGVAR DirImage
DEBUGVAR CashlessAmount
Var Timeout = Timeout + 1
@ -270,21 +302,25 @@
Var ChangeTimeout = ChangeTimeout + 1
EndIf
If waitAckPay = 1 Then
If Timeout > 60 Then
If New_PaymentInter = 1 Then
; temp:redirect-show-qr
Else
If waitAckPay = 1 Then
If Timeout > 60 Then
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
; temp:redirect-show-qr
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
Var VendingTSID = ""
SAVELOG "TIMEOUT=60"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
Var VendingTSID = ""
SAVELOG "TIMEOUT=60"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf
EndIf
EndIf
If waitAckPay = 2 Then
@ -316,6 +352,9 @@
Var ECommerce = ECommerce + Seeker.IntVendingCampaign
Var ServiceParameter = "max"
Var ServiceCharge = 0
If New_PaymentInter = 1 Then
Var ServiceCharge = Seeker.ServiceCharge
EndIf
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
@ -351,46 +390,67 @@
EndIf
If NextOrderStatus = "Disable" Then
Var PayDetail="2/F:1221/0/"
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
If New_PaymentInter = 1 Then
Var ServiceType = "coffee-refund"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var SessionID2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var PayDetail = ""
Var PayDetail2 = ""
Var VendingOrderID = Seeker.ORDER_ID
Var ServiceRefund = 0
Var ServiceCharge = Seeker.ServiceCharge
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
Else
If NextOrderStatus = "Disable" Then
Var PayDetail="2/F:1221/0/"
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
Else
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
EndIf
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
EndIf
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
EndIf
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var SessionID2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 315."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf
EndIf
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var SessionID2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 315."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf
Var waitAckPay = 2
Var Timeout = 5
Var ActionOKCase = 1
@ -489,42 +549,49 @@
If ChangeOK = 3 Then
If ActionOKCase = 0 Then
Var SVT = "coffee"
Var ACC = "0899999999"
If New_PaymentInter = 1 Then
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
EndIf
Var SVT = "coffee"
Var ACC = "0899999999"
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
EndIf
If NextOrderStatus = "Disable" Then
Var PayDetail="2/F:1221/0/"
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
Else
If NextOrderStatus = "Disable" Then
Var PayDetail="2/F:1221/0/"
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
Else
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
EndIf
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
EndIf
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
EndIf
Var DEE = PayDetail
PAYEXT SVT ACC VendingTSIDTmp DEE
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
EndIf
Var DEE = PayDetail
PAYEXT SVT ACC VendingTSIDTmp DEE
Var ActionOKCase = 1
SAVELOG "ActionOKCase = change OK 3"
If Seeker.CodeChannel = 0 Then
@ -553,110 +620,120 @@
Var waitAckPay = 0
Var Timeout = 0
Var ProcessText = ""
If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
If Seeker.TNumberTaobinMember = "" Then
Else
Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf
If New_PaymentInter = 1 Then
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
EndIf
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
Var ProcessText = ""
If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
If Seeker.TNumberTaobinMember = "" Then
Else
Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
EndIf
If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If GetFreeFromError = 1 Then
Var Seeker.CodeChannel = 1
Var Seeker.VendingCode = "FAU"
Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2
EndIf
If Seeker.PayWithQR = 0 Then
If Seeker.CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + ""
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.VendingCode
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.CodeNumber
Var SessionID2 = SessionID2 + "/"
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
Else
;no wait ack pay
Var waitAckPay = 0
Var SVT = "coffee"
Var ACC = "0899999999"
Var DEE = PayDetail
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
EndIf
PAYEXT SVT ACC VendingTSIDTmp DEE
EndIf
EndIf
If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var PayDetail = "2/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail = PayDetail + "/XML|"
Var PayDetail = PayDetail + Seeker.OrderChanel
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If GetFreeFromError = 1 Then
Var Seeker.CodeChannel = 1
Var Seeker.VendingCode = "FAU"
Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2
EndIf
If Seeker.PayWithQR = 0 Then
If Seeker.CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + ""
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.VendingCode
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + Seeker.CodeNumber
Var SessionID2 = SessionID2 + "/"
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
Else
;no wait ack pay
Var waitAckPay = 0
Var SVT = "coffee"
Var ACC = "0899999999"
Var DEE = PayDetail
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
EndIf
PAYEXT SVT ACC VendingTSIDTmp DEE
EndIf
EndIf
__CMD "clear-stock-data" 0 "-" "-"
@ -685,9 +762,13 @@
If ErrTimeout = 0 Then
Var ErrTimeout = 1
If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
If New_PaymentInter = 1 Then
Else
If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
EndIf
@ -725,31 +806,44 @@
Else
If Seeker.VendingCode = "MKFOO" Then
Var Cid = 33
Var PointCrm = "0"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
Var Seeker.CodeChannel = 0
EndIf
If CoinAmount > 0 Then
If ChangeFlag = 0 Then
If New_PaymentInter = 1 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
If Seeker.StoreCreditFlag = 1 Then
Var ChangeOK = 2
Var ChangeOK = 2
Else
Change ServiceAmount3
Change ServiceAmount3
EndIf
EndIf
Else
Var ChangeOK = 2
EndIf
Else
If Seeker.VendingCode = "MKFOO" Then
Var Cid = 33
Var PointCrm = "0"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
Var Seeker.CodeChannel = 0
EndIf
If CoinAmount > 0 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
If Seeker.StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount3
EndIf
EndIf
Else
Var ChangeOK = 2
EndIf
EndIf