diff --git a/apps/infoalloggi/src/components/servizio/annuncio_card.tsx b/apps/infoalloggi/src/components/servizio/annuncio_card.tsx index ffaa9bc..d944419 100644 --- a/apps/infoalloggi/src/components/servizio/annuncio_card.tsx +++ b/apps/infoalloggi/src/components/servizio/annuncio_card.tsx @@ -10,13 +10,20 @@ import { useServizioAnnuncio } from "~/providers/ServizioProvider"; import type { AnnuncioRicerca } from "~/server/controllers/annunci.controller"; import { AnnuncioDettaglio, TipoBadge } from "./annuncio_dettaglio"; -export const AnnuncioCard = ({ className }: { className?: string }) => { +export const AnnuncioCard = ({ + className, + confirming, +}: { + className?: string; + confirming?: boolean; +}) => { const { data } = useServizioAnnuncio(); return ( } className={className} + confirming={confirming} data={{ ...data, modificato_il: data.modificato_il ? new Date(data.modificato_il) : null, @@ -33,23 +40,36 @@ export const BasicAnnuncioCard = ({ interactions, className, data, + confirming, }: { actions?: React.ReactNode; interactions?: React.ReactNode; className?: string; data: AnnuncioRicerca; + confirming?: boolean; }) => { const { t } = useTranslation(); return ( - + Annuncio {data.codice} {actions} -
-
+
+
{data.codice}
-
{interactions}
+
+ {interactions} +
diff --git a/apps/infoalloggi/src/components/servizio/interactions.tsx b/apps/infoalloggi/src/components/servizio/interactions.tsx index 3ce5795..2bd396f 100644 --- a/apps/infoalloggi/src/components/servizio/interactions.tsx +++ b/apps/infoalloggi/src/components/servizio/interactions.tsx @@ -190,13 +190,15 @@ export const Interactions = () => { const { data } = useServizioAnnuncio(); return ( -
- + <> +
+ - + +
{data.accettato_conferma_at != null && } -
+ ); }; diff --git a/apps/infoalloggi/src/components/servizio/main.tsx b/apps/infoalloggi/src/components/servizio/main.tsx index 8780a9c..c1a07be 100644 --- a/apps/infoalloggi/src/components/servizio/main.tsx +++ b/apps/infoalloggi/src/components/servizio/main.tsx @@ -221,7 +221,10 @@ export const ServizioContent = () => { servizioId={servizio.servizio_id} userId={userId} > - + ); })} diff --git a/apps/infoalloggi/src/components/servizio/servizio_actions.tsx b/apps/infoalloggi/src/components/servizio/servizio_actions.tsx index 154c708..b3d2c7e 100644 --- a/apps/infoalloggi/src/components/servizio/servizio_actions.tsx +++ b/apps/infoalloggi/src/components/servizio/servizio_actions.tsx @@ -167,6 +167,8 @@ const ServizioBasicActions = ({ className }: { className?: string }) => { servizio.isOkAcconto && servizio.decorrenza !== null && new Date() <= add(new Date(servizio.decorrenza), { days: 60 }) && + !servizio.annunci.some((a) => a.user_confirmed_at !== null) && + !servizio.isInterrotto && !servizio.annunci.some((a) => a.user_confirmed_at !== null); if (isAdmin || canUserEdit) {