diff --git a/inventory/src/components/purchase-orders/PurchaseOrderAccordion.tsx b/inventory/src/components/purchase-orders/PurchaseOrderAccordion.tsx index 5db3c1c..e5ba4f3 100644 --- a/inventory/src/components/purchase-orders/PurchaseOrderAccordion.tsx +++ b/inventory/src/components/purchase-orders/PurchaseOrderAccordion.tsx @@ -115,13 +115,13 @@ export default function PurchaseOrderAccordion({ } return ( -
+
- SKU + Item Number Product - UPC + UPC Ordered Received Unit Cost @@ -151,9 +151,39 @@ export default function PurchaseOrderAccordion({ ) : ( items.map((item) => ( - {item.sku} - {item.product_name} - {item.upc} + + e.stopPropagation()} + > + {item.sku} + + + + e.stopPropagation()} + > + {item.product_name} + + + + e.stopPropagation()} + > + {item.upc} + + {item.ordered} diff --git a/inventory/src/components/purchase-orders/PurchaseOrdersTable.tsx b/inventory/src/components/purchase-orders/PurchaseOrdersTable.tsx index da11181..71aa8ba 100644 --- a/inventory/src/components/purchase-orders/PurchaseOrdersTable.tsx +++ b/inventory/src/components/purchase-orders/PurchaseOrdersTable.tsx @@ -69,7 +69,7 @@ export default function PurchaseOrdersTable({ return ( Received PO @@ -78,7 +78,7 @@ export default function PurchaseOrdersTable({ return ( PO @@ -87,7 +87,7 @@ export default function PurchaseOrdersTable({ return ( Receiving @@ -96,7 +96,7 @@ export default function PurchaseOrdersTable({ return ( {recordType || "Unknown"} @@ -108,7 +108,7 @@ export default function PurchaseOrdersTable({ if (recordType === "receiving_only") { return ( {getReceivingStatusLabel(status)} @@ -118,7 +118,7 @@ export default function PurchaseOrdersTable({ return ( {getPurchaseOrderStatusLabel(status)} @@ -342,7 +342,18 @@ export default function PurchaseOrdersTable({ {getRecordTypeIndicator(po.record_type)} - {po.id} + + + {po.id} + + {po.vendor_name} {getStatusBadge(po.status, po.record_type)} @@ -378,7 +389,7 @@ export default function PurchaseOrdersTable({ year: "numeric", } ) - : ""} + : "-"} {po.receiving_date @@ -390,18 +401,18 @@ export default function PurchaseOrdersTable({ year: "numeric", } ) - : ""} + : "-"} - {po.total_quantity.toLocaleString()} + {po.record_type === "receiving_only" ? "-" : po.total_quantity.toLocaleString()} - {po.total_received.toLocaleString()} + {po.record_type === "po_only" ? "-" : po.total_received.toLocaleString()} - - {po.fulfillment_rate === null - ? "N/A" - : formatPercent(po.fulfillment_rate)} + + {po.record_type === "po_with_receiving" + ? (po.fulfillment_rate === null ? "N/A" : formatPercent(po.fulfillment_rate)) + : "-"}