add condisi if harga tier user lebih rendah dari flash sale

1 files changed, 57 insertions, 56 deletions

diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index c8bd54ea..61816cf8 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,17 +1,17 @@
 export const productMappingSolr = (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
+    let priceDiscount = 0
+    let discountPercentage = 0
 
-    if (pricelist) {
-      price = product?.[`price_${pricelist}_f`] || 0
+    if (pricelist && product?.[`price_${pricelist}_f`] < price) {
+        price = product?.[`price_${pricelist}_f`] || 0
     }
 
-    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
+    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 = {
@@ -55,59 +55,60 @@ export const productMappingSolr = (products, pricelist) => {
 }
 
 export const variantsMappingSolr = (parent, 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) {
+  return products.map((product) => {
+    let price = product.price_tier1_v2_f || 0
+    let priceDiscount = 0
+    let discountPercentage = 0
+
+    if (pricelist) {
+      if (product?.[`price_${pricelist}_f`] < price) {
         price = product?.[`price_${pricelist}_f`] || 0
       }
-  
-      if (product?.flashsale_id_i > 0) {
+    }
+
+    if (product?.flashsale_id_i > 0 && product?.flashsale_price_f < price) {
         price = product?.flashsale_base_price_f || 0
         priceDiscount = product?.flashsale_price_f || 0
         discountPercentage = product?.flashsale_discount_f || 0
+    }
+
+    let productMapped = {
+      attributes: product.attributes || [],
+      id: product.product_id_i || '',
+      image: product.image_s || '',
+      code: product.default_code_s || '',
+      isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
+      isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
+      name: product.display_name_s || '',
+      price: { price, priceDiscount, discountPercentage },
+      variantTotal: product.variant_total_i || 0,
+      stockTotal: product.stock_total_f || 0,
+      weight: product.weight_f || 0,
+      manufacture: {},
+      parent: {}
+    }
+
+    if (product.manufacture_id_i && product.manufacture_name_s) {
+      productMapped.manufacture = {
+        id: product.manufacture_id_i || '',
+        name: product.manufacture_name_s || ''
       }
-  
-      let productMapped = {
-        attributes: product.attributes || [],
-        id: product.product_id_i || '',
-        image: product.image_s || '',
-        code: product.default_code_s || '',
-        isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
-        isFlashsale: flashsaleTime(product?.flashsale_end_date_s)?.isFlashSale,
-        name: product.display_name_s || '',
-        price: { price, priceDiscount, discountPercentage },
-        variantTotal: product.variant_total_i || 0,
-        stockTotal: product.stock_total_f || 0,
-        weight: product.weight_f || 0,
-        manufacture: {},
-        parent: {}
-      }
-  
-      if (product.manufacture_id_i && product.manufacture_name_s) {
-        productMapped.manufacture = {
-          id: product.manufacture_id_i || '',
-          name: product.manufacture_name_s || ''
-        }
-      }
-      productMapped.parent = {
-        id: parent.product_id_i || '',
-        image: parent.image_s || '',
-        name: parent.name_s || ''
-      }
-      return productMapped
-    })
-  }
+    }
+    productMapped.parent = {
+      id: parent.product_id_i || '',
+      image: parent.image_s || '',
+      name: parent.name_s || ''
+    }
+    return productMapped
+  })
+}
 
 const flashsaleTime = (endDate) => {
-    const flashsaleEndDate = new Date(endDate)
-    const currentTime = new Date()
-  
-    const timeDifferenceInMillis = flashsaleEndDate - currentTime
-    const timeDifferenceInSeconds = timeDifferenceInMillis / 1000
-  
-    return { remainingTime: timeDifferenceInSeconds, isFlashSale: flashsaleEndDate > currentTime }
-  }
-  
+  const flashsaleEndDate = new Date(endDate)
+  const currentTime = new Date()
+
+  const timeDifferenceInMillis = flashsaleEndDate - currentTime
+  const timeDifferenceInSeconds = timeDifferenceInMillis / 1000
+
+  return { remainingTime: timeDifferenceInSeconds, isFlashSale: flashsaleEndDate > currentTime }
+}