update la relance par mail

This commit is contained in:
ordinarthur 2026-05-06 19:02:39 +02:00
parent 5e41e2a9fa
commit b8dec6d494
4 changed files with 73 additions and 37 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
.DS_Store .DS_Store
node_modules/ node_modules/
assets/test-invoices/
# Env files (never commit secrets) # Env files (never commit secrets)
.env .env

View File

@ -16,12 +16,13 @@ const CHECKIN_TTL_HOURS = 24
*/ */
function spaRedirectUrl( function spaRedirectUrl(
result: 'paid' | 'pending' | 'expired' | 'invalid' | 'already_answered', result: 'paid' | 'pending' | 'expired' | 'invalid' | 'already_answered',
invoiceNumero?: string invoice?: Pick<Invoice, 'id' | 'numero'>
): string { ): string {
const base = env.get('WEB_URL', 'http://localhost:5173') const base = env.get('WEB_URL', 'http://localhost:5173')
const params = new URLSearchParams({ checkin: result }) const params = new URLSearchParams({ checkin: result })
if (invoiceNumero) params.set('invoice', invoiceNumero) if (invoice) params.set('invoice', invoice.numero)
return `${base}/?${params.toString()}` const path = invoice ? `/factures/${invoice.id}` : '/'
return `${base}${path}?${params.toString()}`
} }
type ResolvedTask = { task: CheckinTask; invoice: Invoice } | { redirect: string } type ResolvedTask = { task: CheckinTask; invoice: Invoice } | { redirect: string }
@ -39,7 +40,7 @@ async function resolveCheckin(token: string): Promise<ResolvedTask> {
if (task.status === 'answered') { if (task.status === 'answered') {
const inv = await Invoice.find(task.invoiceId) const inv = await Invoice.find(task.invoiceId)
return { redirect: spaRedirectUrl('already_answered', inv?.numero) } return { redirect: spaRedirectUrl('already_answered', inv ?? undefined) }
} }
// Expiration : 24h après l'envoi (sentAt). Tant qu'elle n'a pas été // Expiration : 24h après l'envoi (sentAt). Tant qu'elle n'a pas été
@ -107,7 +108,7 @@ export default class CheckinController {
} }
}) })
return response.redirect(spaRedirectUrl('paid', invoice.numero)) return response.redirect(spaRedirectUrl('paid', invoice))
} }
/** /**
@ -123,15 +124,19 @@ export default class CheckinController {
} }
const { task, invoice } = result const { task, invoice } = result
task.status = 'answered' await db.transaction(async (trx) => {
task.answer = 'still_pending' if (invoice.planId) {
task.answeredAt = DateTime.now() invoice.useTransaction(trx)
await task.save() await scheduleRelancesForInvoice(invoice, trx)
}
if (invoice.planId) { task.useTransaction(trx)
await scheduleRelancesForInvoice(invoice) task.status = 'answered'
} task.answer = 'still_pending'
task.answeredAt = DateTime.now()
await task.save()
})
return response.redirect(spaRedirectUrl('pending', invoice.numero)) return response.redirect(spaRedirectUrl('pending', invoice))
} }
} }

View File

@ -46,6 +46,13 @@ export async function scheduleRelancesForInvoice(
.first() .first()
if (!plan) return [] if (!plan) return []
const alreadyActive = await RelanceTask.query(trx ? { client: trx } : undefined)
.where('invoice_id', invoice.id)
.whereIn('status', ['scheduled', 'sent'])
if (alreadyActive.length > 0) {
return alreadyActive
}
// Cancel les tasks scheduled existantes (re-scheduling après changement // Cancel les tasks scheduled existantes (re-scheduling après changement
// de plan ou de dueDate). // de plan ou de dueDate).
const existing = await RelanceTask.query(trx ? { client: trx } : undefined) const existing = await RelanceTask.query(trx ? { client: trx } : undefined)

View File

@ -1,17 +1,14 @@
import { useEffect } from "react";
import { createFileRoute, Link, useNavigate } from "@tanstack/react-router"; import { createFileRoute, Link, useNavigate } from "@tanstack/react-router";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { ArrowLeft, Check, Send } from "lucide-react"; import { ArrowLeft, Check, Send } from "lucide-react";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod";
import type { Client, Invoice, Plan } from "@rubis/shared"; import type { Client, Invoice, Plan } from "@rubis/shared";
import { api } from "@/lib/api"; import { api } from "@/lib/api";
import { queryKeys } from "@/lib/queryKeys"; import { queryKeys } from "@/lib/queryKeys";
import { import { formatEuros, formatDate, formatDueDelta, isOverdue } from "@/lib/format";
formatEuros,
formatDate,
formatDueDelta,
isOverdue,
} from "@/lib/format";
import { Button } from "@/components/ui/Button"; import { Button } from "@/components/ui/Button";
import { Card } from "@/components/ui/Card"; import { Card } from "@/components/ui/Card";
@ -20,6 +17,11 @@ import { StatusBadge } from "@/components/ui/StatusBadge";
import { Timeline, type TimelineEvent } from "@/components/ui/Timeline"; import { Timeline, type TimelineEvent } from "@/components/ui/Timeline";
import { Textarea } from "@/components/ui/Textarea"; import { Textarea } from "@/components/ui/Textarea";
const checkinSearchSchema = z.object({
checkin: z.enum(["paid", "pending", "expired", "invalid", "already_answered"]).optional(),
invoice: z.string().optional(),
});
type InvoiceDetail = Invoice & { type InvoiceDetail = Invoice & {
client: Client; client: Client;
plan: Plan | null; plan: Plan | null;
@ -29,6 +31,7 @@ type InvoiceDetail = Invoice & {
}; };
export const Route = createFileRoute("/_app/factures_/$id")({ export const Route = createFileRoute("/_app/factures_/$id")({
validateSearch: checkinSearchSchema,
component: InvoiceDetailPage, component: InvoiceDetailPage,
loader: ({ context, params }) => { loader: ({ context, params }) => {
void context.queryClient.prefetchQuery({ void context.queryClient.prefetchQuery({
@ -40,10 +43,15 @@ export const Route = createFileRoute("/_app/factures_/$id")({
function InvoiceDetailPage() { function InvoiceDetailPage() {
const { id } = Route.useParams(); const { id } = Route.useParams();
const search = Route.useSearch();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const navigate = useNavigate(); const navigate = useNavigate();
const { data: invoice, isPending, isError } = useQuery({ const {
data: invoice,
isPending,
isError,
} = useQuery({
queryKey: queryKeys.invoices.detail(id), queryKey: queryKeys.invoices.detail(id),
queryFn: () => api.get<InvoiceDetail>(`/api/v1/invoices/${id}`), queryFn: () => api.get<InvoiceDetail>(`/api/v1/invoices/${id}`),
}); });
@ -61,12 +69,37 @@ function InvoiceDetailPage() {
}, },
}); });
useEffect(() => {
const checkin = search.checkin;
if (!checkin) return;
const labels: Record<typeof checkin, string> = {
paid: "Facture marquée encaissée.",
pending: "Relance activée pour cette facture.",
expired: "Ce lien de check-in a expiré.",
invalid: "Ce lien de check-in est invalide.",
already_answered: "Ce check-in avait déjà été traité.",
};
const isErrorToast = checkin === "expired" || checkin === "invalid";
if (isErrorToast) toast.error(labels[checkin]);
else toast.success(labels[checkin]);
void queryClient.invalidateQueries({ queryKey: queryKeys.invoices.detail(id) });
void queryClient.invalidateQueries({ queryKey: queryKeys.invoices.all() });
void queryClient.invalidateQueries({ queryKey: queryKeys.dashboard.kpis() });
void navigate({
to: "/factures/$id",
params: { id },
search: {},
replace: true,
});
}, [id, navigate, queryClient, search.checkin]);
if (isError) { if (isError) {
return ( return (
<div className="text-center py-12"> <div className="text-center py-12">
<p className="font-display text-[20px] font-semibold text-ink"> <p className="font-display text-[20px] font-semibold text-ink">Facture introuvable.</p>
Facture introuvable.
</p>
<Link <Link
to="/factures" to="/factures"
className="mt-3 inline-block text-[13px] text-rubis underline-offset-4 hover:underline" className="mt-3 inline-block text-[13px] text-rubis underline-offset-4 hover:underline"
@ -117,11 +150,7 @@ function InvoiceDetailPage() {
({formatDueDelta(invoice.dueDate)}) ({formatDueDelta(invoice.dueDate)})
</span> </span>
</span> </span>
<StatusBadge <StatusBadge status={invoice.status} label={invoice.statusLabel} className="ml-1" />
status={invoice.status}
label={invoice.statusLabel}
className="ml-1"
/>
</p> </p>
</div> </div>
@ -147,9 +176,7 @@ function InvoiceDetailPage() {
<Card padding="md"> <Card padding="md">
<Eyebrow tone="ink"> <Eyebrow tone="ink">
Timeline Timeline
{invoice.plan && ( {invoice.plan && <span className="text-ink-3"> · plan {invoice.plan.name}</span>}
<span className="text-ink-3"> · plan {invoice.plan.name}</span>
)}
</Eyebrow> </Eyebrow>
<Timeline events={invoice.timeline} className="mt-5" /> <Timeline events={invoice.timeline} className="mt-5" />
</Card> </Card>
@ -162,14 +189,10 @@ function InvoiceDetailPage() {
{invoice.client.name} {invoice.client.name}
</p> </p>
{invoice.client.email && ( {invoice.client.email && (
<p className="mt-1 text-[13.5px] text-ink-2 truncate"> <p className="mt-1 text-[13.5px] text-ink-2 truncate">{invoice.client.email}</p>
{invoice.client.email}
</p>
)} )}
{invoice.client.phone && ( {invoice.client.phone && (
<p className="mt-0.5 text-[13.5px] text-ink-2"> <p className="mt-0.5 text-[13.5px] text-ink-2">{invoice.client.phone}</p>
{invoice.client.phone}
</p>
)} )}
{invoice.client.address && ( {invoice.client.address && (
<p className="mt-2 text-[12.5px] leading-relaxed text-ink-3"> <p className="mt-2 text-[12.5px] leading-relaxed text-ink-3">