Merge branch 'master' of https://bitbucket.org/altafixco/next-indoteknik

2 files changed, 21 insertions, 5 deletions

diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 79e7bb45..2f0ac488 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -12,6 +12,7 @@ import useVariantPrice from '@/lib/variant/hooks/useVariantPrice'
 import useProductPrice from '../../hooks/useProductPrice'
 import PriceSkeleton from '@/core/components/elements/Skeleton/PriceSkeleton'
 import { useRouter } from 'next/router'
+import { createSlug } from '@/core/utils/slug'
 
 const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -38,7 +39,8 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
     if (!validQuantity(quantity)) return
     updateItemCart({
       productId: variantId,
-      quantity
+      quantity,
+      selected: true
     })
     toast.success('Berhasil menambahkan ke keranjang')
   }
@@ -92,7 +94,15 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
                 <div className='w-1/4 text-gray_r-12/70'>Manufacture</div>
                 <div className='w-3/4'>
                   {product.manufacture?.name ? (
-                    <Link href='/'>{product.manufacture?.name}</Link>
+                    <Link
+                      href={createSlug(
+                        '/shop/brands/',
+                        product.manufacture?.name,
+                        product.manufacture?.id
+                      )}
+                    >
+                      {product.manufacture?.name}
+                    </Link>
                   ) : (
                     <div>-</div>
                   )}
@@ -181,7 +191,7 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
                 {product.variants.map((variant) => (
                   <tr key={variant.id}>
                     <td>{variant.code}</td>
-                    <td>{variant.attributes.join(', ')}</td>
+                    <td>{variant.attributes.join(', ') || '-'}</td>
                     <td>
                       <VariantPrice id={variant.id} />
                     </td>
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 0df22026..e560639c 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -14,6 +14,7 @@ import { toast } from 'react-hot-toast'
 import useVariantPrice from '@/lib/variant/hooks/useVariantPrice'
 import PriceSkeleton from '@/core/components/elements/Skeleton/PriceSkeleton'
 import useProductPrice from '../../hooks/useProductPrice'
+import { createSlug } from '@/core/utils/slug'
 
 const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -79,7 +80,8 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
     if (!validAction()) return
     updateItemCart({
       productId: activeVariant.id,
-      quantity
+      quantity,
+      selected: true
     })
     toast.success('Berhasil menambahkan ke keranjang')
   }
@@ -106,7 +108,11 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
       <div className='p-4'>
         <div className='flex items-end mb-2'>
           {product.manufacture?.name ? (
-            <Link href='/'>{product.manufacture?.name}</Link>
+            <Link
+              href={createSlug('/shop/brands/', product.manufacture?.name, product.manufacture?.id)}
+            >
+              {product.manufacture?.name}
+            </Link>
           ) : (
             <div>-</div>
           )}