Merged in CR/Pricelist (pull request #96)

CR/Pricelist

9 files changed, 128 insertions, 98 deletions

diff --git a/src/core/components/elements/Product/cartProductsList.jsx b/src/core/components/elements/Product/cartProductsList.jsx
index 5887b425..32df992b 100644
--- a/src/core/components/elements/Product/cartProductsList.jsx
+++ b/src/core/components/elements/Product/cartProductsList.jsx
@@ -160,7 +160,7 @@ const CardProdcuctsList = ({
                 </td>
                 <td className='relative'>
                   <ComponentCanBuy canBuy={product.canBuy} />
-                  {product?.hasFlashsale ? (
+                  {product?.hasFlashsale && product?.price?.discountPercentage > 0 ? (
                     <>
                       <div className='flex gap-x-1 items-center justify-center mt-3'>
                         <div className='text-gray_r-11 line-through text-caption-1'>
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 4c8c3ae9..47e98c1a 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -49,7 +49,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
       isFlashsale: variant.isFlashsale
     }))
     const lowest = prices.reduce((lowest, price) => {
-      return price.priceDiscount < lowest.priceDiscount ? price : lowest
+      return price.price < lowest.price ? price : lowest
     }, prices[0])
     return lowest
   }, [product])
@@ -203,7 +203,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
               <div className='relative mb-2'>
-                {product?.flashSale?.remainingTime > 0 && (
+                {product?.flashSale?.remainingTime > 0 && lowestPrice?.price.discountPercentage > 0 && (
                   <div className={`absolute bottom-0 w-full`}>
                     <div className='absolute bottom-0 w-full h-full'>
                       <ImageNext
@@ -216,7 +216,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                       <div className='flex gap-x-2 items-center p-2'>
                         <div className='bg-yellow-400 rounded-full p-1 h-9 w-20 flex items-center justify-center '>
                           <span className='text-lg font-bold'>
-                            {product.lowestPrice.discountPercentage}%
+                            {Math.floor(product.lowestPrice.discountPercentage)}%
                           </span>
                         </div>
                         <div
@@ -441,7 +441,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
               </div>
             )} */}
 
-            {lowestPrice?.isFlashsale ? (
+            {lowestPrice?.isFlashsale && lowestPrice?.price.discountPercentage > 0 ? (
               <>
                 <div className='flex gap-x-1 items-center mt-2'>
                   <div className='badge-solid-red text-caption-1'>
@@ -580,7 +580,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                         <ColumnsSLA variant={variant} product={product} />
                       </LazyLoadComponent>
                       <td>
-                        {variant.isFlashsale ? (
+                        {variant.isFlashsale && variant?.price?.discountPercentage > 0 ? (
                           <>
                             <div className='flex items-center gap-x-1 justify-center'>
                               <div className='badge-solid-red text-caption-1'>
@@ -610,7 +610,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                                 <div className=' text-caption-1 text-gray_r-11 mb-1'>
                                   Inc. PPN:{' '}
                                   {currencyFormat(
-                                    variant?.price?.priceDiscount * process.env.NEXT_PUBLIC_PPN
+                                    variant?.price?.price * process.env.NEXT_PUBLIC_PPN
                                   )}
                                 </div>
                               </>
diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index 51739bc9..ef61bafd 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -140,7 +140,7 @@ const ProductDesktopVariant = ({ product, wishlist, toggleWishlist, isVariant })
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
               <Image
-                src={product.parent.image}
+                src={product.image}
                 alt={product.name}
                 className='h-[430px] object-contain object-center w-full border border-gray_r-4'
               />
@@ -270,32 +270,32 @@ const ProductDesktopVariant = ({ product, wishlist, toggleWishlist, isVariant })
             </div> */}
           </div>
           <div className='w-[25%]'>
-            {product?.flashSale?.remainingTime > 0 ? (
+            {product?.isFlashsale > 0 && product?.price?.discountPercentage > 0? (
               <>
                 <div className='flex gap-x-1 items-center mt-2'>
                   <div className='badge-solid-red text-caption-1'>
-                    {lowestPrice?.discountPercentage}%
+                    {product?.price?.discountPercentage}%
                   </div>
                   <div className='text-gray_r-9 line-through text-caption-1'>
-                    {currencyFormat(lowestPrice?.price)}
+                    {currencyFormat(product?.price?.price)}
                   </div>
                   <div className='text-danger-500 font-semibold text-xl'>
-                    {currencyFormat(lowestPrice?.priceDiscount)}
+                    {currencyFormat(product?.price?.priceDiscount)}
                   </div>
                 </div>
                 <div className='text-gray_r-9 text-base font-normal mt-1'>
                   Termasuk PPN:{' '}
-                  {currencyFormat(lowestPrice?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                  {currencyFormat(product?.price?.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
               <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
-                {lowestPrice?.price > 0 ? (
+                {product?.price?.price > 0 ? (
                   <>
-                    {currencyFormat(lowestPrice?.price)}
+                    {currencyFormat(product?.price?.price)}
                     <div className='text-gray_r-9 text-base font-normal mt-1'>
                       Termasuk PPN:{' '}
-                      {currencyFormat(lowestPrice?.price * process.env.NEXT_PUBLIC_PPN)}
+                      {currencyFormat(product?.price?.price * process.env.NEXT_PUBLIC_PPN)}
                     </div>
                   </>
                 ) : (
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 20a1d3f4..ffa75f72 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -161,7 +161,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
   return (
     <MobileView>
       <div className='relative'>
-        {product?.flashSale?.remainingTime > 0 && (
+        {product?.flashSale?.remainingTime > 0 && activeVariant?.price.discountPercentage > 0 && (
           <div className={`absolute bottom-0 w-full`}>
             <div className='absolute bottom-0 w-full'>
               <ImageNext
@@ -174,7 +174,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
               <div className='flex gap-x-2 items-center p-2'>
                 <div className='bg-yellow-400 rounded-full p-1 h-9 w-20 flex items-center justify-center '>
                   <span className='text-lg font-bold'>
-                    {product.lowestPrice.discountPercentage}%
+                    {Math.floor(product.lowestPrice.discountPercentage)}%
                   </span>
                 </div>
                 <div
@@ -232,7 +232,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
             <div className='text-gray_r-12/80 text-caption-2 mt-2 mb-1'>Harga mulai dari: </div>
           )}
 
-        {activeVariant.isFlashsale ? (
+        {activeVariant.isFlashsale && activeVariant?.price?.discountPercentage > 0 ? (
           <>
             <div className='flex gap-x-1 items-center'>
               <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
diff --git a/src/lib/product/components/Product/ProductMobileVariant.jsx b/src/lib/product/components/Product/ProductMobileVariant.jsx
index 8cdb631f..9888e482 100644
--- a/src/lib/product/components/Product/ProductMobileVariant.jsx
+++ b/src/lib/product/components/Product/ProductMobileVariant.jsx
@@ -29,7 +29,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
   const [isLoadingSLA, setIsLoadingSLA] = useState(true)
 
   const getLowestPrice = () => {
-    const lowest = product.price
+    const lowest = product.lowestPrice
     return lowest
   }
 
@@ -40,7 +40,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     price: getLowestPrice(),
     stock: product.stockTotal,
     weight: product.weight,
-    isFlashSale: product.isFlashsale
+    isFlashSale: product.isFlashSale
   })
 
   useEffect(() => {
@@ -50,9 +50,9 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
         code: product.code,
         name: product.name,
         price: product.price,
-        stock: product.stock,
+        stock: product.stockTotal,
         weight: product.weight,
-        isFlashSale: product.isFlashsale
+        isFlashSale: product.isFlashSale
       })
     }
   }, [selectedVariant, product])
@@ -115,7 +115,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
   return (
     <MobileView>
       <Image
-        src={product.parent.image}
+        src={product.image}
         alt={product.name}
         className='h-72 object-contain object-center w-full border-b border-gray_r-4'
       />
@@ -141,7 +141,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
         </div>
         <h1 className='leading-6 font-medium mb-3'>{activeVariant?.name}</h1>
 
-        {activeVariant.isFlashsale ? (
+        {activeVariant.isFlashSale && activeVariant?.price?.discountPercentage > 0 ? (
           <>
             <div className='flex gap-x-1 items-center'>
               <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
@@ -159,12 +159,12 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
           </>
         ) : (
           <h3 className='text-danger-500 font-semibold mt-1'>
-            {activeVariant?.price?.priceDiscount > 0 ? (
+            {activeVariant?.price?.price > 0 ? (
               <>
-                {currencyFormat(activeVariant?.price?.priceDiscount)}
+                {currencyFormat(activeVariant?.price?.price)}
                 <div className='text-gray_r-9 text-base font-normal mt-1'>
                   Termasuk PPN:{' '}
-                  {currencyFormat(activeVariant?.price.priceDiscount * process.env.NEXT_PUBLIC_PPN)}
+                  {currencyFormat(activeVariant?.price.price * process.env.NEXT_PUBLIC_PPN)}
                 </div>
               </>
             ) : (
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 6a5e29ab..91c1f40e 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -89,17 +89,16 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           >
             {product?.name}
           </Link>
-          {product?.flashSale?.id > 0 ? (
+          {product?.flashSale?.id > 0 && product?.lowestPrice.discountPercentage > 0 ? (
             <>
-              {product?.lowestPrice.discountPercentage > 0 && (
-                <div className='flex gap-x-1 mb-1 items-center'>
-                  <div className='text-gray_r-11 line-through text-[11px] sm:text-caption-2'>
-                    {currencyFormat(product.lowestPrice.price)}
-                  </div>
-                  <div className='badge-solid-red'>{product?.lowestPrice.discountPercentage}%</div>
+              <div className='flex gap-x-1 mb-1 items-center'>
+                <div className='text-gray_r-11 line-through text-[11px] sm:text-caption-2'>
+                  {currencyFormat(product.lowestPrice.price)}
                 </div>
-              )}
-
+                <div className='badge-solid-red'>
+                  {Math.floor(product?.lowestPrice.discountPercentage)}%
+                </div>
+              </div>
               <div className='text-danger-500 font-semibold mb-2'>
                 {product?.lowestPrice.priceDiscount > 0 ? (
                   currencyFormat(product?.lowestPrice.priceDiscount)
@@ -114,7 +113,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
                   <div className='text-gray_r-9 text-[10px] font-normal mt-2'>
-                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN )}
+                    Inc. PPN:{' '}
+                    {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (
@@ -192,11 +192,13 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           >
             {product?.name}
           </Link>
-          {product?.flashSale?.id > 0 ? (
+          {product?.flashSale?.id > 0 && product?.lowestPrice?.discountPercentage > 0 ? (
             <>
               {product?.lowestPrice.discountPercentage > 0 && (
                 <div className='flex gap-x-1 mb-1 items-center'>
-                  <div className='badge-solid-red'>{product?.lowestPrice?.discountPercentage}%</div>
+                  <div className='badge-solid-red'>
+                    {Math.floor(product?.lowestPrice?.discountPercentage)}%
+                  </div>
                   <div className='text-gray_r-11 line-through text-caption-2'>
                     {currencyFormat(product?.lowestPrice?.price)}
                   </div>
@@ -217,7 +219,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                 <>
                   {currencyFormat(product?.lowestPrice.price)}
                   <div className='text-gray_r-9 text-[11px] sm:text-caption-2 font-normal mt-2'>
-                    Inc. PPN: {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
+                    Inc. PPN:{' '}
+                    {currencyFormat(product.lowestPrice.price * process.env.NEXT_PUBLIC_PPN)}
                   </div>
                 </>
               ) : (
diff --git a/src/pages/api/shop/variant-detail.js b/src/pages/api/shop/variant-detail.js
new file mode 100644
index 00000000..fadbe000
--- /dev/null
+++ b/src/pages/api/shop/variant-detail.js
@@ -0,0 +1,18 @@
+import { productMappingSolr, variantsMappingSolr } from '@/utils/solrMapping'
+import axios from 'axios'
+
+export default async function handler(req, res) {
+  try {
+    let productVariants = await axios(
+      process.env.SOLR_HOST +
+        `/solr/variants/select?q=id:${req.query.id}&q.op=OR&indent=true`
+    )
+    let auth  = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth
+    let result = variantsMappingSolr('',productVariants.data.response.docs, auth || false)
+    
+    res.status(200).json(result)
+  } catch (error) {
+    console.error('Error fetching data from Solr:', error)
+    res.status(500).json({ error: 'Internal Server Error' })
+  }
+}
\ No newline at end of file
diff --git a/src/pages/shop/product/variant/[slug].jsx b/src/pages/shop/product/variant/[slug].jsx
index ba2a79d5..d0790249 100644
--- a/src/pages/shop/product/variant/[slug].jsx
+++ b/src/pages/shop/product/variant/[slug].jsx
@@ -6,6 +6,7 @@ import dynamic from 'next/dynamic'
 import { useRouter } from 'next/router'
 import cookie from 'cookie'
 import variantApi from '@/lib/product/api/variantApi'
+import axios from 'axios'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const Product = dynamic(() => import('@/lib/product/components/Product/Product'))
@@ -15,9 +16,16 @@ export async function getServerSideProps(context) {
   const cookies = context.req.headers.cookie
   const cookieObj = cookies ? cookie.parse(cookies) : {}
   const auth = cookieObj.auth ? JSON.parse(cookieObj.auth) : {}
+  const tier = auth.pricelist ? auth.pricelist : false
   const authToken = auth?.token || ''
 
-  let product = await variantApi({ id: getIdFromSlug(slug), headers: { Token: authToken } })
+
+  let response = await axios(
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=` + getIdFromSlug(slug) +'&auth=' + tier
+  )
+  let product = response.data
+  // let product = await variantApi({ id: getIdFromSlug(slug), headers: { Token: authToken } })
+  
   if (product?.length == 1) {
     product = product[0]
    /* const regexHtmlTags = /(<([^>]+)>)/gi
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index c8bd54ea..61816cf8 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,17 +1,17 @@
 export const productMappingSolr = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0
-    let priceDiscount = product.price_discount_f || 0
-    let discountPercentage = product.discount_f || 0
+    let priceDiscount = 0
+    let discountPercentage = 0
 
-    if (pricelist) {
-      price = product?.[`price_${pricelist}_f`] || 0
+    if (pricelist && product?.[`price_${pricelist}_f`] < price) {
+        price = product?.[`price_${pricelist}_f`] || 0
     }
 
-    if (product?.flashsale_id_i > 0) {
-      price = product?.flashsale_base_price_f || 0
-      priceDiscount = product?.flashsale_price_f || 0
-      discountPercentage = product?.flashsale_discount_f || 0
+    if (product?.flashsale_id_i > 0 ) {
+        price = product?.flashsale_base_price_f || 0
+        priceDiscount = product?.flashsale_price_f || 0
+        discountPercentage = product?.flashsale_discount_f || 0
     }
 
     let productMapped = {
@@ -55,59 +55,60 @@ export const productMappingSolr = (products, pricelist) => {
 }
 
 export const variantsMappingSolr = (parent, products, pricelist) => {
-    return products.map((product) => {
-      let price = product.price_tier1_v2_f || 0
-      let priceDiscount = product.price_discount_f || 0
-      let discountPercentage = product.discount_f || 0
-  
-      if (pricelist) {
+  return products.map((product) => {
+    let price = product.price_tier1_v2_f || 0
+    let priceDiscount = 0
+    let discountPercentage = 0
+
+    if (pricelist) {
+      if (product?.[`price_${pricelist}_f`] < price) {
         price = product?.[`price_${pricelist}_f`] || 0
       }
-  
-      if (product?.flashsale_id_i > 0) {
+    }
+
+    if (product?.flashsale_id_i > 0 && product?.flashsale_price_f < price) {
         price = product?.flashsale_base_price_f || 0
         priceDiscount = product?.flashsale_price_f || 0
         discountPercentage = product?.flashsale_discount_f || 0
+    }
+
+    let productMapped = {
+      attributes: product.attributes || [],
+      id: product.product_id_i || '',
+      image: product.image_s || '',
+      code: product.default_code_s || '',
+      isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
+      isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
+      name: product.display_name_s || '',
+      price: { price, priceDiscount, discountPercentage },
+      variantTotal: product.variant_total_i || 0,
+      stockTotal: product.stock_total_f || 0,
+      weight: product.weight_f || 0,
+      manufacture: {},
+      parent: {}
+    }
+
+    if (product.manufacture_id_i && product.manufacture_name_s) {
+      productMapped.manufacture = {
+        id: product.manufacture_id_i || '',
+        name: product.manufacture_name_s || ''
       }
-  
-      let productMapped = {
-        attributes: product.attributes || [],
-        id: product.product_id_i || '',
-        image: product.image_s || '',
-        code: product.default_code_s || '',
-        isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
-        isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
-        name: product.display_name_s || '',
-        price: { price, priceDiscount, discountPercentage },
-        variantTotal: product.variant_total_i || 0,
-        stockTotal: product.stock_total_f || 0,
-        weight: product.weight_f || 0,
-        manufacture: {},
-        parent: {}
-      }
-  
-      if (product.manufacture_id_i && product.manufacture_name_s) {
-        productMapped.manufacture = {
-          id: product.manufacture_id_i || '',
-          name: product.manufacture_name_s || ''
-        }
-      }
-      productMapped.parent = {
-        id: parent.product_id_i || '',
-        image: parent.image_s || '',
-        name: parent.name_s || ''
-      }
-      return productMapped
-    })
-  }
+    }
+    productMapped.parent = {
+      id: parent.product_id_i || '',
+      image: parent.image_s || '',
+      name: parent.name_s || ''
+    }
+    return productMapped
+  })
+}
 
 const flashsaleTime = (endDate) => {
-    const flashsaleEndDate = new Date(endDate)
-    const currentTime = new Date()
-  
-    const timeDifferenceInMillis = flashsaleEndDate - currentTime
-    const timeDifferenceInSeconds = timeDifferenceInMillis / 1000
-  
-    return { remainingTime: timeDifferenceInSeconds, isFlashSale: flashsaleEndDate > currentTime }
-  }
-  
+  const flashsaleEndDate = new Date(endDate)
+  const currentTime = new Date()
+
+  const timeDifferenceInMillis = flashsaleEndDate - currentTime
+  const timeDifferenceInSeconds = timeDifferenceInMillis / 1000
+
+  return { remainingTime: timeDifferenceInSeconds, isFlashSale: flashsaleEndDate > currentTime }
+}