taler-typescript-core

commit 467eb5e090bbce7436bd4eb41902d19235da4dba
parent 5427327ffa99d40028a1058234c178850c465191
Author: Sebastian <sebasjm@gmail.com>
Date:   Fri, 23 Feb 2024 12:42:21 -0300

repuchase detected previous unpaid purchased

Diffstat:
M
packages/taler-wallet-core/src/pay-merchant.ts
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -828,7 +828,9 @@ async function processDownloadProposal(
       }
       // FIXME: Adjust this to account for refunds, don't count as repurchase
       // if original order is refunded.
-      if (otherPurchase && otherPurchase.refundAmountAwaiting === undefined) {
+      if (otherPurchase && (otherPurchase.purchaseStatus == PurchaseStatus.Done
+        || otherPurchase.purchaseStatus == PurchaseStatus.PendingPaying
+        || otherPurchase.purchaseStatus == PurchaseStatus.PendingPayingReplay)) {
         logger.warn("repurchase detected");
         p.purchaseStatus = PurchaseStatus.DoneRepurchaseDetected;
         p.repurchaseProposalId = otherPurchase.proposalId;
@@ -1719,7 +1721,7 @@ async function internalWaitPaymentResult(
       };
     }
 
-    if (txRes.purchase.purchaseStatus > PurchaseStatus.Done) {
+    if (txRes.purchase.purchaseStatus >= PurchaseStatus.Done) {
       return {
         type: ConfirmPayResultType.Done,
         contractTerms: d.contractTermsRaw,