<iman> merge all promotion

3 files changed, 9 insertions, 4 deletions

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index a09989a5..6a51a178 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -10,12 +10,11 @@ import {
   ChevronDownIcon,
   DocumentCheckIcon,
   HeartIcon,
-  ArrowUpRightIcon,
 } from '@heroicons/react/24/outline';
 import dynamic from 'next/dynamic';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import DesktopView from '../../views/DesktopView';
 import Link from '../Link/Link';
 import NavbarUserDropdown from './NavbarUserDropdown';
@@ -263,7 +262,7 @@ const NavbarDesktop = () => {
                     height={160}
                     quality={100}
                     // className={`fixed ${isTop ? 'md:top-[145px] lg:top-[160px] ' : 'lg:top-[85px] top-[80px]'} rounded-3xl md:left-1/4 lg:left-1/4 xl:left-1/4 left-2/3 w-40 h-12  p-2 z-50 transition-all duration-300 animate-pulse`}
-                    className={`inline-block relative -top-4 transition-all duration-300 z-20 animate-pulse`}
+                    className={`inline-block relative -top-5 transition-all duration-300 z-20 animate-pulse`}
                   />
                   </div>
               )}
diff --git a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
index 85807fad..8dc15b05 100644
--- a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
+++ b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
@@ -52,7 +52,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=500&orderBy=flashsale_discount_f desc`,
+        query: `fq=-flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-discount-desc`,
         operation: 'AND',
       });
       setProducts(dataProducts.response);
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 29471f7b..87d7c580 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -3,6 +3,7 @@ import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
 
 export default async function handler(req, res) {
+  
   const {
     q = '*',
     page = 1,
@@ -20,6 +21,9 @@ export default async function handler(req, res) {
 
   let paramOrderBy = '';
   switch (orderBy) {
+    case 'flashsale-discount-desc':
+      paramOrderBy += 'flashsale_discount_f DESC';
+      break;
     case 'price-asc':
       paramOrderBy += 'price_tier1_v2_f ASC';
       break;
@@ -59,6 +63,7 @@ export default async function handler(req, res) {
     `fq=-publish_b:false, product_rating_f:[13 TO *], discount_tier1_v2_f:[1 TO *]`,
   ];
 
+
   if (priceFrom > 0 || priceTo > 0) {
     parameter.push(
       `fq=price_tier1_v2_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
@@ -99,6 +104,7 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
+ 
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,