1 files changed, 44 insertions, 10 deletions

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 19b9655a..2e6764fd 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -29,6 +29,9 @@ export default async function handler(req, res) {
     case 'stock':
       paramOrderBy += 'stock_total_f DESC'
       break
+    default:
+      paramOrderBy += 'product_rating_f DESC, price_discount_f DESC'
+      break
   }
 
   let offset = (page - 1) * limit
@@ -43,10 +46,17 @@ export default async function handler(req, res) {
     'qf=name_s',
     `start=${offset}`,
     `rows=${limit}`,
-    `sort=${paramOrderBy}`,
-    `fq=price_discount_f:[${priceFrom == '' ? '*' : priceFrom} TO ${priceTo == '' ? '*' : priceTo}]`
+    `sort=${paramOrderBy}`
   ]
 
+  if (priceFrom > 0 || priceTo > 0) {
+    parameter.push(
+      `fq=price_discount_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
+        priceTo == '' ? '*' : priceTo
+      }]`
+    )
+  }
+
   if (brand) parameter.push(`fq=manufacture_name:${brand}`)
   if (category) parameter.push(`fq=category_name:${category}`)
 
@@ -57,7 +67,12 @@ 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 = productResponseMap(result.data.response.docs)
+    let { auth } = req.cookies
+    if (auth) auth = JSON.parse(auth)
+    result.data.response.products = productResponseMap(
+      result.data.response.docs,
+      auth?.pricelist || false
+    )
     result.data.responseHeader.params.start = parseInt(result.data.responseHeader.params.start)
     result.data.responseHeader.params.rows = parseInt(result.data.responseHeader.params.rows)
     delete result.data.response.docs
@@ -83,23 +98,42 @@ const escapeSolrQuery = (query) => {
   return escapedWords.join(' ')
 }
 
-const productResponseMap = (products) => {
+const productResponseMap = (products, pricelist) => {
   return products.map((product) => {
+    let price = product.price_f || 0
+    let priceDiscount = product.price_discount_f || 0
+    let discountPercentage = product.discount_f || 0
+
+    if (pricelist) {
+      const pricelistDiscount = product?.[`price_${pricelist}_f`] || false
+      const pricelistDiscountPerc = product?.[`discount_${pricelist}_f`] || false
+
+      if (pricelistDiscount && pricelistDiscount > 0) priceDiscount = pricelistDiscount
+      if (pricelistDiscountPerc && pricelistDiscountPerc > 0)
+        discountPercentage = pricelistDiscountPerc
+    }
+
+    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 = {
       id: product.product_id_i || '',
       image: product.image_s || '',
       code: product.default_code_s || '',
       name: product.name_s || '',
-      lowestPrice: {
-        price: product.price_f || 0,
-        priceDiscount: product.price_discount_f || 0,
-        discountPercentage: product.discount_f || 0
-      },
+      lowestPrice: { price, priceDiscount, discountPercentage },
       variantTotal: product.variant_total_i || 0,
       stockTotal: product.stock_total_f || 0,
       weight: product.weight_f || 0,
       manufacture: {},
-      categories: []
+      categories: [],
+      flashSale: {
+        id: product?.flashsale_id_i,
+        name: product?.product?.flashsale_name_s
+      }
     }
 
     if (product.manufacture_id_i && product.manufacture_name_s) {