Merge prod_v5 (catalog v2.7, warehouse locking, per-project accept) into integration

Conflict in init_db.py resolved keeping the audit_log table ensure function (new-one) — prod_v5 predates it and its side was empty. Both sides' SQL lands: audit_log table plus the category-free materials model.
2026-09-19 18:36:29 +03:30
parent 08ec341c52 65758b5e78
commit b6cbcc30a5
26 changed files with 350 additions and 273 deletions
@@ -88,6 +88,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
  const [selectedProjects, setSelectedProjects] = useState<string[]>([]);
  const [notes, setNotes] = useState("");
  const [invoices, setInvoices] = useState<Attachment[]>([]);
+  const [proformas, setProformas] = useState<Attachment[]>([]);
  const [itemRows, setItemRows] = useState<EditItemRow[]>([]);
  const [tsCards, setTsCards] = useState<EditTsCard[]>([]);
  const [quoteDate, setQuoteDate] = useState<string | null>(null);
@@ -168,7 +169,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
          key: li.id,
          origLi: li,
          projects: li.projects && li.projects.length ? [...li.projects] : [],
-          cat: m.category || "",
+          cat: m.name || "", // نام خود متریال — نه دسته/برند
          brand: m.brand || "",
          specs: materialSpecs(m),
          qty: li.quantity,
@@ -197,7 +198,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
    setReady(true);
  }, [q, suppliers, materials]);

