diff --git a/.env.example b/.env.example index 091949f..084e916 100644 --- a/.env.example +++ b/.env.example @@ -10,6 +10,7 @@ MEDIPOST_PASSWORD=your-medipost-password MEDIPOST_RECIPIENT=your-medipost-recipient CONNECTED_ONLINE_URL=your-connected-online-url +CONNECTED_ONLINE_CONFIRMED_URL=your-connected-confirmed-url EMAIL_SENDER= EMAIL_USER= # refer to your email provider's documentation diff --git a/app/home/(user)/_components/orders/order-block.tsx b/app/home/(user)/_components/orders/order-block.tsx index b43b3a2..12094bd 100644 --- a/app/home/(user)/_components/orders/order-block.tsx +++ b/app/home/(user)/_components/orders/order-block.tsx @@ -69,11 +69,12 @@ export default function OrderBlock({ title="orders:table.ttoService" type="ttoService" order={{ - status: medusaOrderStatus.toUpperCase(), + status: ttoReservation?.status, medusaOrderId, location: ttoLocation?.name, bookingCode: ttoReservation?.booking_code, clinicId: ttoReservation?.clinic_id, + medusaLineItemId: ttoReservation?.medusa_cart_line_item_id, }} /> )} diff --git a/app/home/(user)/_components/orders/order-items-table.tsx b/app/home/(user)/_components/orders/order-items-table.tsx index 18ba3a1..516b098 100644 --- a/app/home/(user)/_components/orders/order-items-table.tsx +++ b/app/home/(user)/_components/orders/order-items-table.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; -import { useRouter } from 'next/navigation'; +import { redirect, useRouter } from 'next/navigation'; import ConfirmationModal from '@/packages/shared/src/components/confirmation-modal'; import { StoreOrderLineItem } from '@medusajs/types'; @@ -40,6 +40,11 @@ export default function OrderItemsTable({ }) { const router = useRouter(); const [isConfirmOpen, setIsConfirmOpen] = useState(false); + const isCancelOrderAllowed = + order?.bookingCode && + order?.clinicId && + order?.medusaLineItemId && + order?.status === 'CONFIRMED'; if (!items || items.length === 0) { return null; @@ -109,7 +114,7 @@ export default function OrderItemsTable({ - {isTtoservice && order.bookingCode && ( + {isCancelOrderAllowed && (