[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: fix preparePay API response
From: |
gnunet |
Subject: |
[taler-wallet-core] branch master updated: fix preparePay API response |
Date: |
Mon, 10 Aug 2020 16:35:47 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new c2dcad8e fix preparePay API response
c2dcad8e is described below
commit c2dcad8efeb7948a98997053a8e26087b40bacf8
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Mon Aug 10 20:05:41 2020 +0530
fix preparePay API response
---
packages/taler-wallet-core/src/operations/pay.ts | 7 +++++++
packages/taler-wallet-core/src/types/walletTypes.ts | 3 +++
2 files changed, 10 insertions(+)
diff --git a/packages/taler-wallet-core/src/operations/pay.ts
b/packages/taler-wallet-core/src/operations/pay.ts
index 0fa9e0a6..fd997fb1 100644
--- a/packages/taler-wallet-core/src/operations/pay.ts
+++ b/packages/taler-wallet-core/src/operations/pay.ts
@@ -927,6 +927,7 @@ export async function preparePayForUri(
status: PreparePayResultType.InsufficientBalance,
contractTerms: JSON.parse(d.contractTermsRaw),
proposalId: proposal.proposalId,
+ amountRaw: Amounts.stringify(d.contractData.amount),
};
}
@@ -961,18 +962,24 @@ export async function preparePayForUri(
contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: true,
nextUrl: r.nextUrl,
+ amountRaw: Amounts.stringify(purchase.contractData.amount),
+ amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
};
} else if (!purchase.timestampFirstSuccessfulPay) {
return {
status: PreparePayResultType.AlreadyConfirmed,
contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: false,
+ amountRaw: Amounts.stringify(purchase.contractData.amount),
+ amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
};
} else if (purchase.paymentSubmitPending) {
return {
status: PreparePayResultType.AlreadyConfirmed,
contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: false,
+ amountRaw: Amounts.stringify(purchase.contractData.amount),
+ amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
};
}
// FIXME: we don't handle aborted payments correctly here.
diff --git a/packages/taler-wallet-core/src/types/walletTypes.ts
b/packages/taler-wallet-core/src/types/walletTypes.ts
index 83275a0c..6175c40e 100644
--- a/packages/taler-wallet-core/src/types/walletTypes.ts
+++ b/packages/taler-wallet-core/src/types/walletTypes.ts
@@ -353,12 +353,15 @@ export interface PreparePayResultInsufficientBalance {
status: PreparePayResultType.InsufficientBalance;
proposalId: string;
contractTerms: Record<string, unknown>;
+ amountRaw: string;
}
export interface PreparePayResultAlreadyConfirmed {
status: PreparePayResultType.AlreadyConfirmed;
contractTerms: Record<string, unknown>;
paid: boolean;
+ amountRaw: string;
+ amountEffective: string;
// Only specified if paid.
nextUrl?: string;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: fix preparePay API response,
gnunet <=