Skip to content

Commit 237d903

Browse files
committed
fix: add email & name to show correctly
1 parent 4315c83 commit 237d903

File tree

1 file changed

+31
-20
lines changed
  • apps/client/components/TicketDetails

1 file changed

+31
-20
lines changed

apps/client/components/TicketDetails/index.tsx

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,13 @@ export default function Ticket() {
483483
</div>
484484
<div className="mt-2 text-xs flex flex-row justify-between items-center space-x-1 text-gray-500 dark:text-white">
485485
<div className="flex flex-row space-x-1 items-center">
486+
{data.ticket.client && (
487+
<div>
488+
<span className="inline-flex items-center rounded-md bg-orange-50 px-2 py-1 text-xs font-medium text-orange-700 ring-1 ring-inset ring-orange-600/20">
489+
{data.ticket.client.name}
490+
</span>
491+
</div>
492+
)}
486493
<div>
487494
{!data.ticket.isComplete ? (
488495
<div className="flex items-center space-x-2">
@@ -576,11 +583,6 @@ export default function Ticket() {
576583
</DropdownMenuContent>
577584
</DropdownMenu>
578585
)}
579-
{/* <div>
580-
<span className="inline-flex items-center rounded-md bg-orange-50 px-2 py-1 text-xs font-medium text-orange-700 ring-1 ring-inset ring-orange-600/20">
581-
{data.ticket.client.name}
582-
</span>
583-
</div> */}
584586
</div>
585587
</div>
586588
</div>
@@ -637,36 +639,41 @@ export default function Ticket() {
637639
) : (
638640
<>
639641
{data.ticket.createdBy ? (
640-
<>
642+
<div className="flex flex-row space-x-1">
641643
<span>
642-
Created by{" "}
643-
<strong>{data.ticket.createdBy.name}</strong> at{" "}
644+
Created by
645+
<strong>
646+
{data.ticket.createdBy.name}
647+
</strong> at{" "}
644648
</span>
645649
<span className="">
646650
{moment(data.ticket.createdAt).format("LLL")}
647-
{data.ticket.client && (
648-
<span>
649-
{" "}
650-
for <strong>{data.ticket.client.name}</strong>
651-
</span>
652-
)}
653651
</span>
654-
</>
652+
{data.ticket.name && (
653+
<span>
654+
for <strong>{data.ticket.name}</strong>
655+
</span>
656+
)}
657+
{data.ticket.email && (
658+
<span>
659+
( <strong>{data.ticket.email}</strong> )
660+
</span>
661+
)}
662+
</div>
655663
) : (
656-
<>
664+
<div className="flex flex-row space-x-1">
657665
<span>Created at </span>
658666
<span className="">
659667
<strong>
660668
{moment(data.ticket.createdAt).format("LLL")}
661669
</strong>
662670
{data.ticket.client && (
663671
<span>
664-
{" "}
665672
for <strong>{data.ticket.client.name}</strong>
666673
</span>
667674
)}
668675
</span>
669-
</>
676+
</div>
670677
)}
671678
</>
672679
)}
@@ -841,7 +848,9 @@ export default function Ticket() {
841848
}}
842849
disabled={data.ticket.locked}
843850
className={`inline-flex justify-center items-center gap-x-1.5 rounded-md ${
844-
data.ticket.locked ? "bg-gray-300 cursor-not-allowed" : "bg-white hover:bg-gray-50"
851+
data.ticket.locked
852+
? "bg-gray-300 cursor-not-allowed"
853+
: "bg-white hover:bg-gray-50"
845854
} px-3 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300`}
846855
>
847856
<CheckCircleIcon
@@ -862,7 +871,9 @@ export default function Ticket() {
862871
}}
863872
disabled={data.ticket.locked}
864873
className={`inline-flex justify-center gap-x-1.5 rounded-md ${
865-
data.ticket.locked ? "bg-gray-300 cursor-not-allowed" : "bg-white hover:bg-gray-50"
874+
data.ticket.locked
875+
? "bg-gray-300 cursor-not-allowed"
876+
: "bg-white hover:bg-gray-50"
866877
} px-3 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300`}
867878
>
868879
<CheckCircleIcon

0 commit comments

Comments
 (0)