-  // بارگذاری فاکتورها
+  // بارگذاری فاکتورها و پیش‌فاکتورها
  useEffect(() => {
    if (!quoteId) return;
    let alive = true;
@@ -205,6 +206,10 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
      .list(quoteId, "invoice")
      .then((list) => alive && setInvoices(list))
      .catch(() => alive && setInvoices([]));
+    void api.files
+      .list(quoteId, "proforma")
+      .then((list) => alive && setProformas(list))
+      .catch(() => alive && setProformas([]));
    return () => {
      alive = false;
    };
@@ -314,7 +319,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {

      let material = materialsCopy.find(
        (m) =>
-          normalize(m.category) === normalize(cat) &&
+          normalize(m.name) === normalize(cat) &&
          normalize(m.brand) === normalize(brand) &&
          specsKey(m.specs) === specsKey(specs),
      );
@@ -460,6 +465,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
                  addSuffix="به عنوان تأمین‌کنندهٔ جدید"
                  placeholder="نام تأمین‌کننده"
                  onInputChange={(v) => setSupplierName(v)}
+                  openOnFocus={false}
                />
              </div>
            </div>
@@ -724,6 +730,23 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
            />
          </div>

+          {/* پیش‌فاکتورها — در تمامی مراحل چرخه عمر پیشنهاد قابل افزودن/ویرایش است */}
+          <div className="border-t border-line pt-3">
+            <div className="mb-1 text-[13px] font-bold">پیش‌فاکتورها (چند فایل):</div>
+            <FileList
+              files={proformas}
+              onChange={setProformas}
+              upload={(f) => api.files.upload(q.id, "proforma", f)}
+              onDelete={(a) =>
+                a.id &&
+                void api.files.remove(q.id, "proforma", a.id).catch((err) =>
+                  toast.error(err instanceof Error ? err.message : "حذف پیش‌فاکتور ناموفق بود"),
+                )
+              }
+              urlOf={(a) => (a.id ? api.files.downloadUrl(q.id, "proforma", a.id) : null)}
+            />
+          </div>
+
          {/* تاریخ‌ها و وضعیت */}
          <div className="border-t border-line pt-3">
            <div className="mb-2 text-[12px] font-bold text-muted">تاریخ‌ها و وضعیت:</div>
@@ -3,7 +3,6 @@ import { AlarmClock, ChevronDown, Pencil, TriangleAlert, Building2, Package, Cre
 import type { Quote, Store } from "../../lib/types";
 import {
  isExpired,
-  itemsSummary,
  materialById,
  materialLabel,
  projectCell,
@@ -44,7 +43,6 @@ export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit
  const pc = priceCell(total);
  const ts = termsheetSummary(store, q);
  const unitWarns = unitWarning(store, q);
-  const summary = itemsSummary(store, q);

  // ستون / دکمه پذیرش
  let acceptedCell: React.ReactNode;
@@ -142,12 +140,26 @@ export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit
          {sup.name.slice(0, 1)}
        </span>
        <div className="min-w-0 flex-1">
-          <Link
-            to={`/suppliers/${q.supplier_id}`}
-            className="block truncate text-xs font-bold text-ink no-underline hover:text-accent sm:text-[13.5px]"
-          >
-            {sup.name}
-          </Link>
+          <div className="flex min-w-0 items-center gap-1.5">
+            <Link
+              to={`/suppliers/${q.supplier_id}`}
+              className="min-w-0 flex-1 truncate text-xs font-bold text-ink no-underline hover:text-accent sm:text-[13.5px]"
+            >
+              {sup.name}
+            </Link>
+            {/* فاکتور رسمی / غیررسمی — از چک‌باکس «فاکتور رسمی» هنگام ثبت پیشنهاد */}
+            <span
+              className={cn(
+                "shrink-0 rounded px-1.5 py-px text-[9.5px] font-bold leading-4",
+                q.is_official
+                  ? "bg-green-bg text-green"
+                  : "bg-slate-bg text-muted",
+              )}
+              title={q.is_official ? "فاکتور رسمی" : "فاکتور غیررسمی"}
+            >
+              {q.is_official ? "رسمی" : "غیررسمی"}
+            </span>
+          </div>
          {sup.location && <div className="truncate text-[10px] text-muted sm:text-[11px]">{sup.location}</div>}
        </div>
        <div className="ms-auto flex shrink-0 items-center gap-1 sm:gap-1.5">
@@ -188,47 +200,22 @@ export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit
          </div>
        </InfoCell>

-        {/* ۲. اقلام — تمام‌عرض زیر پروژه با شکستن متن بدون سه‌نقطه */}
+        {/* ۲. اقلام — نمایش عمودی چندخطی */}
        <InfoCell label="اقلام" className="col-span-2 md:col-span-1">
-          {summary.count > 1 ? (
-            <div className="flex flex-col gap-1.5">
-              <span className="font-bold text-xs text-ink sm:text-sm">
-                {fmtNum(summary.count)} قلم کالا
-              </span>
-              <div className="flex flex-col gap-1.5 rounded-lg border border-line/60 bg-bg/50 p-2.5 text-[11px] leading-5 text-muted sm:text-[11.5px]">
-                {store.quotes
-                  .find((x) => x.id === q.id)
-                  ?.line_items?.filter((li) => !li.rejected)
-                  .slice(0, 3)
-                  .map((li) => {
-                    const m = materialById(store.materials, li.material_id);
-                    return (
-                      <div
-                        key={li.id}
-                        className="flex items-start justify-between gap-2 border-b border-line/30 pb-1.5 last:border-0 last:pb-0"
-                      >
-                        <span className="min-w-0 flex-1 font-medium text-ink leading-snug break-words">
-                          • {materialLabel(m)}
-                        </span>
-                        <span className="shrink-0 font-semibold tabular-nums text-ink text-[10.5px] pt-0.5">
-                          {fmtNum(li.quantity)}{" "}
-                          <span className="font-normal text-muted text-[9.5px]">{li.unit}</span>
-                        </span>
-                      </div>
-                    );
-                  })}
-                {(q.line_items?.length || 0) > 3 && (
-                  <span className="pt-0.5 text-[10px] text-muted">
-                    و {(q.line_items?.length || 0) - 3} قلم دیگر...
+          <div className="flex flex-col gap-1 text-xs font-medium leading-5 text-ink sm:text-[13px]">
+            {activeItems.length > 0 ? (
+              activeItems.map((li) => {
+                const m = materialById(store.materials, li.material_id);
+                return (
+                  <span key={li.id} className="break-words">
+                    {materialLabel(m)}
                  </span>
-                )}
-              </div>
-            </div>
-          ) : (
-            <div className="flex items-start gap-1.5 text-xs font-medium leading-5 text-ink sm:text-[13px]">
-              <span className="break-words">{summary.text}</span>
-            </div>
-          )}
+                );
+              })
+            ) : (
+              <span>—</span>
+            )}
+          </div>

          {unitWarns.map((w) => (
            <Link
@@ -243,32 +230,6 @@ export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit
          ))}
        </InfoCell>

-        <InfoCell label="پروژه">
-          <span className="inline-flex items-center gap-1 text-xs sm:text-[13px]">
-            <Building2 className="h-3.5 w-3.5 shrink-0 text-muted" />
-            <span className="truncate">
-              {(() => {
-                const activeItems = (q.line_items || []).filter((li) => !li.rejected);
-                if (q.status === "accepted" || q.status === "arrived") {
-                  // فقط پروژه‌ی هدف پذیرفته‌شده — همان منطق itemProjects در وضعیت accepted
-                  const targetProj = activeItems.find((li) => li.target_project)?.target_project;
-                  return targetProj?.name ?? projectCell(q);
-                }
-                // وضعیت offered: همه‌ی پروژه‌های کاندیدا از line_items (همان منطق itemProjects)
-                const names = new Set<string>();
-                activeItems.forEach((li) =>
-                  (li.projects || []).forEach((p) => {
-                    const name = typeof p === "string" ? p : p.name;
-                    if (name) names.add(name);
-                  })
-                );
-                if (names.size > 0) return [...names].join("، ");
-                return projectCell(q);
-              })()}
-            </span>
-          </span>
-        </InfoCell>
-
        <InfoCell label="مجموع مبلغ" className="col-span-1">
          {pc ? (
            <div>