Merged in Feature/all-promotion (pull request #202)

Feature/all promotion

Approved-by: trisusilo

4 files changed, 49 insertions, 195 deletions

diff --git a/src/pages/my/recomendation/components/products-recomendatison.jsx b/src/pages/my/recomendation/components/products-recomendatison.jsx
index d39d2a99..7da2fab1 100644
--- a/src/pages/my/recomendation/components/products-recomendatison.jsx
+++ b/src/pages/my/recomendation/components/products-recomendatison.jsx
@@ -80,7 +80,7 @@ const ProductsRecomendation = ({ id }) => {
         }
       });
 
-      console.log('ini result', searchProduct.data.response);
+      // console.log('ini result', searchProduct.data.response);
     }
 
     return resultMapping;
@@ -112,7 +112,7 @@ const ProductsRecomendation = ({ id }) => {
       setIsLoading(false);
     } else {
       setIsLoading(false);
-      console.log('No excel data available');
+      // console.log('No excel data available');
     }
   };
 
@@ -129,7 +129,7 @@ const ProductsRecomendation = ({ id }) => {
       const jsonData = XLSX.utils.sheet_to_json(worksheet);
 
       setExcelData(jsonData);
-      console.log('ini json data', jsonData);
+      // console.log('ini json data', jsonData);
 
       setIsLoading(false);
     };
@@ -146,13 +146,13 @@ const ProductsRecomendation = ({ id }) => {
       products[foundIndex].result.code = variant?.code;
       products[foundIndex].result.name = variant?.name;
     } else {
-      console.log('Data not found.');
+      // console.log('Data not found.');
     }
     setIsOpen(false);
   };
 
   const handlingOtherRec = ({ product }) => {
-    console.log('ini product', product);
+    // console.log('ini product', product);
     const result = async () =>
       await searchRecomendation({ product, index: 0, operator: 'OR' });
 
diff --git a/src/pages/shop/promo/[slug].tsx b/src/pages/shop/promo/[slug].tsx
index bd69c071..aaee1249 100644
--- a/src/pages/shop/promo/[slug].tsx
+++ b/src/pages/shop/promo/[slug].tsx
@@ -91,7 +91,7 @@ export default function PromoDetail() {
       setCurrentPage(pageNumber)
       
       try {
-        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`);
+        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,100);
         setPromoItems(items);
         
         if (items.length === 0) {
@@ -147,16 +147,16 @@ export default function PromoDetail() {
                 const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
                 const product = response.response.docs[0];
                 const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} AND ${combinedQueryPrice}`);  
+                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} AND ${combinedQueryPrice}`,0,100);  
                 return response2;
               }else if(combinedQuery){
                 const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
                 const product = response.response.docs[0];
                 const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} `); 
