{item.productName}
-{item.variantSize}
+{item.variantName}
{formatPrice(item.priceAtPurchase)}
diff --git a/apps/admin/src/pages/ProductEditPage.tsx b/apps/admin/src/pages/ProductEditPage.tsx index 06c0891..c1b1007 100644 --- a/apps/admin/src/pages/ProductEditPage.tsx +++ b/apps/admin/src/pages/ProductEditPage.tsx @@ -88,29 +88,37 @@ export default function ProductEditPage() { useEffect(() => { const fetchData = async () => { try { - const [prodRes, catRes] = await Promise.all([ - fetch(`${API_BASE}/products/${id}?lang=all`), - fetch(`${API_BASE}/categories`) - ]) - - if (!prodRes.ok) throw new Error('Product not found') - - const prodData: Product = await prodRes.json() + const catRes = await fetch(`${API_BASE}/categories`) const catData: Category[] = await catRes.json() - - setProduct(prodData) setCategories(catData) - setCategoryId(prodData.categoryId) - - const parseTranslatable = (val: any) => typeof val === 'object' && val !== null ? val : { th: val || '' } - setName(parseTranslatable(prodData.name)) - setDescription(parseTranslatable(prodData.description)) - setDetails(parseTranslatable(prodData.details)) - - const parseOptions = (val: any) => Array.isArray(val) ? val : [] - setOptions(parseOptions(prodData.options)) - setVariants(prodData.variants || []) - setImages(prodData.images || []) + + if (id) { + const prodRes = await fetch(`${API_BASE}/products/${id}?lang=all`) + if (!prodRes.ok) throw new Error('Product not found') + + const prodData: Product = await prodRes.json() + setProduct(prodData) + setCategoryId(prodData.categoryId) + + const parseTranslatable = (val: any) => typeof val === 'object' && val !== null ? val : { th: val || '' } + setName(parseTranslatable(prodData.name)) + setDescription(parseTranslatable(prodData.description)) + setDetails(parseTranslatable(prodData.details)) + + const parseOptions = (val: any) => Array.isArray(val) ? val : [] + setOptions(parseOptions(prodData.options)) + setVariants(prodData.variants || []) + setImages(prodData.images || []) + } else { + setProduct(null) + if (catData.length > 0) setCategoryId(catData[0].id) + setName({ th: '', en: '' }) + setDescription({ th: '', en: '' }) + setDetails({ th: '', en: '' }) + setOptions([]) + setVariants([]) + setImages([]) + } } catch (err: any) { setError(err.message) } finally { @@ -172,8 +180,12 @@ export default function ProductEditPage() { setSuccess(false) try { - const response = await fetch(`${API_BASE}/products/${id}`, { - method: 'PATCH', + const isNew = !id + const method = isNew ? 'POST' : 'PUT' + const url = isNew ? `${API_BASE}/products` : `${API_BASE}/products/${id}` + + const response = await fetch(url, { + method, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ categoryId, @@ -182,6 +194,7 @@ export default function ProductEditPage() { details, options, variants: variants.map(v => ({ + ...(v.id ? { id: v.id } : {}), option1: v.option1 || '', option2: v.option2 || '', option3: v.option3 || '', @@ -191,16 +204,21 @@ export default function ProductEditPage() { barcode: v.barcode || '' })), images: images.filter(img => img.url).map((img, idx) => ({ + ...(img.id ? { id: img.id } : {}), url: img.url, - order: img.order ?? idx + order: img.order ?? (typeof img.order === 'number' ? img.order : idx) })) }), }) - if (!response.ok) throw new Error('Failed to update product') + if (!response.ok) throw new Error(isNew ? 'Failed to create product' : 'Failed to update product') setSuccess(true) - setTimeout(() => setSuccess(false), 3000) + if (isNew) { + setTimeout(() => navigate('/products'), 1500) + } else { + setTimeout(() => setSuccess(false), 3000) + } } catch (err: any) { setError(err.message) } finally { diff --git a/apps/admin/src/pages/ProductsPage.tsx b/apps/admin/src/pages/ProductsPage.tsx index 50c28d7..b7652db 100644 --- a/apps/admin/src/pages/ProductsPage.tsx +++ b/apps/admin/src/pages/ProductsPage.tsx @@ -81,6 +81,7 @@ export default function ProductsPage() { headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ categoryId: selectedProduct.categoryId, + options: selectedProduct.options, variants: selectedProduct.variants.map(v => ({ option1: v.option1, option2: v.option2, option3: v.option3, sku: v.sku, barcode: v.barcode, stock: v.stock, price: v.price })), images: updatedImages }) @@ -145,6 +146,7 @@ export default function ProductsPage() { headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ categoryId: selectedProduct.categoryId, + options: selectedProduct.options, variants: selectedProduct.variants.map(v => ({ option1: v.option1, option2: v.option2, option3: v.option3, sku: v.sku, barcode: v.barcode, stock: v.stock, price: v.price })), images: updatedImages }) @@ -234,7 +236,10 @@ export default function ProductsPage() { {meta ? `Displaying ${products.length} of ${meta.total} products` : 'Loading products...'}