2 files changed, 9 insertions, 14 deletions
diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js
index 60433459..e9236571 100644
--- a/src/pages/api/shop/product-detail.js
+++ b/src/pages/api/shop/product-detail.js
@@ -1,3 +1,4 @@
+import { productMappingSolr, variantsMappingSolr } from '@/utils/solrMapping'
 import axios from 'axios'
 
 export default async function handler(req, res) {
@@ -11,8 +12,8 @@ export default async function handler(req, res) {
     )
     let { auth } = req.cookies
     if (auth) auth = JSON.parse(auth)
-    let result = productResponseMap(productTemplate.data.response.docs, auth?.pricelist || false)
-    result[0].variants = productVariantsResponseMap(
+    let result = productMappingSolr(productTemplate.data.response.docs, auth?.pricelist || false)
+    result[0].variants = variantsMappingSolr(
       productTemplate.data.response.docs[0],
       productVariants.data.response.docs,
       auth?.pricelist || false
@@ -24,20 +25,13 @@ export default async function handler(req, res) {
   }
 }
 
-const productResponseMap = (products, pricelist) => {
+/*const productResponseMap = (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) {
-      /*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
-      */
       price = product?.[`price_${pricelist}_f`] || 0
     }
 
@@ -141,4 +135,4 @@ const flashsaleTime = (endDate) => {
   const timeDifferenceInSeconds = timeDifferenceInMillis / 1000
 
   return { remainingTime: timeDifferenceInSeconds, isFlashSale: flashsaleEndDate > currentTime }
-}
+}*/
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 823e2a61..2120a442 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -1,3 +1,4 @@
+import { productMappingSolr } from '@/utils/solrMapping'
 import axios from 'axios'
 import camelcaseObjectDeep from 'camelcase-object-deep'
 
@@ -73,7 +74,7 @@ export default async function handler(req, res) {
   try {
     let { auth } = req.cookies
     if (auth) auth = JSON.parse(auth)
-    result.data.response.products = productResponseMap(
+    result.data.response.products = productMappingSolr(
       result.data.response.docs,
       auth?.pricelist || false
     )
@@ -102,7 +103,7 @@ const escapeSolrQuery = (query) => {
   return escapedWords.join(' ')
 }
 
-const productResponseMap = (products, pricelist) => {
+/*const productResponseMap = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0
     let priceDiscount = product.price_discount_f || 0
@@ -158,4 +159,4 @@ const productResponseMap = (products, pricelist) => {
     ]
     return productMapped
   })
-}
+}*/