diff --git a/admin-spa/src/routes/Products/Edit.tsx b/admin-spa/src/routes/Products/Edit.tsx index ab9726f..b8386b1 100644 --- a/admin-spa/src/routes/Products/Edit.tsx +++ b/admin-spa/src/routes/Products/Edit.tsx @@ -39,8 +39,8 @@ export default function ProductEdit() { queryClient.invalidateQueries({ queryKey: ['products'] }); queryClient.invalidateQueries({ queryKey: ['products', id] }); - // Navigate back to product detail or list - navigate(`/products/${id}`); + // Navigate back to products list + navigate('/products'); }, onError: (error: any) => { toast.error(error.message || __('Failed to update product')); diff --git a/admin-spa/src/routes/Products/index.tsx b/admin-spa/src/routes/Products/index.tsx index ad53cc8..21d3ffb 100644 --- a/admin-spa/src/routes/Products/index.tsx +++ b/admin-spa/src/routes/Products/index.tsx @@ -28,6 +28,7 @@ import { SelectValue, } from "@/components/ui/select"; import { Link, useNavigate } from 'react-router-dom'; +import { formatMoney, getStoreCurrency } from '@/lib/currency'; import { Skeleton } from '@/components/ui/skeleton'; import { setQuery, getQuery } from '@/lib/query-params'; import { ProductCard } from './components/ProductCard'; @@ -386,7 +387,7 @@ export default function Products() { {product.price_html ? ( ) : product.regular_price ? ( - ${parseFloat(product.regular_price).toFixed(2)} + {formatMoney(product.regular_price)} ) : ( — )} diff --git a/admin-spa/src/routes/Products/partials/tabs/GeneralTab.tsx b/admin-spa/src/routes/Products/partials/tabs/GeneralTab.tsx index e9984b4..af5c584 100644 --- a/admin-spa/src/routes/Products/partials/tabs/GeneralTab.tsx +++ b/admin-spa/src/routes/Products/partials/tabs/GeneralTab.tsx @@ -8,6 +8,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { Separator } from '@/components/ui/separator'; import { DollarSign } from 'lucide-react'; +import { getStoreCurrency } from '@/lib/currency'; type GeneralTabProps = { name: string; @@ -63,6 +64,9 @@ export function GeneralTab({ salePrice && regularPrice && parseFloat(salePrice) < parseFloat(regularPrice) ? Math.round((1 - parseFloat(salePrice) / parseFloat(regularPrice)) * 100) : 0; + + const store = getStoreCurrency(); + return ( @@ -187,14 +191,16 @@ export function GeneralTab({ {__('Regular Price')} {type === 'simple' && '*'} - + + {store.symbol} + setRegularPrice(e.target.value)} - placeholder="0.00" + placeholder={store.decimals === 0 ? '0' : '0.00'} required={type === 'simple'} className="pl-10" /> @@ -209,14 +215,16 @@ export function GeneralTab({ {__('Sale Price')} - + + {store.symbol} + setSalePrice(e.target.value)} - placeholder="0.00" + placeholder={store.decimals === 0 ? '0' : '0.00'} className="pl-10" />