Merge pull request #1241 from Tria-plc/freight/nati-2

Freight/nati 2

apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx

@@ -17,6 +17,7 @@ import {
   Text,
 } from "@mantine/core";
 import {
+  AlertTriangle,
   ArrowLeft,
   ArrowRight,
   Banknote,
@@ -638,8 +639,9 @@ export default function CustomerDetailPage() {
   const hasPoaDetails = poaFields.some((f) => f.value?.trim());
   // Shared with the portal (buildCompanyIdentityState) — same derivation, so
   // this page can never disagree with the rule the API actually enforces.
-  const ownerIdentity = company?.identity?.owner;
-  const poaIdentity = company?.identity?.poa;
+  const identityState = company?.identity;
+  const ownerIdentity = identityState?.owner;
+  const poaIdentity = identityState?.poa;
   const hasEtradeRecord = Boolean(company?.licenceNumber?.trim());
   // A freight forwarder acts on other companies' behalf, so its PoA — details
   // and DARS delegation paper both — is mandatory rather than optional.
@@ -647,7 +649,7 @@ export default function CustomerDetailPage() {
     (p) => p.type === "freight_forwarder",
   );
   const delegationMissing =
-    (hasPoaDetails || poaMandatory) && poaLive.length === 0;
+    company?.identity?.poaDeclared === "yes" && poaLive.length === 0;
 
   if (isLoading) {
     return (
@@ -820,6 +822,16 @@ export default function CustomerDetailPage() {
                         : undefined
                     }
                   />
+                  {/* Why this company's registration was typed rather than
+                      fetched, and why it carries no business licence. */}
+                  <InfoField
+                    label="Registration"
+                    value={
+                      company.cooperative
+                        ? "Co-operative union / farm (no trade licence)"
+                        : "eTrade trade licence"
+                    }
+                  />
                   <InfoField label="Address" value={company.address} />
                   <InfoField label="Website" value={company.website} />
                   <InfoField label="Email" value={company.email} />
@@ -834,18 +846,9 @@ export default function CustomerDetailPage() {
                     value={company.contactPersonPhone}
                   />
                   <Box />
-                  <InfoField
-                    label="General manager"
-                    value={company.generalManagerName}
-                  />
-                  <InfoField
-                    label="GM email"
-                    value={company.generalManagerEmail}
-                  />
-                  <InfoField
-                    label="GM phone"
-                    value={company.generalManagerPhone}
-                  />
+                  <InfoField label="Owner" value={company.ownerName} />
+                  <InfoField label="Owner email" value={company.ownerEmail} />
+                  <InfoField label="Owner phone" value={company.ownerPhone} />
                 </SimpleGrid>
               </Stack>
             </Card>
@@ -912,6 +915,11 @@ export default function CustomerDetailPage() {
                   <Text fw={600} c="edr-text">
                     Owner identity
                   </Text>
+                  {identityState?.subject === "owner" && (
+                    <Badge size="sm" color="blue" variant="light">
+                      Verifies for this company
+                    </Badge>
+                  )}
                   {ownerIdentity?.verified ? (
                     <Badge size="sm" color="edr-green" variant="light">
                       Fayda verified
@@ -922,6 +930,41 @@ export default function CustomerDetailPage() {
                     </Badge>
                   )}
                 </Group>
+
+                {/* THE check: is the owner the company put forward the person
+                    the eTrade licence actually names? Advisory — eTrade and
+                    Fayda transliterate Amharic names differently, so this is a
+                    prompt to look, not a verdict. */}
+                {identityState?.ownerMatchesEtrade === false ? (
+                  <Alert
+                    color="amber"
+                    variant="light"
+                    icon={<AlertTriangle size={16} />}
+                    title="Does not match the eTrade licence"
+                  >
+                    The licence names{" "}
+                    <strong>{identityState.etradeManagerName}</strong>, but this
+                    company recorded <strong>{company.ownerName}</strong>.
+                  </Alert>
+                ) : identityState?.ownerMatchesEtrade === true ? (
+                  <Badge
+                    size="sm"
+                    color="edr-green"
+                    variant="light"
+                    style={{ alignSelf: "flex-start" }}
+                  >
+                    Matches the eTrade licence
+                  </Badge>
+                ) : company.cooperative ? (
+                  <Text size="xs" c="dimmed">
+                    A co-operative union or farm holds no trade licence, so
+                    there is no eTrade record to check the owner against.
+                  </Text>
+                ) : (
+                  <Text size="xs" c="dimmed">
+                    No eTrade manager name on file to compare against.
+                  </Text>
+                )}
                 {ownerIdentity?.verified ? (
                   <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="lg">
                     <InfoField label="Name" value={ownerIdentity.name} />

apps/edr-freight-web/backoffice/src/pages/settings/InvoiceStampSettingsPage.tsx

@@ -0,0 +1,88 @@
+import { useEffect, useState } from "react";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/shared/common/ui/card";
+import { Button } from "@/shared/common/ui/button";
+import { Save, Trash2 } from "lucide-react";
+
+import { StampUpload } from "@/components/contracts/StampUpload";
+import {
+  useClearStamp,
+  useSetStamp,
+  useStampSettingsQuery,
+} from "@/hooks/useStampSettings";
+
+/**
+ * The one company stamp/seal stamped onto every generated invoice/receipt
+ * PDF (InvoiceDocumentService). Single global image — no per-employee choice.
+ */
+export default function InvoiceStampSettingsPage() {
+  const { data, isLoading } = useStampSettingsQuery();
+  const setStamp = useSetStamp();
+  const clearStamp = useClearStamp();
+  const [draft, setDraft] = useState<string | null>(null);
+
+  useEffect(() => {
+    setDraft(null);
+  }, [data?.stampImageUrl]);
+
+  const value = draft !== null ? draft : (data?.stampImageUrl ?? null);
+  const dirty = draft !== null && draft !== data?.stampImageUrl;
+
+  const handleSave = async () => {
+    if (!draft) return;
+    await setStamp.mutateAsync(draft);
+  };
+
+  const handleClear = async () => {
+    if (!data?.stampImageUrl) return;
+    await clearStamp.mutateAsync();
+  };
+
+  return (
+    <div className="p-4 w-full max-w-screen-sm mx-auto">
+      <Card className="shadow-lg border-gray-200 dark:border-gray-700">
+        <CardHeader>
+          <CardTitle>Invoice stamp</CardTitle>
+          <CardDescription>
+            Stamped onto every generated invoice and receipt PDF. Replacing it
+            here changes it everywhere at once — there is no per-invoice or
+            per-user choice.
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          <StampUpload
+            value={isLoading ? null : value}
+            onChange={setDraft}
+            label="Company stamp"
+            description="Shown on every invoice/receipt PDF in place of the plain seal."
+          />
+
+          <div className="flex items-center gap-2">
+            <Button
+              onClick={handleSave}
+              disabled={!dirty || setStamp.isPending}
+            >
+              <Save className="mr-2 h-4 w-4" />
+              Save
+            </Button>
+            {data?.stampImageUrl && !dirty && (
+              <Button
+                variant="outline"
+                onClick={handleClear}
+                disabled={clearStamp.isPending}
+              >
+                <Trash2 className="mr-2 h-4 w-4" />
+                Remove
+              </Button>
+            )}
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}