Replaces the free-text "Place of Delivery" with a dropdown sourced from a new admin-managed Delivery Locations list (each = a Company FK + free-text address). - schema + migration: new DeliveryLocation model (companyId, address, isActive). - permission: manage_delivery_locations granted to Manager + SuperUser + Admin (Manager-accessible, not admin-only, per the issue). - admin screen /admin/delivery-locations: table + Add/Edit dialogs + activate/deactivate + delete (mirrors /admin/sites); sidebar link under Administration for Manager/SuperUser/Admin. - PO forms (new / edit / manager-edit): shared <DeliveryLocationField> native select populated from active locations, formatted "Company — address". - PurchaseOrder.placeOfDelivery stays a free-text SNAPSHOT (no FK) — the dropdown only changes how the value is picked, so export/import/historical POs are unchanged, and an edit preserves a current value not in the list as a "(current)" option. Deleting a location is therefore always safe. - tests: delivery-location CRUD + permission guard (6). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
110 lines
4.8 KiB
TypeScript
110 lines
4.8 KiB
TypeScript
"use client";
|
|
|
|
import { useState } from "react";
|
|
import { useRouter } from "next/navigation";
|
|
import { AdminDialog } from "@/components/ui/admin-dialog";
|
|
import { createDeliveryLocation, updateDeliveryLocation } from "./actions";
|
|
|
|
const INPUT = "w-full rounded-lg border border-neutral-300 px-3 py-2 text-sm focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-500/20";
|
|
|
|
export type CompanyOption = { id: string; name: string };
|
|
export type DeliveryLocationRow = {
|
|
id: string;
|
|
companyId: string;
|
|
companyName: string;
|
|
address: string;
|
|
isActive: boolean;
|
|
};
|
|
|
|
function Fields({ companies, location }: { companies: CompanyOption[]; location?: DeliveryLocationRow }) {
|
|
return (
|
|
<div className="space-y-3">
|
|
<div>
|
|
<label className="block text-xs font-medium text-neutral-700 mb-1">Company *</label>
|
|
<select name="companyId" defaultValue={location?.companyId ?? ""} required className={INPUT}>
|
|
<option value="" disabled>Select a company…</option>
|
|
{companies.map((c) => (
|
|
<option key={c.id} value={c.id}>{c.name}</option>
|
|
))}
|
|
</select>
|
|
</div>
|
|
<div>
|
|
<label className="block text-xs font-medium text-neutral-700 mb-1">Delivery address *</label>
|
|
<textarea name="address" defaultValue={location?.address ?? ""} rows={3} required className={INPUT} placeholder="e.g. Reti Bundar, Near Konkan Bhavan, CBD Belapur, Navi Mumbai - 400614" />
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export function AddDeliveryLocationButton({ companies }: { companies: CompanyOption[] }) {
|
|
const router = useRouter();
|
|
const [open, setOpen] = useState(false);
|
|
const [pending, setPending] = useState(false);
|
|
const [error, setError] = useState("");
|
|
|
|
async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
|
|
e.preventDefault(); setPending(true); setError("");
|
|
const result = await createDeliveryLocation(new FormData(e.currentTarget));
|
|
if ("error" in result) { setError(result.error); setPending(false); }
|
|
else { setPending(false); setOpen(false); router.refresh(); }
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<button onClick={() => setOpen(true)} className="rounded-lg bg-primary-600 px-4 py-2 text-sm font-semibold text-white hover:bg-primary-700">
|
|
+ Add Delivery Location
|
|
</button>
|
|
<AdminDialog open={open} onClose={() => setOpen(false)} title="Add Delivery Location">
|
|
<form onSubmit={handleSubmit} className="space-y-4">
|
|
<Fields companies={companies} />
|
|
{error && <p className="text-sm text-danger-700 bg-danger-50 rounded px-3 py-2">{error}</p>}
|
|
<div className="flex gap-3 justify-end">
|
|
<button type="button" onClick={() => setOpen(false)} className="rounded-lg border border-neutral-300 px-4 py-2 text-sm font-medium text-neutral-700">Cancel</button>
|
|
<button type="submit" disabled={pending} className="rounded-lg bg-primary-600 px-4 py-2 text-sm font-semibold text-white disabled:opacity-60">{pending ? "Saving…" : "Create"}</button>
|
|
</div>
|
|
</form>
|
|
</AdminDialog>
|
|
</>
|
|
);
|
|
}
|
|
|
|
export function EditDeliveryLocationButton({
|
|
companies,
|
|
location,
|
|
open: controlledOpen,
|
|
onOpenChange,
|
|
}: {
|
|
companies: CompanyOption[];
|
|
location: DeliveryLocationRow;
|
|
open?: boolean;
|
|
onOpenChange?: (v: boolean) => void;
|
|
}) {
|
|
const router = useRouter();
|
|
const [internalOpen, setInternalOpen] = useState(false);
|
|
const [pending, setPending] = useState(false);
|
|
const [error, setError] = useState("");
|
|
|
|
const isControlled = controlledOpen !== undefined;
|
|
const open = isControlled ? controlledOpen : internalOpen;
|
|
const setOpen = isControlled ? (onOpenChange ?? (() => {})) : setInternalOpen;
|
|
|
|
async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
|
|
e.preventDefault(); setPending(true); setError("");
|
|
const result = await updateDeliveryLocation(location.id, new FormData(e.currentTarget));
|
|
if ("error" in result) { setError(result.error); setPending(false); }
|
|
else { setPending(false); setOpen(false); router.refresh(); }
|
|
}
|
|
|
|
return (
|
|
<AdminDialog open={open} onClose={() => setOpen(false)} title="Edit Delivery Location">
|
|
<form onSubmit={handleSubmit} className="space-y-4">
|
|
<Fields companies={companies} location={location} />
|
|
{error && <p className="text-sm text-danger-700 bg-danger-50 rounded px-3 py-2">{error}</p>}
|
|
<div className="flex justify-end gap-3">
|
|
<button type="button" onClick={() => setOpen(false)} className="rounded-lg border border-neutral-300 px-4 py-2 text-sm font-medium text-neutral-700">Cancel</button>
|
|
<button type="submit" disabled={pending} className="rounded-lg bg-primary-600 px-4 py-2 text-sm font-semibold text-white disabled:opacity-60">{pending ? "Saving…" : "Save"}</button>
|
|
</div>
|
|
</form>
|
|
</AdminDialog>
|
|
);
|
|
}
|