diff --git a/app/(main)/components/DeleteTicketButton.tsx b/app/(main)/components/DeleteTicketButton.tsx
index dbd352c..150ef5c 100644
--- a/app/(main)/components/DeleteTicketButton.tsx
+++ b/app/(main)/components/DeleteTicketButton.tsx
@@ -2,6 +2,7 @@
import { deleteTicket } from '@/app/actions/ticket';
import { usePathname, useRouter } from 'next/navigation';
+import { Button } from 'react-bootstrap';
export default function DeleteTicketButton({ ticketId }: { ticketId: string }) {
const pathname = usePathname();
@@ -20,8 +21,12 @@ export default function DeleteTicketButton({ ticketId }: { ticketId: string }) {
}
return (
-
);
}
diff --git a/app/(main)/components/InStockTicketItemCard.tsx b/app/(main)/components/InStockTicketItemCard.tsx
index 5b6a048..de29a7b 100644
--- a/app/(main)/components/InStockTicketItemCard.tsx
+++ b/app/(main)/components/InStockTicketItemCard.tsx
@@ -93,10 +93,14 @@ export default function InStockTicketItemCard({
{errorMessage &&
{errorMessage}
}
{hasChanged && (
- <>
- Save
- Cancel
- >
+
+
+ Save
+
+
+ Cancel
+
+
)}
diff --git a/app/(main)/components/OutOfStockTicketItemCard.tsx b/app/(main)/components/OutOfStockTicketItemCard.tsx
index 3695ee3..4c41e49 100644
--- a/app/(main)/components/OutOfStockTicketItemCard.tsx
+++ b/app/(main)/components/OutOfStockTicketItemCard.tsx
@@ -38,8 +38,12 @@ export default function OutOfStockTicketItemCard({
/>
{isChanged && (
- Save
- Cancel
+
+ Save
+
+
+ Cancel
+
)}
diff --git a/app/(main)/components/RemoveTicketItemButton.tsx b/app/(main)/components/RemoveTicketItemButton.tsx
index 79e2cff..69cf270 100644
--- a/app/(main)/components/RemoveTicketItemButton.tsx
+++ b/app/(main)/components/RemoveTicketItemButton.tsx
@@ -1,6 +1,7 @@
'use client';
import { deleteTicketItem } from '@/app/actions/ticket';
+import { Button } from 'react-bootstrap';
type RemoveTicketItemButtonProps = {
ticketItemId: string;
@@ -18,8 +19,13 @@ export default function RemoveTicketItemButton({
};
return (
-
+
Remove
-
+
);
}
diff --git a/app/(main)/components/TicketDestStoreDropdown.tsx b/app/(main)/components/TicketDestStoreDropdown.tsx
index 62f43ea..f78eb25 100644
--- a/app/(main)/components/TicketDestStoreDropdown.tsx
+++ b/app/(main)/components/TicketDestStoreDropdown.tsx
@@ -2,6 +2,7 @@
import { updateTicketDestStore } from '@/app/actions/ticket';
import { Store } from '@/app/types/store';
import { useState } from 'react';
+import { Form } from 'react-bootstrap';
export default function TicketDestStoreDropdown({
ticketId,
@@ -41,7 +42,7 @@ export default function TicketDestStoreDropdown({
return (
-
+ {[...destStoreOptions]
+ .sort((a, b) => a.store.name.localeCompare(b.store.name))
+ .map(({ store }) => (
+
+ ))}
+
{selectedDestStore != originalDestStore && (
-
-
+
+
Save
-
+
Cancel
- {error && {error}
}
+ {error && {error}
}
)}
diff --git a/app/(main)/components/TicketDetails.module.css b/app/(main)/components/TicketDetails.module.css
index bfde4d2..5e9b516 100644
--- a/app/(main)/components/TicketDetails.module.css
+++ b/app/(main)/components/TicketDetails.module.css
@@ -162,6 +162,9 @@
width: auto;
margin-top: 0;
}
+ .headerEndAtLarge {
+ align-self: flex-end;
+ }
.ticketContentMain {
flex: 0 0 auto;
width: 66.66666667%;
diff --git a/app/(main)/components/TicketDetails.tsx b/app/(main)/components/TicketDetails.tsx
index 91d8183..86d88f3 100644
--- a/app/(main)/components/TicketDetails.tsx
+++ b/app/(main)/components/TicketDetails.tsx
@@ -176,11 +176,14 @@ export default async function TicketDetails({
Ticket #{userTicket.ticket_id}
- {!outgoing ? (
-
+
+ {!outgoing && (
Contact
-
- ) : null}
+ )}
+
+
+
+
+
-
-
-
Ticket Destination Store:
-
({
- store,
- }))}
- />
-
-
-
-
@@ -246,6 +236,17 @@ export default async function TicketDetails({
Store Address: {store.street_address}
+
+ ({
+ store,
+ }),
+ )}
+ />
+
diff --git a/app/(main)/components/TicketStatusDropdown.tsx b/app/(main)/components/TicketStatusDropdown.tsx
index 1640752..85f354b 100644
--- a/app/(main)/components/TicketStatusDropdown.tsx
+++ b/app/(main)/components/TicketStatusDropdown.tsx
@@ -1,6 +1,7 @@
'use client';
import { useState } from 'react';
import { updateTicketStatus } from '@/app/actions/ticket';
+import { Form } from 'react-bootstrap';
type TicketStatus =
| 'draft'
@@ -43,26 +44,35 @@ export default function TicketStatusDropdown({
return (
-
+
{selectedStatus !== originalStatus && (
-
-
+
+
Save
-
+
Cancel
- {error && {error}
}
+ {error && {error}
}
)}