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

add proposalId in preparePay response

Browse Source 
fixes https://bugs.taler.net/n/6535
This commit is contained in:
Florian Dold 2020-09-03 17:33:11 +05:30
parent 09b5bfe0db
commit bf9c2ae7f9
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1085,6 +1085,7 @@ export async function preparePayForUri(
paid: true, paid: true,
amountRaw: Amounts.stringify(purchase.contractData.amount), amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost), amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
proposalId,
}; };
} else if (!purchase.timestampFirstSuccessfulPay) { } else if (!purchase.timestampFirstSuccessfulPay) {
return { return {
@ -1094,6 +1095,7 @@ export async function preparePayForUri(
paid: false, paid: false,
amountRaw: Amounts.stringify(purchase.contractData.amount), amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost), amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
proposalId,
}; };
} else { } else {
const paid = !purchase.paymentSubmitPending; const paid = !purchase.paymentSubmitPending;
@ -1105,6 +1107,7 @@ export async function preparePayForUri(
amountRaw: Amounts.stringify(purchase.contractData.amount), amountRaw: Amounts.stringify(purchase.contractData.amount),
amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost), amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
...(paid ? { nextUrl: purchase.contractData.orderId } : {}), ...(paid ? { nextUrl: purchase.contractData.orderId } : {}),
proposalId,
}; };
} }
} }

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

@ -416,6 +416,7 @@ export const codecForPreparePayResultAlreadyConfirmed = (): Codec<
.property("paid", codecForBoolean()) .property("paid", codecForBoolean())
.property("contractTerms", codecForAny()) .property("contractTerms", codecForAny())
.property("contractTermsHash", codecForString()) .property("contractTermsHash", codecForString())
.property("proposalId", codecForString())
.build("PreparePayResultAlreadyConfirmed"); .build("PreparePayResultAlreadyConfirmed");
export const codecForPreparePayResult = (): Codec<PreparePayResult> => export const codecForPreparePayResult = (): Codec<PreparePayResult> =>
@ -462,6 +463,7 @@ export interface PreparePayResultAlreadyConfirmed {
amountRaw: string; amountRaw: string;
amountEffective: string; amountEffective: string;
contractTermsHash: string; contractTermsHash: string;
proposalId: string;
} }
export interface BankWithdrawDetails { export interface BankWithdrawDetails {