renames
This commit is contained in:
parent
ca5f90be01
commit
6e0b19883b
1 changed files with 4 additions and 10 deletions
|
|
@ -223,11 +223,8 @@ export default class {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log = getLogger({ appName: userAddress.linkedApplication.name })
|
log = getLogger({ appName: userAddress.linkedApplication.name })
|
||||||
const isAppUserPayment = userAddress.user.user_id !== userAddress.linkedApplication.owner.user_id
|
const isManagedUser = userAddress.user.user_id !== userAddress.linkedApplication.owner.user_id
|
||||||
let fee = this.paymentManager.getReceiveServiceFee(Types.UserOperationType.INCOMING_TX, amount, isAppUserPayment)
|
const fee = this.paymentManager.getReceiveServiceFee(Types.UserOperationType.INCOMING_TX, amount, isManagedUser)
|
||||||
if (userAddress.linkedApplication && userAddress.linkedApplication.owner.user_id === userAddress.user.user_id) {
|
|
||||||
fee = 0
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
// This call will fail if the transaction is already registered
|
// This call will fail if the transaction is already registered
|
||||||
const addedTx = await this.storage.paymentStorage.AddAddressReceivingTransaction(userAddress, txOutput.hash, txOutput.index, amount, fee, internal, blockHeight, tx)
|
const addedTx = await this.storage.paymentStorage.AddAddressReceivingTransaction(userAddress, txOutput.hash, txOutput.index, amount, fee, internal, blockHeight, tx)
|
||||||
|
|
@ -267,11 +264,8 @@ export default class {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log = getLogger({ appName: userInvoice.linkedApplication.name })
|
log = getLogger({ appName: userInvoice.linkedApplication.name })
|
||||||
const isAppUserPayment = userInvoice.user.user_id !== userInvoice.linkedApplication.owner.user_id
|
const isManagedUser = userInvoice.user.user_id !== userInvoice.linkedApplication.owner.user_id
|
||||||
let fee = this.paymentManager.getReceiveServiceFee(Types.UserOperationType.INCOMING_INVOICE, amount, isAppUserPayment)
|
const fee = this.paymentManager.getReceiveServiceFee(Types.UserOperationType.INCOMING_INVOICE, amount, isManagedUser)
|
||||||
if (userInvoice.linkedApplication && userInvoice.linkedApplication.owner.user_id === userInvoice.user.user_id) {
|
|
||||||
fee = 0
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
await this.storage.paymentStorage.FlagInvoiceAsPaid(userInvoice, amount, fee, internal, tx)
|
await this.storage.paymentStorage.FlagInvoiceAsPaid(userInvoice, amount, fee, internal, tx)
|
||||||
this.storage.eventsLog.LogEvent({ type: 'invoice_paid', userId: userInvoice.user.user_id, appId: userInvoice.linkedApplication.app_id, appUserId: "", balance: userInvoice.user.balance_sats, data: paymentRequest, amount })
|
this.storage.eventsLog.LogEvent({ type: 'invoice_paid', userId: userInvoice.user.user_id, appId: userInvoice.linkedApplication.app_id, appUserId: "", balance: userInvoice.user.balance_sats, data: paymentRequest, amount })
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue