wip, doesn't compile. now merchant doesn't have it's own definition of types... it uses the one defined by taler-util

1 files changed, 28 insertions, 28 deletions

diff --git a/packages/merchant-backoffice-ui/src/hooks/order.ts b/packages/merchant-backoffice-ui/src/hooks/order.ts
index efc7bdcbe..39bc1725b 100644
--- a/packages/merchant-backoffice-ui/src/hooks/order.ts
+++ b/packages/merchant-backoffice-ui/src/hooks/order.ts
@@ -20,27 +20,27 @@ import {
   RequestError,
 } from "@gnu-taler/web-util/browser";
 import { useEffect, useState } from "preact/hooks";
-import { MerchantBackend } from "../declaration.js";
 import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils/constants.js";
 import { useBackendInstanceRequest, useMatchMutate } from "./backend.js";
 
 // FIX default import https://github.com/microsoft/TypeScript/issues/49189
+import { TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
 import _useSWR, { SWRHook } from "swr";
 const useSWR = _useSWR as unknown as SWRHook;
 
 export interface OrderAPI {
   //FIXME: add OutOfStockResponse on 410
   createOrder: (
-    data: MerchantBackend.Orders.PostOrderRequest,
-  ) => Promise<HttpResponseOk<MerchantBackend.Orders.PostOrderResponse>>;
+    data: TalerMerchantApi.PostOrderRequest,
+  ) => Promise<HttpResponseOk<TalerMerchantApi.PostOrderResponse>>;
   forgetOrder: (
     id: string,
-    data: MerchantBackend.Orders.ForgetRequest,
+    data: TalerMerchantApi.ForgetRequest,
   ) => Promise<HttpResponseOk<void>>;
   refundOrder: (
     id: string,
-    data: MerchantBackend.Orders.RefundRequest,
-  ) => Promise<HttpResponseOk<MerchantBackend.Orders.MerchantRefundResponse>>;
+    data: TalerMerchantApi.RefundRequest,
+  ) => Promise<HttpResponseOk<TalerMerchantApi.MerchantRefundResponse>>;
   deleteOrder: (id: string) => Promise<HttpResponseOk<void>>;
   getPaymentURL: (id: string) => Promise<HttpResponseOk<string>>;
 }
@@ -52,9 +52,9 @@ export function useOrderAPI(): OrderAPI {
   const { request } = useBackendInstanceRequest();
 
   const createOrder = async (
-    data: MerchantBackend.Orders.PostOrderRequest,
-  ): Promise<HttpResponseOk<MerchantBackend.Orders.PostOrderResponse>> => {
-    const res = await request<MerchantBackend.Orders.PostOrderResponse>(
+    data: TalerMerchantApi.PostOrderRequest,
+  ): Promise<HttpResponseOk<TalerMerchantApi.PostOrderResponse>> => {
+    const res = await request<TalerMerchantApi.PostOrderResponse>(
       `/private/orders`,
       {
         method: "POST",
@@ -67,10 +67,10 @@ export function useOrderAPI(): OrderAPI {
   };
   const refundOrder = async (
     orderId: string,
-    data: MerchantBackend.Orders.RefundRequest,
-  ): Promise<HttpResponseOk<MerchantBackend.Orders.MerchantRefundResponse>> => {
+    data: TalerMerchantApi.RefundRequest,
+  ): Promise<HttpResponseOk<TalerMerchantApi.MerchantRefundResponse>> => {
     mutateAll(/@"\/private\/orders"@/);
-    const res = request<MerchantBackend.Orders.MerchantRefundResponse>(
+    const res = request<TalerMerchantApi.MerchantRefundResponse>(
       `/private/orders/${orderId}/refund`,
       {
         method: "POST",
@@ -85,7 +85,7 @@ export function useOrderAPI(): OrderAPI {
 
   const forgetOrder = async (
     orderId: string,
-    data: MerchantBackend.Orders.ForgetRequest,
+    data: TalerMerchantApi.ForgetRequest,
   ): Promise<HttpResponseOk<void>> => {
     mutateAll(/@"\/private\/orders"@/);
     const res = request<void>(`/private/orders/${orderId}/forget`, {
@@ -110,7 +110,7 @@ export function useOrderAPI(): OrderAPI {
   const getPaymentURL = async (
     orderId: string,
   ): Promise<HttpResponseOk<string>> => {
-    return request<MerchantBackend.Orders.MerchantOrderStatusResponse>(
+    return request<TalerMerchantApi.MerchantOrderStatusResponse>(
       `/private/orders/${orderId}`,
       {
         method: "GET",
@@ -132,14 +132,14 @@ export function useOrderAPI(): OrderAPI {
 export function useOrderDetails(
   oderId: string,
 ): HttpResponse<
-  MerchantBackend.Orders.MerchantOrderStatusResponse,
-  MerchantBackend.ErrorDetail
+  TalerMerchantApi.MerchantOrderStatusResponse,
+  TalerErrorDetail
 > {
   const { fetcher } = useBackendInstanceRequest();
 
   const { data, error, isValidating } = useSWR<
-    HttpResponseOk<MerchantBackend.Orders.MerchantOrderStatusResponse>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.MerchantOrderStatusResponse>,
+    RequestError<TalerErrorDetail>
   >([`/private/orders/${oderId}`], fetcher, {
     refreshInterval: 0,
     refreshWhenHidden: false,
@@ -165,8 +165,8 @@ export function useInstanceOrders(
   args?: InstanceOrderFilter,
   updateFilter?: (d: Date) => void,
 ): HttpResponsePaginated<
-  MerchantBackend.Orders.OrderHistory,
-  MerchantBackend.ErrorDetail
+  TalerMerchantApi.OrderHistory,
+  TalerErrorDetail
 > {
   const { orderFetcher } = useBackendInstanceRequest();
 
@@ -187,8 +187,8 @@ export function useInstanceOrders(
     error: beforeError,
     isValidating: loadingBefore,
   } = useSWR<
-    HttpResponseOk<MerchantBackend.Orders.OrderHistory>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.OrderHistory>,
+    RequestError<TalerErrorDetail>
   >(
     [
       `/private/orders`,
@@ -205,8 +205,8 @@ export function useInstanceOrders(
     error: afterError,
     isValidating: loadingAfter,
   } = useSWR<
-    HttpResponseOk<MerchantBackend.Orders.OrderHistory>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.OrderHistory>,
+    RequestError<TalerErrorDetail>
   >(
     [
       `/private/orders`,
@@ -222,14 +222,14 @@ export function useInstanceOrders(
   //this will save last result
   const [lastBefore, setLastBefore] = useState<
     HttpResponse<
-      MerchantBackend.Orders.OrderHistory,
-      MerchantBackend.ErrorDetail
+      TalerMerchantApi.OrderHistory,
+      TalerErrorDetail
     >
   >({ loading: true });
   const [lastAfter, setLastAfter] = useState<
     HttpResponse<
-      MerchantBackend.Orders.OrderHistory,
-      MerchantBackend.ErrorDetail
+      TalerMerchantApi.OrderHistory,
+      TalerErrorDetail
     >
   >({ loading: true });
   useEffect(() => {