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

-check in integration test

Browse Source
This commit is contained in:
Florian Dold 2023-01-11 17:16:15 +01:00
parent 143a4fe4ac
commit 3641e4cf0c
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2811,34 +2811,43 @@ export async function abortPay(
if (!purchase) {
throw Error("purchase not found");
}
const oldStatus = purchase.purchaseStatus;
if (purchase.timestampFirstSuccessfulPay) {
// No point in aborting it. We don't even report an error.
logger.warn(`tried to abort successful payment`);
return;
}
if (purchase.purchaseStatus === PurchaseStatus.Paying) {
if (oldStatus === PurchaseStatus.Paying) {
purchase.purchaseStatus = PurchaseStatus.AbortingWithRefund;
}
await tx.purchases.put(purchase);
await tx.operationRetries.delete(opId);
if (purchase.payInfo) {
const coinSel = purchase.payInfo.payCoinSelection;
const currency = Amounts.currencyOf(purchase.payInfo.totalPayCost);
const refreshCoins: CoinRefreshRequest[] = [];
for (let i = 0; i < coinSel.coinPubs.length; i++) {
refreshCoins.push({
amount: coinSel.coinContributions[i],
coinPub: coinSel.coinPubs[i],
});
}
await createRefreshGroup(
ws,
tx,
currency,
refreshCoins,
RefreshReason.AbortPay,
);
if (
cancelImmediately &&
oldStatus === PurchaseStatus.AbortingWithRefund
) {
purchase.purchaseStatus = PurchaseStatus.PaymentAbortFinished;
}
await tx.purchases.put(purchase);
if (oldStatus === PurchaseStatus.Paying) {
if (purchase.payInfo) {
const coinSel = purchase.payInfo.payCoinSelection;
const currency = Amounts.currencyOf(purchase.payInfo.totalPayCost);
const refreshCoins: CoinRefreshRequest[] = [];
for (let i = 0; i < coinSel.coinPubs.length; i++) {
refreshCoins.push({
amount: coinSel.coinContributions[i],
coinPub: coinSel.coinPubs[i],
});
}
await createRefreshGroup(
ws,
tx,
currency,
refreshCoins,
RefreshReason.AbortPay,
);
}
}
await tx.operationRetries.delete(opId);
});
runOperationWithErrorReporting(ws, opId, async () => {