Merge branch 'master' into CR/UI

# Conflicts:
#	src/lib/cart/components/Cartheader.jsx

2 files changed, 7 insertions, 12 deletions

diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js
index 22a53df2..247f2a04 100644
--- a/src/pages/api/shop/product-detail.js
+++ b/src/pages/api/shop/product-detail.js
@@ -8,7 +8,7 @@ export default async function handler(req, res) {
     )
     let productVariants = await axios(
       process.env.SOLR_HOST +
-        `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100`
+        `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100&fq=-publish_b:false`
     )
     let auth  = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth
     let result = productMappingSolr(productTemplate.data.response.docs, auth || false)
diff --git a/src/pages/api/shop/variant.js b/src/pages/api/shop/variant.js
index 30213cc3..249d087e 100644
--- a/src/pages/api/shop/variant.js
+++ b/src/pages/api/shop/variant.js
@@ -54,7 +54,7 @@ export default async function handler(req, res) {
 
   if (priceFrom > 0 || priceTo > 0) {
     parameter.push(
-      `fq=price_discount_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
+      `fq=price_tier1_v2_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
         priceTo == '' ? '*' : priceTo
       }]`
     )
@@ -103,17 +103,12 @@ const escapeSolrQuery = (query) => {
 
 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
+    let price = product.price_tier1_v2_f || 0
+    let priceDiscount = 0
+    let discountPercentage = 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 (pricelist && product?.[`price_${pricelist}_f`] < price) {
+        price = product?.[`price_${pricelist}_f`] || 0
     }
 
     if (product?.flashsale_id_i > 0) {