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

fix preparePay API response

Browse Source
This commit is contained in:
Florian Dold 2020-08-10 20:05:41 +05:30
parent 2a4d2944aa
commit c2dcad8efe
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/taler-wallet-core/src/operations/pay.ts
View File

@ -927,6 +927,7 @@ export async function preparePayForUri(
status: PreparePayResultType.InsufficientBalance, status: PreparePayResultType.InsufficientBalance,
contractTerms: JSON.parse(d.contractTermsRaw), contractTerms: JSON.parse(d.contractTermsRaw),
proposalId: proposal.proposalId, proposalId: proposal.proposalId,
amountRaw: Amounts.stringify(d.contractData.amount),
}; };
} }
@ -961,18 +962,24 @@ export async function preparePayForUri(
contractTerms: JSON.parse(purchase.contractTermsRaw), contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: true, paid: true,
nextUrl: r.nextUrl, nextUrl: r.nextUrl,
amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
}; };
} else if (!purchase.timestampFirstSuccessfulPay) { } else if (!purchase.timestampFirstSuccessfulPay) {
return { return {
status: PreparePayResultType.AlreadyConfirmed, status: PreparePayResultType.AlreadyConfirmed,
contractTerms: JSON.parse(purchase.contractTermsRaw), contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: false, paid: false,
amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
}; };
} else if (purchase.paymentSubmitPending) { } else if (purchase.paymentSubmitPending) {
return { return {
status: PreparePayResultType.AlreadyConfirmed, status: PreparePayResultType.AlreadyConfirmed,
contractTerms: JSON.parse(purchase.contractTermsRaw), contractTerms: JSON.parse(purchase.contractTermsRaw),
paid: false, paid: false,
amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
}; };
} }
// FIXME: we don't handle aborted payments correctly here. // FIXME: we don't handle aborted payments correctly here.

3
packages/taler-wallet-core/src/types/walletTypes.ts
View File

@ -353,12 +353,15 @@ export interface PreparePayResultInsufficientBalance {
status: PreparePayResultType.InsufficientBalance; status: PreparePayResultType.InsufficientBalance;
proposalId: string; proposalId: string;
contractTerms: Record<string, unknown>; contractTerms: Record<string, unknown>;
amountRaw: string;
} }
export interface PreparePayResultAlreadyConfirmed { export interface PreparePayResultAlreadyConfirmed {
status: PreparePayResultType.AlreadyConfirmed; status: PreparePayResultType.AlreadyConfirmed;
contractTerms: Record<string, unknown>; contractTerms: Record<string, unknown>;
paid: boolean; paid: boolean;
amountRaw: string;
amountEffective: string;
// Only specified if paid. // Only specified if paid.
nextUrl?: string; nextUrl?: string;
} }