1 files changed, 50 insertions, 43 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/index.tsx
index 0f8618435..861114014 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/index.tsx
@@ -19,16 +19,18 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
-import { ErrorType, HttpError } from "@gnu-taler/web-util/browser";
+import { HttpStatusCode, TalerError, TalerMerchantApi, assertUnreachable } from "@gnu-taler/taler-util";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../../components/exception/loading.js";
 import { NotificationCard } from "../../../../components/menu/index.js";
+import { useSessionContext } from "../../../../context/session.js";
 import { useInstanceDetails } from "../../../../hooks/instance.js";
-import { useOrderAPI } from "../../../../hooks/order.js";
 import { useInstanceProducts } from "../../../../hooks/product.js";
 import { Notification } from "../../../../utils/types.js";
+import { LoginPage } from "../../../login/index.js";
+import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { CreatePage } from "./CreatePage.js";
 
 export type Entity = {
@@ -38,52 +40,50 @@ export type Entity = {
 interface Props {
   onBack?: () => void;
   onConfirm: (id: string) => void;
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (error: HttpError<TalerErrorDetail>) => VNode;
 }
 export default function OrderCreate({
   onConfirm,
   onBack,
-  onLoadError,
-  onNotFound,
-  onUnauthorized,
 }: Props): VNode {
-  const { createOrder } = useOrderAPI();
+  const { lib } = useSessionContext();
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
-
+  const { state } = useSessionContext();
   const detailsResult = useInstanceDetails();
   const inventoryResult = useInstanceProducts();
 
-  if (detailsResult.loading) return <Loading />;
-  if (inventoryResult.loading) return <Loading />;
-
-  if (!detailsResult.ok) {
-    if (
-      detailsResult.type === ErrorType.CLIENT &&
-      detailsResult.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      detailsResult.type === ErrorType.CLIENT &&
-      detailsResult.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(detailsResult);
+  if (!detailsResult) return <Loading />
+  if (detailsResult instanceof TalerError) {
+    return <ErrorLoadingMerchant error={detailsResult} />
   }
-
-  if (!inventoryResult.ok) {
-    if (
-      inventoryResult.type === ErrorType.CLIENT &&
-      inventoryResult.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      inventoryResult.type === ErrorType.CLIENT &&
-      inventoryResult.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(inventoryResult);
+  if (detailsResult.type === "fail") {
+    switch (detailsResult.case) {
+      case HttpStatusCode.Unauthorized: {
+        return <LoginPage />
+      }
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      default: {
+        assertUnreachable(detailsResult);
+      }
+    }
+  }
+  if (!inventoryResult) return <Loading />
+  if (inventoryResult instanceof TalerError) {
+    return <ErrorLoadingMerchant error={inventoryResult} />
+  }
+  if (inventoryResult.type === "fail") {
+    switch (inventoryResult.case) {
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      case HttpStatusCode.Unauthorized: {
+        return <LoginPage />
+      }
+      default: {
+        assertUnreachable(inventoryResult);
+      }
+    }
   }
 
   return (
@@ -93,9 +93,16 @@ export default function OrderCreate({
       <CreatePage
         onBack={onBack}
         onCreate={(request: TalerMerchantApi.PostOrderRequest) => {
-          createOrder(request)
+          lib.instance.createOrder(state.token, request)
             .then((r) => {
-              return onConfirm(r.data.order_id)
+              if (r.type === "ok") {
+                return onConfirm(r.body.order_id)
+              } else {
+                setNotif({
+                  message: "could not create order",
+                  type: "ERROR",
+                });
+              }
             })
             .catch((error) => {
               setNotif({
@@ -105,8 +112,8 @@ export default function OrderCreate({
               });
             });
         }}
-        instanceConfig={detailsResult.data}
-        instanceInventory={inventoryResult.data}
+        instanceConfig={detailsResult.body}
+        instanceInventory={inventoryResult.body}
       />
     </Fragment>
   );