pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

561
inter/mys/xml/page_brewing3Conti_event.lxml
View file

@ -37,6 +37,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 = ""
@ -63,15 +66,19 @@
EndIf
If waitAckPay = 1 Then
SAVELOG "waitAckPay = 1"
If New_PaymentInter = 1 Then
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
Else
If waitAckPay = 1 Then
SAVELOG "waitAckPay = 1"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf
</EventActionOk>
@ -105,6 +112,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 = ""
@ -185,18 +195,22 @@
Var ChangeTimeout = ChangeTimeout + 1
EndIf
If waitAckPay = 1 Then
If Timeout > 60 Then
Var VendingTSIDTmp1 = ""
SAVELOG "waitAckPay = 1 tineout > 60"
If New_PaymentInter = 1 Then
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
Else
If waitAckPay = 1 Then
If Timeout > 60 Then
Var VendingTSIDTmp1 = ""
SAVELOG "waitAckPay = 1 tineout > 60"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
If Seeker.e_receipt = "true" Then
Open "ROOT/taobin_project/inter/mys/xml/e_receipt/page_show_e_receipt.lxml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf
EndIf
If waitAckPay = 2 Then
@ -229,6 +243,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 = ""
@ -264,38 +281,57 @@
EndIf
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
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 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="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 = ""
Var PayDetail2 = Seeker.PayDetail2
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 = "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/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 = ""
Var PayDetail2 = Seeker.PayDetail2
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 TimeoutWaitPay = 45
Var Timeout = 5
@ -347,35 +383,54 @@
EndIf
If HURR_FOREVER = "S:0" Then
Var HURR_FOREVER = "F:1303"
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 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="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 = ""
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 357."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf
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="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 = ""
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then
; SAVELOG "back_to_main from line > 357."
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
;EndIf
Var waitAckPay = 2
Var TimeoutWaitPay = 45
Var Timeout = 5
@ -387,37 +442,44 @@
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
Var SVT = "coffee"
Var ACC = "0899999999"
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
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 DEE = PayDetail
PAYEXT SVT ACC VendingTSIDTmp DEE
CoinBack
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 DEE = PayDetail
PAYEXT SVT ACC VendingTSIDTmp DEE
CoinBack
Var ActionOKCase = 1
If Seeker.CodeChannel = 0 Then
SAVELOG "back_to_main from line > 391."
@ -448,119 +510,136 @@
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
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
EndIf
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3Conti"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
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 = "C48"
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
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
If New_PaymentInter = 1 Then
Else
;no wait ack pay
Var waitAckPay = 0
Var ProcessText = ""
Var SVT = "coffee"
Var ACC = "0899999999"
Var DEE = PayDetail
If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
If Seeker.TNumberTaobinMember = "" Then
Else
Var ACC = Seeker.TNumberTaobinMember
EndIf
If Seeker.TNumberTaobinMember = "" Then
Else
Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf
PAYEXT SVT ACC VendingTSIDTmp DEE
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
EndIf
CoinBack
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3Conti"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
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 = "C48"
Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2
EndIf
EndIf
If New_PaymentInter = 1 Then
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
EndIf
EndIf
Else
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
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
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
CoinBack
EndIf
EndIf
@ -590,19 +669,24 @@
If ErrTimeout = 0 Then
Var ErrTimeout = 1
If AddData = 1 Then
Var Cid = 26
If New_PaymentInter = 1 Then
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
Else
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
EndIf
@ -635,30 +719,49 @@
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 New_PaymentInter = 1 Then
If CoinAmount > 0 Then
If ChangeFlag = 0 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
EndIf
Else
Var ChangeOK = 2
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