Merge branch 'master' into age-withdraw

1 files changed, 7 insertions, 10 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/operations/pay-merchant.ts
index 2580c97f5..57367bb20 100644
--- a/packages/taler-wallet-core/src/operations/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/operations/pay-merchant.ts
@@ -174,12 +174,12 @@ export async function getTotalPaymentCost(
           .iter(coin.exchangeBaseUrl)
           .filter((x) =>
             Amounts.isSameCurrency(
-              DenominationRecord.getValue(x),
+              x.value,
               pcs.coinContributions[i],
             ),
           );
         const amountLeft = Amounts.sub(
-          DenominationRecord.getValue(denom),
+          denom.value,
           pcs.coinContributions[i],
         ).amount;
         const refreshCost = getTotalRefreshCost(
@@ -317,11 +317,8 @@ export function extractContractData(
     wireInfoHash: parsedContractTerms.h_wire,
     maxDepositFee: Amounts.stringify(parsedContractTerms.max_fee),
     merchant: parsedContractTerms.merchant,
-    products: parsedContractTerms.products,
     summaryI18n: parsedContractTerms.summary_i18n,
     minimumAge: parsedContractTerms.minimum_age,
-    deliveryDate: parsedContractTerms.delivery_date,
-    deliveryLocation: parsedContractTerms.delivery_location,
   };
 }
 
@@ -541,7 +538,7 @@ async function processDownloadProposal(
       // if original order is refunded.
       if (otherPurchase && otherPurchase.refundAmountAwaiting === undefined) {
         logger.warn("repurchase detected");
-        p.purchaseStatus = PurchaseStatus.RepurchaseDetected;
+        p.purchaseStatus = PurchaseStatus.DoneRepurchaseDetected;
         p.repurchaseProposalId = otherPurchase.proposalId;
         await tx.purchases.put(p);
       } else {
@@ -974,7 +971,7 @@ export async function checkPaymentByProposalId(
   if (!proposal) {
     throw Error(`could not get proposal ${proposalId}`);
   }
-  if (proposal.purchaseStatus === PurchaseStatus.RepurchaseDetected) {
+  if (proposal.purchaseStatus === PurchaseStatus.DoneRepurchaseDetected) {
     const existingProposalId = proposal.repurchaseProposalId;
     if (existingProposalId) {
       logger.trace("using existing purchase for same product");
@@ -1527,7 +1524,7 @@ export async function processPurchase(
       return processPurchaseDialogShared(ws, purchase);
     case PurchaseStatus.FailedClaim:
     case PurchaseStatus.Done:
-    case PurchaseStatus.RepurchaseDetected:
+    case PurchaseStatus.DoneRepurchaseDetected:
     case PurchaseStatus.DialogProposed:
     case PurchaseStatus.AbortedProposalRefused:
     case PurchaseStatus.AbortedIncompletePayment:
@@ -2099,7 +2096,7 @@ export function computePayMerchantTransactionState(
       return {
         major: TransactionMajorState.Done,
       };
-    case PurchaseStatus.RepurchaseDetected:
+    case PurchaseStatus.DoneRepurchaseDetected:
       return {
         major: TransactionMajorState.Failed,
         minor: TransactionMinorState.Repurchase,
@@ -2176,7 +2173,7 @@ export function computePayMerchantTransactionActions(
       return [TransactionAction.Delete];
     case PurchaseStatus.Done:
       return [TransactionAction.Delete];
-    case PurchaseStatus.RepurchaseDetected:
+    case PurchaseStatus.DoneRepurchaseDetected:
       return [TransactionAction.Delete];
     case PurchaseStatus.AbortedIncompletePayment:
       return [TransactionAction.Delete];