+                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} `,0,100); 
                 return response2;
               } else {
-                const response = await fetchPromoItemsSolr(`id:${item.id}`);
+                const response = await fetchPromoItemsSolr(`id:${item.id}`,0,100);
                 return response;
               }
             } catch (fetchError) {
diff --git a/src/pages/shop/promo/index.jsx b/src/pages/shop/promo/index.jsx
new file mode 100644
index 00000000..01a11aad
--- /dev/null
+++ b/src/pages/shop/promo/index.jsx
@@ -0,0 +1,40 @@
+import Seo from '@/core/components/Seo'
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react';
+import Link from 'next/link';
+import Promo from '~/pages/shop/promo';
+
+import React from 'react';
+
+const PromoPage = () => {
+  return (
+    <BasicLayout>
+      <Seo title='Promo Indoteknik.com' />
+      <div className='container mx-auto py-4 md:py-6 pb-0'>
+        <Breadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink
+              as={Link}
+              href='/'
+              className='!text-danger-500 whitespace-nowrap'
+            >
+              Home
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          <BreadcrumbItem isCurrentPage>
+            <BreadcrumbLink className='whitespace-nowrap'>
+              Promo
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+        </Breadcrumb>
+
+        <div className='h-10' />
+
+        <Promo />
+      </div>
+    </BasicLayout>
+  );
+};
+
+export default PromoPage;
diff --git a/src/pages/shop/promo/index.tsx b/src/pages/shop/promo/index.tsx
deleted file mode 100644
index 7ec4f6b0..00000000
--- a/src/pages/shop/promo/index.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import dynamic from 'next/dynamic'
-import { useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
-import Seo from '../../../core/components/Seo.jsx'
-import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
-import { fetchPromoItemsSolr } from '../../../api/promoApi.js'
-import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
-import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
-import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
-import React from 'react'
-import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
-
-const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
-
-export default function Promo() {
-  const router = useRouter()
-  const { slug = '' } = router.query
-  const [promoItems, setPromoItems] = useState<any[]>([])
-  const [promoData, setPromoData] = useState<IPromotion[] | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [currentPage, setCurrentPage] = useState(1)
-  const [fetchingData, setFetchingData] = useState(false)
-
-  useEffect(() => {
-    const loadPromo = async () => {
-      try {
-        const items = await fetchPromoItemsSolr(`*:*`)
-        
-        
-        setPromoItems(items)
-        
-
-        if (items.length === 0) {
-          setPromoData([])
-          setLoading(false);
-          return;
-        }
-
-        const promoDataPromises = items.map(async (item) => {
-          const queryParams = new URLSearchParams({ q: `id:${item.id}` })
-          
-
-          try {
-            const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}`)
-            
-            if (!response.ok) {
-              throw new Error(`HTTP error! status: ${response.status}`)
-            }
-
-            const data: SolrResponse<any[]> = await response.json()
-            
-            
-            const promotions = await map(data.response.docs)
-            return promotions;
-          } catch (fetchError) {
-            console.error("Error fetching promotion data:", fetchError)
-            return [];
-          }
-        });
-
-        const promoDataArray = await Promise.all(promoDataPromises);
-        const mergedPromoData = promoDataArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-        setPromoData(mergedPromoData);
-        setTimeout(() => setLoading(false), 120); // Menambahkan delay 200ms sebelum mengubah status loading
-      } catch (loadError) {
-        console.error("Error loading promo items:", loadError)
-        setLoading(false);
-      }
-    }
-
-    if (slug) {
-      loadPromo()
-    }
-  }, [slug])
-
-  const map = async (promotions: any[]): Promise<IPromotion[]> => {
-    const result: IPromotion[] = []
-  
-    for (const promotion of promotions) {
-      const data: IPromotion = {
-        id: promotion.id,
-        program_id: promotion.program_id_i,
-        name: promotion.name_s,
-        type: {
-          value: promotion.type_value_s,
-          label: promotion.type_label_s,
-        },
-        limit: promotion.package_limit_i,
-        limit_user: promotion.package_limit_user_i,
-        limit_trx: promotion.package_limit_trx_i,
-        price: promotion.price_f,
-        total_qty: promotion.total_qty_i,
-        products: JSON.parse(promotion.products_s),
-        free_products: JSON.parse(promotion.free_products_s),
-      }
-  
-      result.push(data)
-    }
-  
-    return result
-  }
-
-  
-  
-
-  useEffect(() => {
-    const handleScroll = () => {
-      if (
-        !fetchingData &&
-        window.innerHeight + document.documentElement.scrollTop >= 0.95 * document.documentElement.offsetHeight
-      ) {
-        // User has scrolled to 95% of page height
-        
-        setTimeout(() => setFetchingData(true), 120);
-        setCurrentPage((prevPage) => prevPage + 1)
-      }
-    }
-
-    window.addEventListener('scroll', handleScroll)
-    return () => window.removeEventListener('scroll', handleScroll)
-  }, [fetchingData])
-
-  useEffect(() => {
-    if (fetchingData) {
-      // Fetch more data
-      // You may need to adjust this logic according to your API
-      fetchMoreData()
-    }
-  }, [fetchingData])
-
-  const fetchMoreData = async () => {
-    try {
-      // Add a delay of approximately 150ms
-      setTimeout(async () => {
-        // Fetch more data
-        // Update promoData state with the new data
-      }, 150)
-    } catch (error) {
-      console.error('Error fetching more data:', error)
-    } finally {
-      setTimeout(() => setFetchingData(false), 120);
-      
-    }
-  }
-
-  const visiblePromotions = promoData?.slice(0, currentPage * 12)
-
-  return (
-    <BasicLayout>
-      <Seo
-        title={`Promo ${Array.isArray(slug) ? slug[0] : slug} Terkini`} 
-        description='B2B Marketplace MRO & Industri dengan Layanan Pembayaran Tempo, Faktur Pajak, Online Quotation, Garansi Resmi & Harga Kompetitif'
-      />
-      {/* <Promocrumb brandName={capitalizeFirstLetter(Array.isArray(slug) ? slug[0] : slug)} />  */}
-      <div className='container mx-auto mt-1 flex mb-1'>
-        <div className=''>
-          <h1 className='font-semibold'>Semua Promo di Indoteknik</h1>
-        </div>
-      </div>
-      {loading ? (
-        <div className='container flex justify-center my-4'>
-          <LogoSpinner width={48} height={48} />
-        </div>
-      ) : promoData && promoItems.length >= 1 ? (
-        <>
-          <div className='flex flex-wrap justify-center'>
-            {visiblePromotions?.map((promotion) => (
-              <div key={promotion.id} className="min-w-[40px] max-w-[400px] mr-[20px] mb-[20px] sm:w-full md:w-1/2 lg:w-1/3 xl:w-1/4">
-                <ProductPromoCard promotion={promotion}  />
-              </div>
-            ))}
-          </div>
-          {fetchingData && (
-            <div className='container flex justify-center my-4'>
-              <LogoSpinner width={48} height={48} />
-            </div>
-          )}
-        </>
-      ) : (
-        <div className="text-center my-8">
-          <p>Belum ada promo pada kategori ini</p>
-        </div>
-      )}
-    </BasicLayout>
-  )
-}