diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/[locale]/cart/page.tsx b/app/[locale]/cart/page.tsx index a77a475..d34c184 100644 --- a/app/[locale]/cart/page.tsx +++ b/app/[locale]/cart/page.tsx @@ -151,7 +151,7 @@ export default function CartPage() { if (isLoading) { return ( -
+

{t("cart")}

diff --git a/app/[locale]/favorites/page.tsx b/app/[locale]/favorites/page.tsx index 25ad904..a1042e3 100644 --- a/app/[locale]/favorites/page.tsx +++ b/app/[locale]/favorites/page.tsx @@ -75,6 +75,9 @@ export default function FavoritesPage() { product.price_amount ? parseFloat(product.price_amount) : null } struct_price_text={formattedPrice} + oldPrice={ + product.old_price_amount ? parseFloat(product.old_price_amount) : null + } images={allImages} labels={[]} price_color="#0059ff" diff --git a/features/category/components/CategoryProductsGrid.tsx b/features/category/components/CategoryProductsGrid.tsx index 73fb043..c6e1812 100644 --- a/features/category/components/CategoryProductsGrid.tsx +++ b/features/category/components/CategoryProductsGrid.tsx @@ -59,6 +59,9 @@ export default function CategoryProductsGrid({ price={ product.price_amount ? parseFloat(product.price_amount) : null } + oldPrice={ + product.old_price_amount ? parseFloat(product.old_price_amount) : null + } struct_price_text={`${product.price_amount} TMT`} images={[product.media?.[0]?.images_400x400]} stock={product.stock} diff --git a/features/collections/components/CollectionProductsGrid.tsx b/features/collections/components/CollectionProductsGrid.tsx index 41b94b2..3d93da0 100644 --- a/features/collections/components/CollectionProductsGrid.tsx +++ b/features/collections/components/CollectionProductsGrid.tsx @@ -58,6 +58,9 @@ export default function CollectionProductsGrid({ price={ product.price_amount ? parseFloat(product.price_amount) : null } + oldPrice={ + product.old_price_amount ? parseFloat(product.old_price_amount) : null + } struct_price_text={`${product.price_amount} TMT`} images={[product.media?.[0]?.images_400x400]} stock={product.stock} diff --git a/features/home/components/CategoryGrid.tsx b/features/home/components/CategoryGrid.tsx index a5beae4..9a55209 100644 --- a/features/home/components/CategoryGrid.tsx +++ b/features/home/components/CategoryGrid.tsx @@ -87,7 +87,7 @@ export default function CategoryGrid({ />
-

+

{cat.name}

diff --git a/features/home/components/ProductCard.tsx b/features/home/components/ProductCard.tsx index e18c99a..2cafc18 100644 --- a/features/home/components/ProductCard.tsx +++ b/features/home/components/ProductCard.tsx @@ -42,6 +42,7 @@ type ProductCardProps = { id: number; name: string; price: number | null; + oldPrice: number | null; struct_price_text: string; discount?: number | null; discount_text?: string | null; @@ -58,6 +59,7 @@ export default function ProductCard({ id, name, price, + oldPrice, struct_price_text, images, labels = [], @@ -375,13 +377,18 @@ export default function ProductCard({ {/* Price */} -
+

{struct_price_text}

+ {oldPrice && ( + + {oldPrice} TMT + + )}
{/* Favorite Button */} diff --git a/features/home/components/ProductGrid.tsx b/features/home/components/ProductGrid.tsx index 17c0214..250d92d 100644 --- a/features/home/components/ProductGrid.tsx +++ b/features/home/components/ProductGrid.tsx @@ -89,6 +89,9 @@ export default function CollectionSection({ collection, locale }: Props) { product.price_amount ? parseFloat(product.price_amount) : null } struct_price_text={formattedPrice} + oldPrice={ + product.old_price_amount ? parseFloat(product.old_price_amount) : null + } images={allImages} labels={[]} price_color="#0059ff" diff --git a/features/products/components/RelatedProductsSection.tsx b/features/products/components/RelatedProductsSection.tsx index 489b154..f7c7818 100644 --- a/features/products/components/RelatedProductsSection.tsx +++ b/features/products/components/RelatedProductsSection.tsx @@ -55,6 +55,9 @@ export function RelatedProductsSection({ price={parseFloat(product.price_amount) || null} struct_price_text={ product.struct_price_text || `${product.price_amount} TMT` + } + oldPrice={ + product.old_price_amount ? parseFloat(product.old_price_amount) : null } discount={product.discount} discount_text={product.discount_text}