diff --git a/src/food-market.web/src/pages/ProductEditPage.tsx b/src/food-market.web/src/pages/ProductEditPage.tsx index bc4f4e8..17630a1 100644 --- a/src/food-market.web/src/pages/ProductEditPage.tsx +++ b/src/food-market.web/src/pages/ProductEditPage.tsx @@ -273,14 +273,8 @@ export function ProductEditPage() { -
+
- - setForm({ ...form, minStock: e.target.value })} /> - - - setForm({ ...form, maxStock: e.target.value })} /> - setForm({ ...form, purchasePrice: e.target.value })} /> @@ -293,6 +287,17 @@ export function ProductEditPage() {
+ + + + setForm({ ...form, minStock: e.target.value })} placeholder="—" /> + + + setForm({ ...form, maxStock: e.target.value })} placeholder="—" /> + + + +
Добавить} @@ -396,3 +401,20 @@ function Grid({ cols, children }: { cols: 2 | 3 | 4; children: ReactNode }) { const cls = cols === 2 ? 'grid-cols-1 md:grid-cols-2' : cols === 3 ? 'grid-cols-1 md:grid-cols-3' : 'grid-cols-2 md:grid-cols-4' return
{children}
} + +function AdvancedSection({ children }: { children: ReactNode }) { + const [open, setOpen] = useState(false) + return ( +
+ + {open &&
{children}
} +
+ ) +} diff --git a/src/food-market.web/src/pages/ProductsPage.tsx b/src/food-market.web/src/pages/ProductsPage.tsx index b9aea62..683e826 100644 --- a/src/food-market.web/src/pages/ProductsPage.tsx +++ b/src/food-market.web/src/pages/ProductsPage.tsx @@ -168,14 +168,7 @@ export function ProductsPage() { )}, { header: 'Группа', width: '200px', cell: (r) => r.productGroupName ?? '—' }, { header: 'Ед.', width: '70px', cell: (r) => r.unitName }, - { header: 'НДС', width: '80px', className: 'text-right', cell: (r) => `${r.vat}%` }, - { header: 'Тип', width: '140px', cell: (r) => ( -
- {r.isService && Услуга} - {r.isWeighed && Весовой} - {r.isMarked && Маркир.} -
- )}, + { header: 'НДС', width: '80px', className: 'text-right', cell: (r) => r.vatEnabled ? `${r.vat}%` : '—' }, { header: 'Штрихкодов', width: '120px', className: 'text-right', cell: (r) => r.barcodes.length }, { header: 'Активен', width: '100px', cell: (r) => r.isActive ? '✓' : '—' }, ]}