Merge branch 'new-release' into CR/quotation-noPo

2 files changed, 24 insertions, 14 deletions

diff --git a/src/lib/flashSale/components/FlashSale.jsx b/src/lib/flashSale/components/FlashSale.jsx
index 89c46de4..6d90cad7 100644
--- a/src/lib/flashSale/components/FlashSale.jsx
+++ b/src/lib/flashSale/components/FlashSale.jsx
@@ -2,10 +2,8 @@ import Image from 'next/image';
 import { useEffect, useState } from 'react';
 
 import CountDown from '@/core/components/elements/CountDown/CountDown';
-import productSearchApi from '@/lib/product/api/productSearchApi';
 import ProductSlider from '@/lib/product/components/ProductSlider';
 
-import flashSaleApi from '../api/flashSaleApi';
 import { FlashSaleSkeleton } from '../skeleton/FlashSaleSkeleton';
 
 const FlashSale = () => {
@@ -14,10 +12,14 @@ const FlashSale = () => {
 
   useEffect(() => {
     const loadFlashSales = async () => {
-      const dataFlashSales = await flashSaleApi();
-      setFlashSales(dataFlashSales);
+      const res = await fetch('/api/flashsale-header');
+      const { data } = await res.json();
+      if (data) {
+        setFlashSales(data);
+      }
       setIsLoading(false);
     };
+
     loadFlashSales();
   }, []);
 
@@ -53,7 +55,10 @@ const FlashSale = () => {
                   height={48}
                   className='w-full rounded mb-4 block sm:hidden'
                 />
-                <FlashSaleProduct flashSaleId={flashSale.pricelistId} />
+                <FlashSaleProduct
+                  flashSaleId={flashSale.pricelistId}
+                  duration={flashSale.duration}
+                />
               </div>
             </div>
           ))}
@@ -63,19 +68,24 @@ const FlashSale = () => {
   );
 };
 
-const FlashSaleProduct = ({ flashSaleId }) => {
+const FlashSaleProduct = ({ flashSaleId, duration }) => {
   const [products, setProducts] = useState(null);
-
   useEffect(() => {
+    const data_search = new URLSearchParams({
+      query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc&source=similar`,
+      operation: 'AND',
+      duration: `${duration}`,
+    });
     const loadProducts = async () => {
-      const dataProducts = await productSearchApi({
-        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc`,
-        operation: 'AND',
-      });
-      setProducts(dataProducts.response);
+      const res = await fetch(
+        `/api/search-flashsale?${data_search.toString()}`
+      );
+      const { data } = await res.json();
+      setProducts(data.response);
     };
+
     loadProducts();
-  }, [flashSaleId]);
+  }, []);
 
   return <ProductSlider products={products} />;
 };
diff --git a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
index c91de2be..4b420fac 100644
--- a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
+++ b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
@@ -56,7 +56,7 @@ const FlashSaleProduct = ({ flashSaleId }) => {
   useEffect(() => {
     const loadProducts = async () => {
       const dataProducts = await productSearchApi({
-        query: `fq=-flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=25&orderBy=flashsale-discount-desc`,
+        query: `fq=-flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=25&orderBy=flashsale-discount-desc&source=similar`,
         operation: 'AND',
       });
       setProducts(dataProducts.response);