taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

include error details in transactions list

Browse Source
This commit is contained in:
Florian Dold 2020-09-01 19:33:06 +05:30
parent bb369f2e2a
commit 62406304d9
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/taler-wallet-core/src/operations/transactions.ts
View File

@ -216,6 +216,7 @@ export async function getTransactions(
TransactionType.Withdrawal, TransactionType.Withdrawal,
r.initialWithdrawalGroupId, r.initialWithdrawalGroupId,
), ),
...(r.lastError ? { error: r.lastError } : {}),
}); });
}); });
@ -250,6 +251,7 @@ export async function getTransactions(
TransactionType.Payment, TransactionType.Payment,
pr.proposalId, pr.proposalId,
); );
const err = pr.lastPayError ?? pr.lastRefundStatusError;
transactions.push({ transactions.push({
type: TransactionType.Payment, type: TransactionType.Payment,
amountRaw: Amounts.stringify(pr.contractData.amount), amountRaw: Amounts.stringify(pr.contractData.amount),
@ -261,6 +263,7 @@ export async function getTransactions(
timestamp: pr.timestampAccept, timestamp: pr.timestampAccept,
transactionId: paymentTransactionId, transactionId: paymentTransactionId,
info: info, info: info,
...(err ? { error: err } : {}),
}); });
const refundGroupKeys = new Set<string>(); const refundGroupKeys = new Set<string>();
@ -305,7 +308,6 @@ export async function getTransactions(
if (!r0) { if (!r0) {
throw Error("invariant violated"); throw Error("invariant violated");
} }
let ts: Timestamp;
transactions.push({ transactions.push({
type: TransactionType.Refund, type: TransactionType.Refund,
info, info,
@ -317,37 +319,6 @@ export async function getTransactions(
pending: false, pending: false,
}); });
}); });
// for (const rg of pr.refundGroups) {
// const pending = Object.keys(pr.refundsPending).length > 0;
// const stats = getRefundStats(pr, rg.refundGroupId);
// transactions.push({
// type: TransactionType.Refund,
// pending,
// info: {
// fulfillmentUrl: pr.contractData.fulfillmentUrl,
// merchant: pr.contractData.merchant,
// orderId: pr.contractData.orderId,
// products: pr.contractData.products,
// summary: pr.contractData.summary,
// summary_i18n: pr.contractData.summaryI18n,
// },
// timestamp: rg.timestampQueried,
// transactionId: makeEventId(
// TransactionType.Refund,
// pr.proposalId,
// `${rg.timestampQueried.t_ms}`,
// ),
// refundedTransactionId: makeEventId(
// TransactionType.Payment,
// pr.proposalId,
// ),
// amountEffective: Amounts.stringify(stats.amountEffective),
// amountInvalid: Amounts.stringify(stats.amountInvalid),
// amountRaw: Amounts.stringify(stats.amountRaw),
// });
// }
}); });
}, },
); );