feat(pricing): tooth-based selection, lab-owned pricing, clinic-specific overrides
What changed
- jobs.teeth (FDI string[]). memberCount becomes a derived field (teeth.length).
A new TeethChart component renders the full permanent dentition as a
16-column grid for each arch with click-toggle selection.
- /jobs/new: removed the price + currency inputs and the manual memberCount
field. Clinics now pick teeth via the chart; the form blocks submission
until at least one tooth is selected.
- createJobAction calls a new calculateJobPrice() helper that walks the
pricing cascade and writes price + currency on the job server-side. A
clinic-supplied price hidden field would now be ignored — the field
isn't even in the schema.
Pricing cascade (calculateJobPrice, lib/appwrite/pricing.ts)
1. clinic_pricing row matching (lab, clinic, type) with customUnitPrice
→ use that flat unit price.
2. clinic_pricing row with discountPercent → catalog unitPrice × (1-d).
3. lab's prosthetics catalog row matching type (not archived).
4. nothing → price stays null; lab can still set it manually later.
Clinic-specific overrides (clinic_pricing table)
- Unique on (labTenantId, clinicTenantId, prostheticType) so each
combination has at most one rule.
- Row permissions: read by both teams (transparency for clinic), write
only by lab — clinic can see the discount they're getting but cannot
edit it.
- setClinicPricingAction validates an approved connection exists before
creating/updating, and rejects requests where neither customUnitPrice
nor discountPercent is set.
- clearClinicPricingAction wipes a rule (catalog price re-applies).
UI
- /connections 'Bağlantılarım' table gets a new column showing the active
pricing rules per counterpart. Lab side has a 'Fiyatlandırma' button
that opens a dialog (PROSTHETIC_TYPE × customPrice|discountPercent form
+ list of active rules with delete). Clinic side is read-only.
- Job detail: 'Fiyat' field now shows 'Lab tarafından belirlenecek' when
null, instead of a literal —. Adds a 'Dişler' info block listing the
selected FDI numbers.
This commit is contained in:
@@ -0,0 +1,222 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useActionState, useEffect, useState } from "react";
|
||||||
|
import { DollarSign, Loader2, Trash2 } from "lucide-react";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogClose,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Label } from "@/components/ui/label";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
|
import {
|
||||||
|
clearClinicPricingAction,
|
||||||
|
setClinicPricingAction,
|
||||||
|
} from "@/lib/appwrite/clinic-pricing-actions";
|
||||||
|
import {
|
||||||
|
initialClinicPricingActionState,
|
||||||
|
initialClinicPricingFormState,
|
||||||
|
} from "@/lib/appwrite/clinic-pricing-types";
|
||||||
|
import { PROSTHETIC_TYPE_OPTIONS } from "@/lib/appwrite/prosthetic-types";
|
||||||
|
import type { ClinicPricing, ProstheticType } from "@/lib/appwrite/schema";
|
||||||
|
|
||||||
|
const TYPE_LABELS = Object.fromEntries(
|
||||||
|
PROSTHETIC_TYPE_OPTIONS.map((o) => [o.value, o.label]),
|
||||||
|
) as Record<string, string>;
|
||||||
|
|
||||||
|
export function ClinicPricingDialog({
|
||||||
|
clinicTenantId,
|
||||||
|
clinicName,
|
||||||
|
rows,
|
||||||
|
defaultCurrency,
|
||||||
|
}: {
|
||||||
|
clinicTenantId: string;
|
||||||
|
clinicName: string;
|
||||||
|
rows: ClinicPricing[];
|
||||||
|
defaultCurrency: string;
|
||||||
|
}) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
|
<Button size="sm" variant="outline" onClick={() => setOpen(true)}>
|
||||||
|
<DollarSign className="size-4" />
|
||||||
|
Fiyatlandırma
|
||||||
|
</Button>
|
||||||
|
<DialogContent className="max-w-xl">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>{clinicName} — Fiyatlandırma</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
Protez türü bazında özel fiyat veya yüzdelik indirim tanımlayın.
|
||||||
|
Boş bırakırsanız katalog fiyatı uygulanır.
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<PricingForm
|
||||||
|
clinicTenantId={clinicTenantId}
|
||||||
|
defaultCurrency={defaultCurrency}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{rows.length > 0 && (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<p className="text-muted-foreground text-xs font-medium uppercase tracking-wide">
|
||||||
|
Aktif kurallar
|
||||||
|
</p>
|
||||||
|
<ul className="divide-y rounded-md border">
|
||||||
|
{rows.map((r) => (
|
||||||
|
<PricingRow key={r.$id} row={r} />
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<DialogFooter>
|
||||||
|
<DialogClose asChild>
|
||||||
|
<Button type="button" variant="outline">
|
||||||
|
Kapat
|
||||||
|
</Button>
|
||||||
|
</DialogClose>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function PricingForm({
|
||||||
|
clinicTenantId,
|
||||||
|
defaultCurrency,
|
||||||
|
}: {
|
||||||
|
clinicTenantId: string;
|
||||||
|
defaultCurrency: string;
|
||||||
|
}) {
|
||||||
|
const [state, action, pending] = useActionState(
|
||||||
|
setClinicPricingAction,
|
||||||
|
initialClinicPricingFormState,
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (state.ok) toast.success("Fiyatlandırma kaydedildi.");
|
||||||
|
else if (state.error) toast.error(state.error);
|
||||||
|
}, [state]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form action={action} className="grid gap-3 rounded-md border bg-muted/30 p-3">
|
||||||
|
<input type="hidden" name="clinicTenantId" value={clinicTenantId} />
|
||||||
|
<div className="grid gap-2">
|
||||||
|
<Label htmlFor={`type-${clinicTenantId}`}>Protez Türü</Label>
|
||||||
|
<Select name="prostheticType" required defaultValue={PROSTHETIC_TYPE_OPTIONS[0].value}>
|
||||||
|
<SelectTrigger id={`type-${clinicTenantId}`}>
|
||||||
|
<SelectValue />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{PROSTHETIC_TYPE_OPTIONS.map((o) => (
|
||||||
|
<SelectItem key={o.value} value={o.value}>
|
||||||
|
{o.label}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-3 gap-2">
|
||||||
|
<div className="grid gap-2">
|
||||||
|
<Label htmlFor={`custom-${clinicTenantId}`}>Özel Birim Fiyat</Label>
|
||||||
|
<Input
|
||||||
|
id={`custom-${clinicTenantId}`}
|
||||||
|
name="customUnitPrice"
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
step="0.01"
|
||||||
|
placeholder="—"
|
||||||
|
/>
|
||||||
|
{state.fieldErrors?.customUnitPrice && (
|
||||||
|
<p className="text-destructive text-xs">{state.fieldErrors.customUnitPrice}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="grid gap-2">
|
||||||
|
<Label htmlFor={`disc-${clinicTenantId}`}>İndirim %</Label>
|
||||||
|
<Input
|
||||||
|
id={`disc-${clinicTenantId}`}
|
||||||
|
name="discountPercent"
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
max="100"
|
||||||
|
step="1"
|
||||||
|
placeholder="—"
|
||||||
|
/>
|
||||||
|
{state.fieldErrors?.discountPercent && (
|
||||||
|
<p className="text-destructive text-xs">{state.fieldErrors.discountPercent}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="grid gap-2">
|
||||||
|
<Label htmlFor={`cur-${clinicTenantId}`}>Para</Label>
|
||||||
|
<Input
|
||||||
|
id={`cur-${clinicTenantId}`}
|
||||||
|
name="currency"
|
||||||
|
defaultValue={defaultCurrency}
|
||||||
|
maxLength={8}
|
||||||
|
style={{ textTransform: "uppercase" }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p className="text-muted-foreground text-xs">
|
||||||
|
Özel fiyat girilirse katalogdan bağımsız uygulanır. Sadece indirim verirseniz katalog fiyatından oran düşülür.
|
||||||
|
</p>
|
||||||
|
<Button type="submit" size="sm" disabled={pending}>
|
||||||
|
{pending ? <Loader2 className="size-4 animate-spin" /> : <DollarSign className="size-4" />}
|
||||||
|
Kaydet / Güncelle
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function PricingRow({ row }: { row: ClinicPricing }) {
|
||||||
|
const [state, action, pending] = useActionState(
|
||||||
|
clearClinicPricingAction,
|
||||||
|
initialClinicPricingActionState,
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (state.ok) toast.success("Kural silindi.");
|
||||||
|
else if (state.error) toast.error(state.error);
|
||||||
|
}, [state]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li className="flex items-center gap-3 px-3 py-2 text-sm">
|
||||||
|
<span className="flex-1 font-medium">
|
||||||
|
{TYPE_LABELS[row.prostheticType] ?? row.prostheticType}
|
||||||
|
</span>
|
||||||
|
<span className="text-muted-foreground text-xs">
|
||||||
|
{row.customUnitPrice !== undefined && row.customUnitPrice !== null ? (
|
||||||
|
<>Özel fiyat: <span className="tabular-nums">{row.customUnitPrice}</span> {row.currency || "TRY"}</>
|
||||||
|
) : row.discountPercent ? (
|
||||||
|
<>İndirim: %{row.discountPercent}</>
|
||||||
|
) : (
|
||||||
|
"—"
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
<form action={action}>
|
||||||
|
<input type="hidden" name="id" value={row.$id} />
|
||||||
|
<Button type="submit" size="sm" variant="ghost" disabled={pending}>
|
||||||
|
{pending ? <Loader2 className="size-4 animate-spin" /> : <Trash2 className="size-4" />}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
type ProstheticTypeLabel = ProstheticType;
|
||||||
|
export type { ProstheticTypeLabel };
|
||||||
@@ -27,6 +27,13 @@ import {
|
|||||||
import { deleteConnectionAction } from "@/lib/appwrite/connection-actions";
|
import { deleteConnectionAction } from "@/lib/appwrite/connection-actions";
|
||||||
import { initialConnectionActionState } from "@/lib/appwrite/connection-types";
|
import { initialConnectionActionState } from "@/lib/appwrite/connection-types";
|
||||||
import type { ConnectionWithCounterpart } from "@/lib/appwrite/connection-queries";
|
import type { ConnectionWithCounterpart } from "@/lib/appwrite/connection-queries";
|
||||||
|
import type { ClinicPricing, TenantKind } from "@/lib/appwrite/schema";
|
||||||
|
import { PROSTHETIC_TYPE_OPTIONS } from "@/lib/appwrite/prosthetic-types";
|
||||||
|
import { ClinicPricingDialog } from "./clinic-pricing-dialog";
|
||||||
|
|
||||||
|
const TYPE_LABELS = Object.fromEntries(
|
||||||
|
PROSTHETIC_TYPE_OPTIONS.map((o) => [o.value, o.label]),
|
||||||
|
) as Record<string, string>;
|
||||||
|
|
||||||
const dateFormatter = new Intl.DateTimeFormat("tr-TR", {
|
const dateFormatter = new Intl.DateTimeFormat("tr-TR", {
|
||||||
day: "2-digit",
|
day: "2-digit",
|
||||||
@@ -34,7 +41,17 @@ const dateFormatter = new Intl.DateTimeFormat("tr-TR", {
|
|||||||
year: "numeric",
|
year: "numeric",
|
||||||
});
|
});
|
||||||
|
|
||||||
export function ConnectionsTable({ rows }: { rows: ConnectionWithCounterpart[] }) {
|
export function ConnectionsTable({
|
||||||
|
rows,
|
||||||
|
selfKind,
|
||||||
|
pricingByCounterpart = {},
|
||||||
|
defaultCurrency = "TRY",
|
||||||
|
}: {
|
||||||
|
rows: ConnectionWithCounterpart[];
|
||||||
|
selfKind: TenantKind | null;
|
||||||
|
pricingByCounterpart?: Record<string, ClinicPricing[]>;
|
||||||
|
defaultCurrency?: string;
|
||||||
|
}) {
|
||||||
if (rows.length === 0) {
|
if (rows.length === 0) {
|
||||||
return (
|
return (
|
||||||
<p className="text-muted-foreground py-6 text-center text-sm">
|
<p className="text-muted-foreground py-6 text-center text-sm">
|
||||||
@@ -43,6 +60,8 @@ export function ConnectionsTable({ rows }: { rows: ConnectionWithCounterpart[] }
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isLab = selfKind === "lab";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table>
|
<Table>
|
||||||
<TableHeader>
|
<TableHeader>
|
||||||
@@ -50,19 +69,40 @@ export function ConnectionsTable({ rows }: { rows: ConnectionWithCounterpart[] }
|
|||||||
<TableHead>Karşı taraf</TableHead>
|
<TableHead>Karşı taraf</TableHead>
|
||||||
<TableHead>Tür</TableHead>
|
<TableHead>Tür</TableHead>
|
||||||
<TableHead>Onay tarihi</TableHead>
|
<TableHead>Onay tarihi</TableHead>
|
||||||
|
<TableHead>{isLab ? "Fiyat kuralları" : "Sizin için kurallar"}</TableHead>
|
||||||
<TableHead className="text-right">İşlem</TableHead>
|
<TableHead className="text-right">İşlem</TableHead>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{rows.map((r) => (
|
{rows.map((r) => {
|
||||||
<ApprovedRow key={r.$id} row={r} />
|
const counterpartId = isLab ? r.clinicTenantId : r.labTenantId;
|
||||||
))}
|
const pricing = pricingByCounterpart[counterpartId] ?? [];
|
||||||
|
return (
|
||||||
|
<ApprovedRow
|
||||||
|
key={r.$id}
|
||||||
|
row={r}
|
||||||
|
isLab={isLab}
|
||||||
|
pricing={pricing}
|
||||||
|
defaultCurrency={defaultCurrency}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ApprovedRow({ row }: { row: ConnectionWithCounterpart }) {
|
function ApprovedRow({
|
||||||
|
row,
|
||||||
|
isLab,
|
||||||
|
pricing,
|
||||||
|
defaultCurrency,
|
||||||
|
}: {
|
||||||
|
row: ConnectionWithCounterpart;
|
||||||
|
isLab: boolean;
|
||||||
|
pricing: ClinicPricing[];
|
||||||
|
defaultCurrency: string;
|
||||||
|
}) {
|
||||||
const [state, action, pending] = useActionState(
|
const [state, action, pending] = useActionState(
|
||||||
deleteConnectionAction,
|
deleteConnectionAction,
|
||||||
initialConnectionActionState,
|
initialConnectionActionState,
|
||||||
@@ -86,6 +126,8 @@ function ApprovedRow({ row }: { row: ConnectionWithCounterpart }) {
|
|||||||
? "Klinik"
|
? "Klinik"
|
||||||
: "—";
|
: "—";
|
||||||
|
|
||||||
|
const counterpartId = isLab ? row.clinicTenantId : row.labTenantId;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TableCell className="font-medium">{row.counterpart?.companyName ?? "—"}</TableCell>
|
<TableCell className="font-medium">{row.counterpart?.companyName ?? "—"}</TableCell>
|
||||||
@@ -95,7 +137,38 @@ function ApprovedRow({ row }: { row: ConnectionWithCounterpart }) {
|
|||||||
<TableCell className="text-muted-foreground">
|
<TableCell className="text-muted-foreground">
|
||||||
{row.approvedAt ? dateFormatter.format(new Date(row.approvedAt)) : "—"}
|
{row.approvedAt ? dateFormatter.format(new Date(row.approvedAt)) : "—"}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
<TableCell className="text-muted-foreground text-xs">
|
||||||
|
{pricing.length === 0 ? (
|
||||||
|
<span>Katalog fiyatı</span>
|
||||||
|
) : (
|
||||||
|
<ul className="space-y-0.5">
|
||||||
|
{pricing.slice(0, 3).map((p) => (
|
||||||
|
<li key={p.$id}>
|
||||||
|
<span className="text-foreground">
|
||||||
|
{TYPE_LABELS[p.prostheticType] ?? p.prostheticType}
|
||||||
|
</span>
|
||||||
|
{": "}
|
||||||
|
{p.customUnitPrice !== undefined && p.customUnitPrice !== null
|
||||||
|
? `${p.customUnitPrice} ${p.currency || defaultCurrency}`
|
||||||
|
: p.discountPercent
|
||||||
|
? `%${p.discountPercent} indirim`
|
||||||
|
: "—"}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
{pricing.length > 3 && <li>+ {pricing.length - 3} kural</li>}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</TableCell>
|
||||||
<TableCell className="text-right">
|
<TableCell className="text-right">
|
||||||
|
<div className="flex justify-end gap-2">
|
||||||
|
{isLab && (
|
||||||
|
<ClinicPricingDialog
|
||||||
|
clinicTenantId={counterpartId}
|
||||||
|
clinicName={row.counterpart?.companyName ?? "Klinik"}
|
||||||
|
rows={pricing}
|
||||||
|
defaultCurrency={defaultCurrency}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<Dialog open={open} onOpenChange={setOpen}>
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
<DialogTrigger asChild>
|
<DialogTrigger asChild>
|
||||||
<Button size="sm" variant="outline">
|
<Button size="sm" variant="outline">
|
||||||
@@ -129,6 +202,7 @@ function ApprovedRow({ row }: { row: ConnectionWithCounterpart }) {
|
|||||||
</DialogFooter>
|
</DialogFooter>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
|
</div>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
|
import { listClinicPricing } from "@/lib/appwrite/clinic-pricing-queries";
|
||||||
import {
|
import {
|
||||||
listApprovedConnections,
|
listApprovedConnections,
|
||||||
listPendingInbound,
|
listPendingInbound,
|
||||||
listPendingOutbound,
|
listPendingOutbound,
|
||||||
} from "@/lib/appwrite/connection-queries";
|
} from "@/lib/appwrite/connection-queries";
|
||||||
|
import type { ClinicPricing } from "@/lib/appwrite/schema";
|
||||||
import { requireTenant } from "@/lib/appwrite/tenant-guard";
|
import { requireTenant } from "@/lib/appwrite/tenant-guard";
|
||||||
import { ConnectionCodeCard } from "./components/connection-code-card";
|
import { ConnectionCodeCard } from "./components/connection-code-card";
|
||||||
import { ConnectionRequestForm } from "./components/connection-request-form";
|
import { ConnectionRequestForm } from "./components/connection-request-form";
|
||||||
@@ -35,6 +37,35 @@ export default async function ConnectionsPage() {
|
|||||||
listPendingOutbound(ctx.tenantId, ctx.user.id),
|
listPendingOutbound(ctx.tenantId, ctx.user.id),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Lab side: load pricing rules per approved clinic so the dialog can
|
||||||
|
// surface existing rules. Clinic side leaves this empty — it's display-only
|
||||||
|
// for them (see ConnectionsTable).
|
||||||
|
const pricingByCounterpart = new Map<string, ClinicPricing[]>();
|
||||||
|
if (isLab) {
|
||||||
|
const pricingLists = await Promise.all(
|
||||||
|
approved.map((c) =>
|
||||||
|
listClinicPricing(ctx.tenantId, c.clinicTenantId).then(
|
||||||
|
(rows) => [c.clinicTenantId, rows] as const,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
for (const [id, rows] of pricingLists) pricingByCounterpart.set(id, rows);
|
||||||
|
} else {
|
||||||
|
// Clinic side: only its own pricing rules from each lab, read-only
|
||||||
|
const pricingLists = await Promise.all(
|
||||||
|
approved.map((c) =>
|
||||||
|
listClinicPricing(c.labTenantId, ctx.tenantId).then(
|
||||||
|
(rows) => [c.labTenantId, rows] as const,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
for (const [id, rows] of pricingLists) pricingByCounterpart.set(id, rows);
|
||||||
|
}
|
||||||
|
const pricingObject: Record<string, ClinicPricing[]> = Object.fromEntries(
|
||||||
|
pricingByCounterpart,
|
||||||
|
);
|
||||||
|
const defaultCurrency = ctx.settings?.defaultCurrency ?? "TRY";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 space-y-6 px-6">
|
<div className="flex-1 space-y-6 px-6">
|
||||||
<div className="flex flex-col gap-1">
|
<div className="flex flex-col gap-1">
|
||||||
@@ -90,10 +121,18 @@ export default async function ConnectionsPage() {
|
|||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle>Bağlantılarım</CardTitle>
|
<CardTitle>Bağlantılarım</CardTitle>
|
||||||
<CardDescription>Onaylanmış aktif bağlantılar.</CardDescription>
|
<CardDescription>
|
||||||
|
Onaylanmış aktif bağlantılar.
|
||||||
|
{isLab && " Lab tarafı her klinik için özel fiyat/indirim tanımlayabilir."}
|
||||||
|
</CardDescription>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
<ConnectionsTable rows={approved} />
|
<ConnectionsTable
|
||||||
|
rows={approved}
|
||||||
|
selfKind={ctx.kind}
|
||||||
|
pricingByCounterpart={pricingObject}
|
||||||
|
defaultCurrency={defaultCurrency}
|
||||||
|
/>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -133,11 +133,21 @@ export default async function JobDetailPage({
|
|||||||
<Info label="Fiyat">
|
<Info label="Fiyat">
|
||||||
{typeof job.price === "number"
|
{typeof job.price === "number"
|
||||||
? formatMoney(job.price, job.currency || "TRY")
|
? formatMoney(job.price, job.currency || "TRY")
|
||||||
: "—"}
|
: <span className="text-muted-foreground">Lab tarafından belirlenecek</span>}
|
||||||
</Info>
|
</Info>
|
||||||
<Info label="Mevcut Aşama">
|
<Info label="Mevcut Aşama">
|
||||||
{job.currentStep ? JOB_STEP_LABELS[job.currentStep] : "—"}
|
{job.currentStep ? JOB_STEP_LABELS[job.currentStep] : "—"}
|
||||||
</Info>
|
</Info>
|
||||||
|
<div className="md:col-span-2">
|
||||||
|
<p className="text-muted-foreground mb-1 text-xs font-medium uppercase tracking-wide">
|
||||||
|
Dişler ({job.teeth?.length ?? job.memberCount})
|
||||||
|
</p>
|
||||||
|
<p className="font-mono text-sm">
|
||||||
|
{job.teeth && job.teeth.length > 0
|
||||||
|
? job.teeth.join(", ")
|
||||||
|
: `${job.memberCount} üye (diş listesi yok)`}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
<div className="md:col-span-2">
|
<div className="md:col-span-2">
|
||||||
<p className="text-muted-foreground mb-1 text-xs font-medium uppercase tracking-wide">
|
<p className="text-muted-foreground mb-1 text-xs font-medium uppercase tracking-wide">
|
||||||
Açıklama
|
Açıklama
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
|
import { TeethChart } from "@/components/teeth-chart";
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
import { createJobAction } from "@/lib/appwrite/job-actions";
|
import { createJobAction } from "@/lib/appwrite/job-actions";
|
||||||
import {
|
import {
|
||||||
@@ -41,7 +42,7 @@ type PatientOption = { id: string; code: string; label: string };
|
|||||||
export function NewJobForm({
|
export function NewJobForm({
|
||||||
labs,
|
labs,
|
||||||
patients,
|
patients,
|
||||||
defaultCurrency,
|
defaultCurrency: _defaultCurrency,
|
||||||
}: {
|
}: {
|
||||||
labs: JobCounterpart[];
|
labs: JobCounterpart[];
|
||||||
patients: PatientOption[];
|
patients: PatientOption[];
|
||||||
@@ -52,6 +53,7 @@ export function NewJobForm({
|
|||||||
const [patientId, setPatientId] = useState<string>(
|
const [patientId, setPatientId] = useState<string>(
|
||||||
patients.length > 0 ? patients[0].id : NONE_PATIENT,
|
patients.length > 0 ? patients[0].id : NONE_PATIENT,
|
||||||
);
|
);
|
||||||
|
const [teeth, setTeeth] = useState<string[]>([]);
|
||||||
|
|
||||||
const patientById = useMemo(
|
const patientById = useMemo(
|
||||||
() => new Map(patients.map((p) => [p.id, p])),
|
() => new Map(patients.map((p) => [p.id, p])),
|
||||||
@@ -152,22 +154,6 @@ export function NewJobForm({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid gap-2">
|
|
||||||
<Label htmlFor="memberCount">Üye Sayısı *</Label>
|
|
||||||
<Input
|
|
||||||
id="memberCount"
|
|
||||||
name="memberCount"
|
|
||||||
type="number"
|
|
||||||
min="1"
|
|
||||||
max="32"
|
|
||||||
required
|
|
||||||
defaultValue={1}
|
|
||||||
/>
|
|
||||||
{state.fieldErrors?.memberCount && (
|
|
||||||
<p className="text-destructive text-xs">{state.fieldErrors.memberCount}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
<Label htmlFor="prostheticType">Protez Türü *</Label>
|
<Label htmlFor="prostheticType">Protez Türü *</Label>
|
||||||
<Select name="prostheticType" required>
|
<Select name="prostheticType" required>
|
||||||
@@ -197,28 +183,15 @@ export function NewJobForm({
|
|||||||
<Input id="dueDate" name="dueDate" type="date" />
|
<Input id="dueDate" name="dueDate" type="date" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-[1fr_100px] gap-2">
|
<div className="grid gap-2 md:col-span-2">
|
||||||
<div className="grid gap-2">
|
<Label>Diş Seçimi * <span className="text-muted-foreground text-xs">(en az 1 diş)</span></Label>
|
||||||
<Label htmlFor="price">Fiyat</Label>
|
<TeethChart value={teeth} onChange={setTeeth} />
|
||||||
<Input
|
{state.fieldErrors?.teeth && (
|
||||||
id="price"
|
<p className="text-destructive text-xs">{state.fieldErrors.teeth}</p>
|
||||||
name="price"
|
)}
|
||||||
type="number"
|
<p className="text-muted-foreground text-xs">
|
||||||
step="0.01"
|
Fiyat laboratuvarın katalog ve klinik indirimine göre otomatik hesaplanır — siz girmiyorsunuz.
|
||||||
min="0"
|
</p>
|
||||||
placeholder="0.00"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="grid gap-2">
|
|
||||||
<Label htmlFor="currency">Para</Label>
|
|
||||||
<Input
|
|
||||||
id="currency"
|
|
||||||
name="currency"
|
|
||||||
defaultValue={defaultCurrency}
|
|
||||||
maxLength={8}
|
|
||||||
style={{ textTransform: "uppercase" }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid gap-2 md:col-span-2">
|
<div className="grid gap-2 md:col-span-2">
|
||||||
@@ -234,7 +207,7 @@ export function NewJobForm({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex justify-end">
|
<div className="flex justify-end">
|
||||||
<Button type="submit" disabled={pending || labs.length === 0}>
|
<Button type="submit" disabled={pending || labs.length === 0 || teeth.length === 0}>
|
||||||
{pending ? (
|
{pending ? (
|
||||||
<>
|
<>
|
||||||
<Loader2 className="size-4 animate-spin" />
|
<Loader2 className="size-4 animate-spin" />
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import * as React from "react";
|
||||||
|
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
// FDI Two-Digit Notation, permanent dentition (32 teeth).
|
||||||
|
// Quadrants:
|
||||||
|
// Upper Right (1): 18 17 16 15 14 13 12 11
|
||||||
|
// Upper Left (2): 21 22 23 24 25 26 27 28
|
||||||
|
// Lower Left (3): 31 32 33 34 35 36 37 38
|
||||||
|
// Lower Right (4): 48 47 46 45 44 43 42 41
|
||||||
|
const UPPER_RIGHT = ["18", "17", "16", "15", "14", "13", "12", "11"];
|
||||||
|
const UPPER_LEFT = ["21", "22", "23", "24", "25", "26", "27", "28"];
|
||||||
|
const LOWER_LEFT = ["31", "32", "33", "34", "35", "36", "37", "38"];
|
||||||
|
const LOWER_RIGHT = ["48", "47", "46", "45", "44", "43", "42", "41"];
|
||||||
|
|
||||||
|
export function TeethChart({
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
name = "teeth",
|
||||||
|
disabled = false,
|
||||||
|
}: {
|
||||||
|
value: string[];
|
||||||
|
onChange: (next: string[]) => void;
|
||||||
|
name?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
}) {
|
||||||
|
const selected = React.useMemo(() => new Set(value), [value]);
|
||||||
|
|
||||||
|
const toggle = (tooth: string) => {
|
||||||
|
if (disabled) return;
|
||||||
|
const next = new Set(selected);
|
||||||
|
if (next.has(tooth)) next.delete(tooth);
|
||||||
|
else next.add(tooth);
|
||||||
|
// Preserve canonical order for serialisation.
|
||||||
|
onChange(
|
||||||
|
[...UPPER_RIGHT, ...UPPER_LEFT, ...LOWER_RIGHT, ...LOWER_LEFT].filter((t) => next.has(t)),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="bg-muted/30 rounded-md border p-4">
|
||||||
|
{/* Hidden form fields — submitted as repeated name="teeth" entries */}
|
||||||
|
{value.map((t) => (
|
||||||
|
<input key={t} type="hidden" name={name} value={t} />
|
||||||
|
))}
|
||||||
|
|
||||||
|
<p className="text-muted-foreground mb-3 flex items-center justify-between text-xs">
|
||||||
|
<span>Sağ ←</span>
|
||||||
|
<span className="font-medium uppercase tracking-wide">Üst Çene</span>
|
||||||
|
<span>→ Sol</span>
|
||||||
|
</p>
|
||||||
|
<div className="grid grid-cols-[repeat(16,minmax(0,1fr))] gap-1.5">
|
||||||
|
{UPPER_RIGHT.map((t) => (
|
||||||
|
<ToothButton
|
||||||
|
key={t}
|
||||||
|
tooth={t}
|
||||||
|
selected={selected.has(t)}
|
||||||
|
onClick={() => toggle(t)}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
{UPPER_LEFT.map((t) => (
|
||||||
|
<ToothButton
|
||||||
|
key={t}
|
||||||
|
tooth={t}
|
||||||
|
selected={selected.has(t)}
|
||||||
|
onClick={() => toggle(t)}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-border my-3 h-px" aria-hidden />
|
||||||
|
|
||||||
|
<div className="grid grid-cols-[repeat(16,minmax(0,1fr))] gap-1.5">
|
||||||
|
{LOWER_RIGHT.map((t) => (
|
||||||
|
<ToothButton
|
||||||
|
key={t}
|
||||||
|
tooth={t}
|
||||||
|
selected={selected.has(t)}
|
||||||
|
onClick={() => toggle(t)}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
{LOWER_LEFT.map((t) => (
|
||||||
|
<ToothButton
|
||||||
|
key={t}
|
||||||
|
tooth={t}
|
||||||
|
selected={selected.has(t)}
|
||||||
|
onClick={() => toggle(t)}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<p className="text-muted-foreground mt-3 flex items-center justify-between text-xs">
|
||||||
|
<span>Sağ ←</span>
|
||||||
|
<span className="font-medium uppercase tracking-wide">Alt Çene</span>
|
||||||
|
<span>→ Sol</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div className="text-muted-foreground mt-4 flex flex-wrap items-baseline justify-between gap-2 text-xs">
|
||||||
|
<span>FDI iki haneli numaralama · {value.length} diş seçili</span>
|
||||||
|
{value.length > 0 && !disabled && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => onChange([])}
|
||||||
|
className="hover:text-foreground underline-offset-4 hover:underline"
|
||||||
|
>
|
||||||
|
Temizle
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function ToothButton({
|
||||||
|
tooth,
|
||||||
|
selected,
|
||||||
|
onClick,
|
||||||
|
disabled,
|
||||||
|
}: {
|
||||||
|
tooth: string;
|
||||||
|
selected: boolean;
|
||||||
|
onClick: () => void;
|
||||||
|
disabled: boolean;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onClick}
|
||||||
|
disabled={disabled}
|
||||||
|
aria-pressed={selected}
|
||||||
|
aria-label={`Diş ${tooth}`}
|
||||||
|
className={cn(
|
||||||
|
"flex aspect-square items-center justify-center rounded-md border text-[10px] font-medium tabular-nums transition-colors",
|
||||||
|
selected
|
||||||
|
? "border-primary bg-primary text-primary-foreground"
|
||||||
|
: "border-input bg-background hover:bg-accent hover:text-accent-foreground",
|
||||||
|
disabled && "cursor-not-allowed opacity-60",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{tooth}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,200 @@
|
|||||||
|
"use server";
|
||||||
|
|
||||||
|
import { revalidatePath } from "next/cache";
|
||||||
|
import { AppwriteException, ID, Permission, Query, Role } from "node-appwrite";
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { logAudit } from "./audit";
|
||||||
|
import {
|
||||||
|
DATABASE_ID,
|
||||||
|
TABLES,
|
||||||
|
type ClinicPricing,
|
||||||
|
type Connection,
|
||||||
|
} from "./schema";
|
||||||
|
import { createAdminClient } from "./server";
|
||||||
|
import {
|
||||||
|
requireRole,
|
||||||
|
requireTenant,
|
||||||
|
requireTenantKind,
|
||||||
|
} from "./tenant-guard";
|
||||||
|
import type {
|
||||||
|
ClinicPricingActionState,
|
||||||
|
ClinicPricingFormState,
|
||||||
|
} from "./clinic-pricing-types";
|
||||||
|
import { clinicPricingSchema } from "@/lib/validation/clinic-pricing";
|
||||||
|
|
||||||
|
function appwriteError(e: unknown, fallback = "Beklenmeyen bir hata oluştu."): string {
|
||||||
|
if (e instanceof AppwriteException) return e.message || fallback;
|
||||||
|
return process.env.NODE_ENV !== "production" && e instanceof Error
|
||||||
|
? `${fallback} (${e.message})`
|
||||||
|
: fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
function flattenErrors(err: z.ZodError): Record<string, string> {
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
for (const issue of err.issues) {
|
||||||
|
const key = issue.path.join(".");
|
||||||
|
if (key && !out[key]) out[key] = issue.message;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pricingPermissions(labTenantId: string, clinicTenantId: string): string[] {
|
||||||
|
return [
|
||||||
|
Permission.read(Role.team(labTenantId)),
|
||||||
|
Permission.read(Role.team(clinicTenantId)),
|
||||||
|
Permission.update(Role.team(labTenantId, "owner")),
|
||||||
|
Permission.update(Role.team(labTenantId, "admin")),
|
||||||
|
Permission.delete(Role.team(labTenantId, "owner")),
|
||||||
|
Permission.delete(Role.team(labTenantId, "admin")),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickFields(formData: FormData) {
|
||||||
|
return {
|
||||||
|
clinicTenantId: String(formData.get("clinicTenantId") ?? "").trim(),
|
||||||
|
prostheticType: String(formData.get("prostheticType") ?? "").trim(),
|
||||||
|
customUnitPrice: String(formData.get("customUnitPrice") ?? "").trim(),
|
||||||
|
discountPercent: String(formData.get("discountPercent") ?? "").trim(),
|
||||||
|
currency: String(formData.get("currency") ?? "").trim(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function setClinicPricingAction(
|
||||||
|
_prev: ClinicPricingFormState,
|
||||||
|
formData: FormData,
|
||||||
|
): Promise<ClinicPricingFormState> {
|
||||||
|
let ctx;
|
||||||
|
try {
|
||||||
|
ctx = await requireTenant();
|
||||||
|
requireRole(ctx, ["owner", "admin"]);
|
||||||
|
requireTenantKind(ctx, ["lab"]);
|
||||||
|
} catch {
|
||||||
|
return { ok: false, error: "Fiyatlandırma yalnızca laboratuvar hesapları için." };
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsed = clinicPricingSchema.safeParse(pickFields(formData));
|
||||||
|
if (!parsed.success) {
|
||||||
|
return { ok: false, error: "Form geçersiz.", fieldErrors: flattenErrors(parsed.error) };
|
||||||
|
}
|
||||||
|
|
||||||
|
const { tablesDB } = createAdminClient();
|
||||||
|
|
||||||
|
// Verify the lab actually has an approved connection with this clinic
|
||||||
|
const connRes = await tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.connections,
|
||||||
|
queries: [
|
||||||
|
Query.equal("labTenantId", ctx.tenantId),
|
||||||
|
Query.equal("clinicTenantId", parsed.data.clinicTenantId),
|
||||||
|
Query.equal("status", "approved"),
|
||||||
|
Query.limit(1),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
if (!(connRes.rows[0] as unknown as Connection | undefined)) {
|
||||||
|
return {
|
||||||
|
ok: false,
|
||||||
|
error: "Onaylı bir bağlantınız yok.",
|
||||||
|
fieldErrors: { clinicTenantId: "Bağlantı yok." },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const existing = await tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.clinicPricing,
|
||||||
|
queries: [
|
||||||
|
Query.equal("labTenantId", ctx.tenantId),
|
||||||
|
Query.equal("clinicTenantId", parsed.data.clinicTenantId),
|
||||||
|
Query.equal("prostheticType", parsed.data.prostheticType),
|
||||||
|
Query.limit(1),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const row = existing.rows[0] as unknown as ClinicPricing | undefined;
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
labTenantId: ctx.tenantId,
|
||||||
|
clinicTenantId: parsed.data.clinicTenantId,
|
||||||
|
prostheticType: parsed.data.prostheticType,
|
||||||
|
customUnitPrice: parsed.data.customUnitPrice,
|
||||||
|
discountPercent: parsed.data.discountPercent,
|
||||||
|
currency: parsed.data.currency,
|
||||||
|
createdBy: ctx.user.id,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (row) {
|
||||||
|
await tablesDB.updateRow(DATABASE_ID, TABLES.clinicPricing, row.$id, payload);
|
||||||
|
await logAudit({
|
||||||
|
tenantId: ctx.tenantId,
|
||||||
|
userId: ctx.user.id,
|
||||||
|
action: "update",
|
||||||
|
entityType: "clinic_pricing",
|
||||||
|
entityId: row.$id,
|
||||||
|
changes: payload,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
const created = await tablesDB.createRow(
|
||||||
|
DATABASE_ID,
|
||||||
|
TABLES.clinicPricing,
|
||||||
|
ID.unique(),
|
||||||
|
payload,
|
||||||
|
pricingPermissions(ctx.tenantId, parsed.data.clinicTenantId),
|
||||||
|
);
|
||||||
|
await logAudit({
|
||||||
|
tenantId: ctx.tenantId,
|
||||||
|
userId: ctx.user.id,
|
||||||
|
action: "create",
|
||||||
|
entityType: "clinic_pricing",
|
||||||
|
entityId: created.$id,
|
||||||
|
changes: payload,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
return { ok: false, error: appwriteError(e, "Fiyatlandırma kaydedilemedi.") };
|
||||||
|
}
|
||||||
|
|
||||||
|
revalidatePath("/connections");
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function clearClinicPricingAction(
|
||||||
|
_prev: ClinicPricingActionState,
|
||||||
|
formData: FormData,
|
||||||
|
): Promise<ClinicPricingActionState> {
|
||||||
|
const id = String(formData.get("id") ?? "").trim();
|
||||||
|
if (!id) return { ok: false, error: "Kayıt bulunamadı." };
|
||||||
|
|
||||||
|
let ctx;
|
||||||
|
try {
|
||||||
|
ctx = await requireTenant();
|
||||||
|
requireRole(ctx, ["owner", "admin"]);
|
||||||
|
requireTenantKind(ctx, ["lab"]);
|
||||||
|
} catch {
|
||||||
|
return { ok: false, error: "Yetkiniz yok." };
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { tablesDB } = createAdminClient();
|
||||||
|
const row = (await tablesDB.getRow(
|
||||||
|
DATABASE_ID,
|
||||||
|
TABLES.clinicPricing,
|
||||||
|
id,
|
||||||
|
)) as unknown as ClinicPricing;
|
||||||
|
if (row.labTenantId !== ctx.tenantId) {
|
||||||
|
return { ok: false, error: "Yetkiniz yok." };
|
||||||
|
}
|
||||||
|
await tablesDB.deleteRow(DATABASE_ID, TABLES.clinicPricing, id);
|
||||||
|
await logAudit({
|
||||||
|
tenantId: ctx.tenantId,
|
||||||
|
userId: ctx.user.id,
|
||||||
|
action: "delete",
|
||||||
|
entityType: "clinic_pricing",
|
||||||
|
entityId: id,
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
return { ok: false, error: appwriteError(e, "Silinemedi.") };
|
||||||
|
}
|
||||||
|
|
||||||
|
revalidatePath("/connections");
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import "server-only";
|
||||||
|
|
||||||
|
import { Query } from "node-appwrite";
|
||||||
|
|
||||||
|
import { DATABASE_ID, TABLES, type ClinicPricing } from "./schema";
|
||||||
|
import { createAdminClient } from "./server";
|
||||||
|
import { toPlain } from "./serialize";
|
||||||
|
|
||||||
|
export async function listClinicPricing(
|
||||||
|
labTenantId: string,
|
||||||
|
clinicTenantId: string,
|
||||||
|
): Promise<ClinicPricing[]> {
|
||||||
|
const { tablesDB } = createAdminClient();
|
||||||
|
const result = await tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.clinicPricing,
|
||||||
|
queries: [
|
||||||
|
Query.equal("labTenantId", labTenantId),
|
||||||
|
Query.equal("clinicTenantId", clinicTenantId),
|
||||||
|
Query.limit(50),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
return toPlain(result.rows as unknown as ClinicPricing[]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listClinicPricingForClinic(
|
||||||
|
clinicTenantId: string,
|
||||||
|
labTenantId: string,
|
||||||
|
): Promise<ClinicPricing[]> {
|
||||||
|
return listClinicPricing(labTenantId, clinicTenantId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
export type ClinicPricingFormState = {
|
||||||
|
ok: boolean;
|
||||||
|
error?: string;
|
||||||
|
fieldErrors?: Record<string, string>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const initialClinicPricingFormState: ClinicPricingFormState = { ok: false };
|
||||||
|
|
||||||
|
export type ClinicPricingActionState = {
|
||||||
|
ok: boolean;
|
||||||
|
error?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const initialClinicPricingActionState: ClinicPricingActionState = { ok: false };
|
||||||
@@ -7,6 +7,7 @@ import { z } from "zod";
|
|||||||
import { logAudit } from "./audit";
|
import { logAudit } from "./audit";
|
||||||
import { syncFinanceForJob } from "./finance-sync";
|
import { syncFinanceForJob } from "./finance-sync";
|
||||||
import { createNotification } from "./notification-helpers";
|
import { createNotification } from "./notification-helpers";
|
||||||
|
import { calculateJobPrice } from "./pricing";
|
||||||
import {
|
import {
|
||||||
DATABASE_ID,
|
DATABASE_ID,
|
||||||
TABLES,
|
TABLES,
|
||||||
@@ -43,11 +44,9 @@ function pickFields(formData: FormData) {
|
|||||||
patientId: String(formData.get("patientId") ?? "").trim(),
|
patientId: String(formData.get("patientId") ?? "").trim(),
|
||||||
patientCode: String(formData.get("patientCode") ?? "").trim(),
|
patientCode: String(formData.get("patientCode") ?? "").trim(),
|
||||||
prostheticType: String(formData.get("prostheticType") ?? "").trim(),
|
prostheticType: String(formData.get("prostheticType") ?? "").trim(),
|
||||||
memberCount: String(formData.get("memberCount") ?? ""),
|
teeth: formData.getAll("teeth").map((v) => String(v).trim()).filter(Boolean),
|
||||||
color: String(formData.get("color") ?? "").trim(),
|
color: String(formData.get("color") ?? "").trim(),
|
||||||
description: String(formData.get("description") ?? "").trim(),
|
description: String(formData.get("description") ?? "").trim(),
|
||||||
price: String(formData.get("price") ?? "").trim(),
|
|
||||||
currency: String(formData.get("currency") ?? "").trim(),
|
|
||||||
dueDate: String(formData.get("dueDate") ?? "").trim(),
|
dueDate: String(formData.get("dueDate") ?? "").trim(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -139,6 +138,14 @@ export async function createJobAction(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Server-side price calculation — clinic never sets the price.
|
||||||
|
const quote = await calculateJobPrice({
|
||||||
|
labTenantId: parsed.data.labTenantId,
|
||||||
|
clinicTenantId: ctx.tenantId,
|
||||||
|
prostheticType: parsed.data.prostheticType,
|
||||||
|
teethCount: parsed.data.teeth.length,
|
||||||
|
});
|
||||||
|
|
||||||
const created = await tablesDB.createRow(
|
const created = await tablesDB.createRow(
|
||||||
DATABASE_ID,
|
DATABASE_ID,
|
||||||
TABLES.jobs,
|
TABLES.jobs,
|
||||||
@@ -150,11 +157,12 @@ export async function createJobAction(
|
|||||||
patientId: parsed.data.patientId,
|
patientId: parsed.data.patientId,
|
||||||
patientCode,
|
patientCode,
|
||||||
prostheticType: parsed.data.prostheticType,
|
prostheticType: parsed.data.prostheticType,
|
||||||
memberCount: parsed.data.memberCount,
|
memberCount: parsed.data.teeth.length,
|
||||||
|
teeth: parsed.data.teeth,
|
||||||
color: parsed.data.color,
|
color: parsed.data.color,
|
||||||
description: parsed.data.description,
|
description: parsed.data.description,
|
||||||
price: parsed.data.price,
|
price: quote?.amount,
|
||||||
currency: parsed.data.currency,
|
currency: quote?.currency,
|
||||||
dueDate: parsed.data.dueDate,
|
dueDate: parsed.data.dueDate,
|
||||||
status: "pending",
|
status: "pending",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
import "server-only";
|
||||||
|
|
||||||
|
import { Query } from "node-appwrite";
|
||||||
|
|
||||||
|
import {
|
||||||
|
DATABASE_ID,
|
||||||
|
TABLES,
|
||||||
|
type ClinicPricing,
|
||||||
|
type Prosthetic,
|
||||||
|
type ProstheticType,
|
||||||
|
type TenantSettings,
|
||||||
|
} from "./schema";
|
||||||
|
import { createAdminClient } from "./server";
|
||||||
|
|
||||||
|
export type JobPriceQuote = {
|
||||||
|
amount: number;
|
||||||
|
currency: string;
|
||||||
|
source: "clinic_custom" | "clinic_discount" | "catalog";
|
||||||
|
unitPrice: number;
|
||||||
|
discountPercent?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves the price a clinic should be charged for a job, given the lab's
|
||||||
|
* catalog and any clinic-specific pricing overrides.
|
||||||
|
*
|
||||||
|
* Cascade (first match wins):
|
||||||
|
* 1. clinic_pricing row for (lab, clinic, type) with customUnitPrice → use it
|
||||||
|
* 2. clinic_pricing row with discountPercent → catalog unitPrice × (1 - d/100)
|
||||||
|
* 3. lab's prosthetics catalog row matching `type` (not archived)
|
||||||
|
* 4. nothing → returns null, the lab will need to set the price manually
|
||||||
|
*
|
||||||
|
* Currency precedence: clinic override → catalog → lab tenant default → "TRY".
|
||||||
|
*
|
||||||
|
* @param teethCount multiplied with the resolved unit price
|
||||||
|
*/
|
||||||
|
export async function calculateJobPrice(opts: {
|
||||||
|
labTenantId: string;
|
||||||
|
clinicTenantId: string;
|
||||||
|
prostheticType: ProstheticType;
|
||||||
|
teethCount: number;
|
||||||
|
}): Promise<JobPriceQuote | null> {
|
||||||
|
if (opts.teethCount <= 0) return null;
|
||||||
|
const { tablesDB } = createAdminClient();
|
||||||
|
|
||||||
|
const [pricingRes, catalogRes, labSettingsRes] = await Promise.all([
|
||||||
|
tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.clinicPricing,
|
||||||
|
queries: [
|
||||||
|
Query.equal("labTenantId", opts.labTenantId),
|
||||||
|
Query.equal("clinicTenantId", opts.clinicTenantId),
|
||||||
|
Query.equal("prostheticType", opts.prostheticType),
|
||||||
|
Query.limit(1),
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.prosthetics,
|
||||||
|
queries: [
|
||||||
|
Query.equal("tenantId", opts.labTenantId),
|
||||||
|
Query.equal("type", opts.prostheticType),
|
||||||
|
Query.notEqual("archived", true),
|
||||||
|
Query.orderAsc("$createdAt"),
|
||||||
|
Query.limit(1),
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
tablesDB.listRows({
|
||||||
|
databaseId: DATABASE_ID,
|
||||||
|
tableId: TABLES.tenantSettings,
|
||||||
|
queries: [Query.equal("tenantId", opts.labTenantId), Query.limit(1)],
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const override = pricingRes.rows[0] as unknown as ClinicPricing | undefined;
|
||||||
|
const catalog = catalogRes.rows[0] as unknown as Prosthetic | undefined;
|
||||||
|
const labSettings = labSettingsRes.rows[0] as unknown as TenantSettings | undefined;
|
||||||
|
|
||||||
|
const fallbackCurrency = labSettings?.defaultCurrency ?? "TRY";
|
||||||
|
|
||||||
|
if (override?.customUnitPrice !== undefined && override.customUnitPrice !== null) {
|
||||||
|
const unit = override.customUnitPrice;
|
||||||
|
return {
|
||||||
|
amount: unit * opts.teethCount,
|
||||||
|
currency: override.currency || catalog?.currency || fallbackCurrency,
|
||||||
|
source: "clinic_custom",
|
||||||
|
unitPrice: unit,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!catalog) return null;
|
||||||
|
|
||||||
|
if (
|
||||||
|
override?.discountPercent !== undefined &&
|
||||||
|
override.discountPercent !== null &&
|
||||||
|
override.discountPercent > 0
|
||||||
|
) {
|
||||||
|
const discounted = catalog.unitPrice * (1 - override.discountPercent / 100);
|
||||||
|
return {
|
||||||
|
amount: discounted * opts.teethCount,
|
||||||
|
currency: override.currency || catalog.currency || fallbackCurrency,
|
||||||
|
source: "clinic_discount",
|
||||||
|
unitPrice: discounted,
|
||||||
|
discountPercent: override.discountPercent,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
amount: catalog.unitPrice * opts.teethCount,
|
||||||
|
currency: catalog.currency || fallbackCurrency,
|
||||||
|
source: "catalog",
|
||||||
|
unitPrice: catalog.unitPrice,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ export const TABLES = {
|
|||||||
profiles: "profiles",
|
profiles: "profiles",
|
||||||
connections: "connections",
|
connections: "connections",
|
||||||
patients: "patients",
|
patients: "patients",
|
||||||
|
clinicPricing: "clinic_pricing",
|
||||||
jobs: "jobs",
|
jobs: "jobs",
|
||||||
jobFiles: "job_files",
|
jobFiles: "job_files",
|
||||||
jobStatusHistory: "job_status_history",
|
jobStatusHistory: "job_status_history",
|
||||||
@@ -102,6 +103,7 @@ export interface Job extends Row {
|
|||||||
patientId?: string;
|
patientId?: string;
|
||||||
prostheticType: ProstheticType;
|
prostheticType: ProstheticType;
|
||||||
memberCount: number;
|
memberCount: number;
|
||||||
|
teeth?: string[];
|
||||||
color?: string;
|
color?: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
price?: number;
|
price?: number;
|
||||||
@@ -111,6 +113,16 @@ export interface Job extends Row {
|
|||||||
dueDate?: string;
|
dueDate?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ClinicPricing extends Row {
|
||||||
|
labTenantId: string;
|
||||||
|
clinicTenantId: string;
|
||||||
|
prostheticType: ProstheticType;
|
||||||
|
customUnitPrice?: number;
|
||||||
|
discountPercent?: number;
|
||||||
|
currency?: string;
|
||||||
|
createdBy: string;
|
||||||
|
}
|
||||||
|
|
||||||
export type JobFileKind = "scan" | "image" | "document";
|
export type JobFileKind = "scan" | "image" | "document";
|
||||||
|
|
||||||
export interface JobFile extends Row {
|
export interface JobFile extends Row {
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
const PROSTHETIC_TYPES = [
|
||||||
|
"metal_porselen",
|
||||||
|
"zirkonyum",
|
||||||
|
"implant_ustu_zirkonyum",
|
||||||
|
"gecici",
|
||||||
|
"e_max",
|
||||||
|
"diger",
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
function toOptionalNumber(v: unknown): number | undefined {
|
||||||
|
if (v === undefined || v === null || v === "") return undefined;
|
||||||
|
const n = typeof v === "number" ? v : Number(String(v).replace(",", "."));
|
||||||
|
return Number.isFinite(n) ? n : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const clinicPricingSchema = z
|
||||||
|
.object({
|
||||||
|
clinicTenantId: z.string().min(1, "Klinik seçin."),
|
||||||
|
prostheticType: z.enum(PROSTHETIC_TYPES, { message: "Protez türü seçin." }),
|
||||||
|
customUnitPrice: z
|
||||||
|
.union([z.string(), z.number(), z.literal("")])
|
||||||
|
.optional()
|
||||||
|
.transform(toOptionalNumber),
|
||||||
|
discountPercent: z
|
||||||
|
.union([z.string(), z.number(), z.literal("")])
|
||||||
|
.optional()
|
||||||
|
.transform(toOptionalNumber),
|
||||||
|
currency: z
|
||||||
|
.string()
|
||||||
|
.trim()
|
||||||
|
.max(8)
|
||||||
|
.optional()
|
||||||
|
.transform((v) => (v ? v.toUpperCase() : undefined)),
|
||||||
|
})
|
||||||
|
.superRefine((data, ctx) => {
|
||||||
|
if (
|
||||||
|
data.customUnitPrice === undefined &&
|
||||||
|
data.discountPercent === undefined
|
||||||
|
) {
|
||||||
|
ctx.addIssue({
|
||||||
|
code: "custom",
|
||||||
|
path: ["customUnitPrice"],
|
||||||
|
message: "Özel fiyat veya indirim oranı girin.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (data.discountPercent !== undefined) {
|
||||||
|
if (data.discountPercent < 0 || data.discountPercent > 100) {
|
||||||
|
ctx.addIssue({
|
||||||
|
code: "custom",
|
||||||
|
path: ["discountPercent"],
|
||||||
|
message: "İndirim 0-100 arası olmalı.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (data.customUnitPrice !== undefined && data.customUnitPrice < 0) {
|
||||||
|
ctx.addIssue({
|
||||||
|
code: "custom",
|
||||||
|
path: ["customUnitPrice"],
|
||||||
|
message: "Negatif fiyat olamaz.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export type ClinicPricingInput = z.infer<typeof clinicPricingSchema>;
|
||||||
@@ -9,6 +9,8 @@ const PROSTHETIC_TYPES = [
|
|||||||
"diger",
|
"diger",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
|
const FDI_TOOTH = /^(1[1-8]|2[1-8]|3[1-8]|4[1-8])$/;
|
||||||
|
|
||||||
export const createJobSchema = z.object({
|
export const createJobSchema = z.object({
|
||||||
labTenantId: z.string().min(1, "Laboratuvar seçin."),
|
labTenantId: z.string().min(1, "Laboratuvar seçin."),
|
||||||
patientId: z
|
patientId: z
|
||||||
@@ -18,14 +20,10 @@ export const createJobSchema = z.object({
|
|||||||
.transform((v) => (v ? v : undefined)),
|
.transform((v) => (v ? v : undefined)),
|
||||||
patientCode: z.string().trim().min(1, "Hasta kodu zorunlu.").max(50),
|
patientCode: z.string().trim().min(1, "Hasta kodu zorunlu.").max(50),
|
||||||
prostheticType: z.enum(PROSTHETIC_TYPES, { message: "Protez türü seçin." }),
|
prostheticType: z.enum(PROSTHETIC_TYPES, { message: "Protez türü seçin." }),
|
||||||
memberCount: z
|
teeth: z
|
||||||
.union([z.string(), z.number()])
|
.array(z.string().regex(FDI_TOOTH, "Geçersiz diş numarası"))
|
||||||
.transform((v) => {
|
.min(1, "En az 1 diş seçin.")
|
||||||
if (typeof v === "number") return v;
|
.max(32, "En fazla 32 diş seçilebilir."),
|
||||||
const n = parseInt(v, 10);
|
|
||||||
return Number.isFinite(n) ? n : NaN;
|
|
||||||
})
|
|
||||||
.pipe(z.number().int().min(1, "En az 1 üye.").max(32, "En fazla 32 üye.")),
|
|
||||||
color: z
|
color: z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
@@ -38,20 +36,6 @@ export const createJobSchema = z.object({
|
|||||||
.max(2000)
|
.max(2000)
|
||||||
.optional()
|
.optional()
|
||||||
.transform((v) => (v ? v : undefined)),
|
.transform((v) => (v ? v : undefined)),
|
||||||
price: z
|
|
||||||
.union([z.string(), z.number()])
|
|
||||||
.optional()
|
|
||||||
.transform((v) => {
|
|
||||||
if (v === undefined || v === "") return undefined;
|
|
||||||
const n = typeof v === "number" ? v : Number(String(v).replace(",", "."));
|
|
||||||
return Number.isFinite(n) ? n : undefined;
|
|
||||||
}),
|
|
||||||
currency: z
|
|
||||||
.string()
|
|
||||||
.trim()
|
|
||||||
.max(8)
|
|
||||||
.optional()
|
|
||||||
.transform((v) => (v ? v.toUpperCase() : "TRY")),
|
|
||||||
dueDate: z
|
dueDate: z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
|
|||||||
Reference in New Issue
Block a user