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
parent
6316d785c6
commit
847a4660fa
22 changed files with 2732 additions and 661 deletions
|
|
@ -5,6 +5,17 @@
|
|||
<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
If New_PaymentInter = 1 Then
|
||||
RootLayoutVisible 3 "hide"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"
|
||||
SAVELOG "MYS page_brewing3.lxml NEW_PAYMENT"
|
||||
Else
|
||||
SAVELOG "MYS page_brewing3.lxml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var SendNotiPaySuccess = 2
|
||||
|
||||
Var GetMoreStrawCount = 3
|
||||
|
|
@ -12,8 +23,12 @@
|
|||
Var CountUpWhenBREW_CNT = 0
|
||||
DEBUGVAR TxRef1
|
||||
|
||||
SAVELOG "MYS page_brewing3.lxml"
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
If New_PaymentInter = 1 Then
|
||||
DEBUGVAR Seeker.ORDER_ID
|
||||
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
|
||||
EndIf
|
||||
|
||||
Var PictureFileTextDesctionState = "Enable"
|
||||
|
||||
|
|
@ -31,6 +46,9 @@
|
|||
Var ExtendData = Seeker.ExtendData
|
||||
|
||||
Var ServiceAmount2 = Seeker.ServiceAmount2
|
||||
If New_PaymentInter = 1 Then
|
||||
Var PriceDrink = Seeker.ServiceAmount2
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR Seeker.selected_a_drink
|
||||
|
|
@ -38,6 +56,7 @@
|
|||
DEBUGVAR PayAmount
|
||||
DEBUGVAR Seeker.CreditCard
|
||||
DEBUGVAR Seeker.CodeNumber
|
||||
DEBUGVAR Seeker.CashlessVendingTrackNumber
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
|
@ -124,39 +143,40 @@
|
|||
|
||||
If Seeker.PayWithQR = 1 Then
|
||||
Var VendingTSIDTmp = Seeker.VendingTSID
|
||||
If New_PaymentInter = 1 Then
|
||||
|
||||
If Seeker.TNumberTaobinCredit = "" Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Else
|
||||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Seeker.CoffeePinNumber
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If Seeker.TNumberTaobinCredit = "" Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Else
|
||||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Seeker.CoffeePinNumber
|
||||
EndIf
|
||||
|
||||
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
Else
|
||||
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If Seeker.TNumberTaobinCredit = "" Then
|
||||
|
|
@ -171,53 +191,58 @@
|
|||
Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
|
||||
EndIf
|
||||
|
||||
If TelephoneNumberProblem = "" Then
|
||||
;Var TelephoneNumberProblem = ""
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
Else
|
||||
Var ShowTextNumber = "Invisible"
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
If New_PaymentInter = 1 Then
|
||||
|
||||
Var AddData = 0
|
||||
Else
|
||||
If TelephoneNumberProblem = "" Then
|
||||
;Var TelephoneNumberProblem = ""
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
Else
|
||||
Var ShowTextNumber = "Invisible"
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
Var AddData = 0
|
||||
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
|
||||
|
||||
If Seeker.TNumberTaobinMember = "" Then
|
||||
If Seeker.TNumberTaobinMember = "" Then
|
||||
|
||||
Else
|
||||
If Seeker.PayWithQR = 1 Then
|
||||
Var VendingTSID = VendingTSIDTmp
|
||||
Else
|
||||
Var VendingTSID = ""
|
||||
EndIf
|
||||
Else
|
||||
If Seeker.PayWithQR = 1 Then
|
||||
Var VendingTSID = VendingTSIDTmp
|
||||
Else
|
||||
Var VendingTSID = ""
|
||||
EndIf
|
||||
|
||||
|
||||
Var BmiYear = Seeker.PointTaobinStr
|
||||
Var PointCrm = ""
|
||||
If Seeker.FromConsent = 1 Then
|
||||
Var PointCrm = "pdpa1"
|
||||
EndIf
|
||||
Var GetScore = VendingTSID
|
||||
If Seeker.TaobinErrorNetwork = 0 Then
|
||||
Var Cid = 11
|
||||
Var AddData = 1
|
||||
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
Else
|
||||
Var PointCrm = ""
|
||||
Var Cid = 14
|
||||
Var AddData = 1
|
||||
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
EndIf
|
||||
Var BmiYear = Seeker.PointTaobinStr
|
||||
Var PointCrm = ""
|
||||
If Seeker.FromConsent = 1 Then
|
||||
Var PointCrm = "pdpa1"
|
||||
EndIf
|
||||
Var GetScore = VendingTSID
|
||||
If Seeker.TaobinErrorNetwork = 0 Then
|
||||
Var Cid = 11
|
||||
Var AddData = 1
|
||||
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
Else
|
||||
Var PointCrm = ""
|
||||
Var Cid = 14
|
||||
Var AddData = 1
|
||||
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
Var VendingTSID = ""
|
||||
EndIf
|
||||
Var VendingTSID = ""
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "MKFOO" Then
|
||||
Var AddData = 0
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "MKFOO" Then
|
||||
Var AddData = 0
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -234,13 +259,16 @@
|
|||
EndIf
|
||||
|
||||
|
||||
Var CreditReference = Seeker.CreditReferenceTmp
|
||||
Var VendingDiscount = Seeker.VendingDiscount
|
||||
Var VendingCampaign = Seeker.VendingCampaign
|
||||
Var TxReference = Seeker.TxRef1
|
||||
DEBUGVAR TxReference
|
||||
DEBUGVAR Seeker.VendingCampaign
|
||||
If New_PaymentInter = 1 Then
|
||||
|
||||
Else
|
||||
Var CreditReference = Seeker.CreditReferenceTmp
|
||||
Var VendingDiscount = Seeker.VendingDiscount
|
||||
Var VendingCampaign = Seeker.VendingCampaign
|
||||
Var TxReference = Seeker.TxRef1
|
||||
DEBUGVAR TxReference
|
||||
DEBUGVAR Seeker.VendingCampaign
|
||||
EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
|
||||
|
|
@ -637,6 +665,15 @@
|
|||
DEBUGVAR SelectMenuBetweenBrewEnable1
|
||||
DEBUGVAR SelectMenuBetweenBrewEnable2
|
||||
|
||||
If New_PaymentInter = 1 Then
|
||||
__CMD "SetErrorCodeHandleByXML" 1028 "-" "-"
|
||||
__CMD "SetErrorCodeHandleByXML" 1029 "-" "-"
|
||||
__CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
|
||||
__CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<EventLanguageOnChange>
|
||||
Var XPosiShowCountDownBrew = 768
|
||||
|
|
@ -766,7 +803,11 @@
|
|||
|
||||
Var Seeker = "next"
|
||||
Var MultiPayEnable = "false"
|
||||
CoinPause
|
||||
If New_PaymentInter = 1 Then
|
||||
|
||||
Else
|
||||
CoinPause
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
|
@ -785,7 +826,11 @@
|
|||
|
||||
Var Seeker = "next"
|
||||
Var MultiPayEnable = "false"
|
||||
CoinPause
|
||||
If New_PaymentInter = 1 Then
|
||||
|
||||
Else
|
||||
CoinPause
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue