diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-07-29 23:10:41 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-07-29 23:10:41 +0530 |
commit | c8553f3bc53064d157b56220e9d2333b8931e7a5 (patch) | |
tree | 408159da65252498e7f676d54dbde3c2c3275c0b /src/operations/pay.ts | |
parent | dfe5e95bc8537e13c482fff42cfefeb090eb2e09 (diff) | |
download | wallet-core-c8553f3bc53064d157b56220e9d2333b8931e7a5.tar.xz |
tweaks to pay APIv0.7.1-dev.13
Diffstat (limited to 'src/operations/pay.ts')
-rw-r--r-- | src/operations/pay.ts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/operations/pay.ts b/src/operations/pay.ts index 08bbe43a1..c2877da64 100644 --- a/src/operations/pay.ts +++ b/src/operations/pay.ts @@ -915,26 +915,26 @@ export async function preparePayForUri( console.log("not confirming payment, insufficient coins"); return { status: PreparePayResultType.InsufficientBalance, - contractTermsRaw: d.contractTermsRaw, + contractTerms: d.contractTermsRaw, proposalId: proposal.proposalId, }; } const costInfo = await getTotalPaymentCost(ws, res); - console.log("costInfo", costInfo); - console.log("coinsForPayment", res); - const totalFees = Amounts.sub(costInfo.totalCost, res.paymentAmount).amount; + logger.trace("costInfo", costInfo); + logger.trace("coinsForPayment", res); return { status: PreparePayResultType.PaymentPossible, - contractTermsRaw: d.contractTermsRaw, + contractTerms: d.contractTermsRaw, proposalId: proposal.proposalId, - totalFees, + amountEffective: Amounts.stringify(costInfo.totalCost), + amountRaw: Amounts.stringify(res.paymentAmount), }; } if (purchase.lastSessionId !== uriResult.sessionId) { - console.log( + logger.trace( "automatically re-submitting payment with different session ID", ); await ws.db.runWithWriteTransaction([Stores.purchases], async (tx) => { @@ -948,20 +948,20 @@ export async function preparePayForUri( const r = await submitPay(ws, proposalId); return { status: PreparePayResultType.AlreadyConfirmed, - contractTermsRaw: purchase.contractTermsRaw, + contractTerms: purchase.contractTermsRaw, paid: true, nextUrl: r.nextUrl, }; } else if (!purchase.timestampFirstSuccessfulPay) { return { status: PreparePayResultType.AlreadyConfirmed, - contractTermsRaw: purchase.contractTermsRaw, + contractTerms: purchase.contractTermsRaw, paid: false, }; } else if (purchase.paymentSubmitPending) { return { status: PreparePayResultType.AlreadyConfirmed, - contractTermsRaw: purchase.contractTermsRaw, + contractTerms: purchase.contractTermsRaw, paid: false, }; } |