fix #8361

1 files changed, 72 insertions, 62 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
index 4afc40285..cec00fe24 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
@@ -25,7 +25,10 @@ import {
   TalerMerchantApi,
   stringifyRefundUri,
 } from "@gnu-taler/taler-util";
-import { useMerchantApiContext, useTranslationContext } from "@gnu-taler/web-util/browser";
+import {
+  useMerchantApiContext,
+  useTranslationContext,
+} from "@gnu-taler/web-util/browser";
 import { format, formatDistance } from "date-fns";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
@@ -179,13 +182,13 @@ function ClaimedPage({
       type: "deadline",
     });
   }
-  if (order.contract_terms.wire_transfer_deadline.t_s !== "never") {
-    events.push({
-      when: new Date(order.contract_terms.wire_transfer_deadline.t_s * 1000),
-      description: "wire deadline",
-      type: "deadline",
-    });
-  }
+  // if (order.contract_terms.wire_transfer_deadline.t_s !== "never") {
+  //   events.push({
+  //     when: new Date(order.contract_terms.wire_transfer_deadline.t_s * 1000),
+  //     description: "wire deadline",
+  //     type: "deadline",
+  //   });
+  // }
   if (
     order.contract_terms.delivery_date &&
     order.contract_terms.delivery_date.t_s !== "never"
@@ -325,20 +328,20 @@ function PaidPage({
   onRefund: (id: string) => void;
 }) {
   const events: Event[] = [];
-  if (order.contract_terms.timestamp.t_s !== "never") {
-    events.push({
-      when: new Date(order.contract_terms.timestamp.t_s * 1000),
-      description: "order created",
-      type: "start",
-    });
-  }
-  if (order.contract_terms.pay_deadline.t_s !== "never") {
-    events.push({
-      when: new Date(order.contract_terms.pay_deadline.t_s * 1000),
-      description: "pay deadline",
-      type: "deadline",
-    });
-  }
+  // if (order.contract_terms.timestamp.t_s !== "never") {
+  //   events.push({
+  //     when: new Date(order.contract_terms.timestamp.t_s * 1000),
+  //     description: "order created",
+  //     type: "start",
+  //   });
+  // }
+  // if (order.contract_terms.pay_deadline.t_s !== "never") {
+  //   events.push({
+  //     when: new Date(order.contract_terms.pay_deadline.t_s * 1000),
+  //     description: "pay deadline",
+  //     type: "deadline",
+  //   });
+  // }
   if (order.contract_terms.refund_deadline.t_s !== "never") {
     events.push({
       when: new Date(order.contract_terms.refund_deadline.t_s * 1000),
@@ -373,50 +376,57 @@ function PaidPage({
       });
     }
   });
-  if (order.wire_details && order.wire_details.length) {
-    if (order.wire_details.length > 1) {
-      let last: TalerMerchantApi.TransactionWireTransfer | null = null;
-      let first: TalerMerchantApi.TransactionWireTransfer | null = null;
-      let total: AmountJson | null = null;
-
-      order.wire_details.forEach((w) => {
-        if (last === null || last.execution_time.t_s < w.execution_time.t_s) {
-          last = w;
-        }
-        if (first === null || first.execution_time.t_s > w.execution_time.t_s) {
-          first = w;
-        }
-        total =
-          total === null
-            ? Amounts.parseOrThrow(w.amount)
-            : Amounts.add(total, Amounts.parseOrThrow(w.amount)).amount;
-      });
-      const last_time = last!.execution_time.t_s;
-      if (last_time !== "never") {
-        events.push({
-          when: new Date(last_time * 1000),
-          description: `wired ${Amounts.stringify(total!)}`,
-          type: "wired-range",
+  const ra = !order.refunded ? undefined : Amounts.parse(order.refund_amount);
+  const am = Amounts.parseOrThrow(order.contract_terms.amount);
+  if (ra && Amounts.cmp(ra, am) === 1) {
+    if (order.wire_details && order.wire_details.length) {
+      if (order.wire_details.length > 1) {
+        let last: TalerMerchantApi.TransactionWireTransfer | null = null;
+        let first: TalerMerchantApi.TransactionWireTransfer | null = null;
+        let total: AmountJson | null = null;
+
+        order.wire_details.forEach((w) => {
+          if (last === null || last.execution_time.t_s < w.execution_time.t_s) {
+            last = w;
+          }
+          if (
+            first === null ||
+            first.execution_time.t_s > w.execution_time.t_s
+          ) {
+            first = w;
+          }
+          total =
+            total === null
+              ? Amounts.parseOrThrow(w.amount)
+              : Amounts.add(total, Amounts.parseOrThrow(w.amount)).amount;
         });
-      }
-      const first_time = first!.execution_time.t_s;
-      if (first_time !== "never") {
-        events.push({
-          when: new Date(first_time * 1000),
-          description: `wire transfer started...`,
-          type: "wired-range",
-        });
-      }
-    } else {
-      order.wire_details.forEach((e) => {
-        if (e.execution_time.t_s !== "never") {
+        const last_time = last!.execution_time.t_s;
+        if (last_time !== "never") {
           events.push({
-            when: new Date(e.execution_time.t_s * 1000),
-            description: `wired ${e.amount}`,
-            type: "wired",
+            when: new Date(last_time * 1000),
+            description: `wired ${Amounts.stringify(total!)}`,
+            type: "wired-range",
           });
         }
-      });
+        const first_time = first!.execution_time.t_s;
+        if (first_time !== "never") {
+          events.push({
+            when: new Date(first_time * 1000),
+            description: `wire transfer started...`,
+            type: "wired-range",
+          });
+        }
+      } else {
+        order.wire_details.forEach((e) => {
+          if (e.execution_time.t_s !== "never") {
+            events.push({
+              when: new Date(e.execution_time.t_s * 1000),
+              description: `wired ${e.amount}`,
+              type: "wired",
+            });
+          }
+        });
+      }
     }
   }