From bdfaa0b8564e89d72ffd2de93eb088e8cf0db31e Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 2 Oct 2023 17:07:20 +0700 Subject: mapping new pricelist --- src/pages/api/shop/search.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 57b16db8..79083ee7 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -104,17 +104,19 @@ const escapeSolrQuery = (query) => { const productResponseMap = (products, pricelist) => { return products.map((product) => { - let price = product.price_f || 0 + let price = 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 + // 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 (pricelistDiscount && pricelistDiscount > 0) priceDiscount = pricelistDiscount + // if (pricelistDiscountPerc && pricelistDiscountPerc > 0) + // discountPercentage = pricelistDiscountPerc + + price = product?.[`price_${pricelist}_v2_f`] || 0 } if (product?.flashsale_id_i > 0) { -- cgit v1.2.3 From 787d3aaa3187d3432c8e6b743b555ea3e4a4980c Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Tue, 3 Oct 2023 15:25:14 +0700 Subject: new pricelist di page product cart, product detail & product variant --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 79083ee7..7b44ef37 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -104,7 +104,7 @@ const escapeSolrQuery = (query) => { const productResponseMap = (products, pricelist) => { return products.map((product) => { - let price = price_tier1_v2_f || 0 + let price = product.price_tier1_v2_f || 0 let priceDiscount = product.price_discount_f || 0 let discountPercentage = product.discount_f || 0 -- cgit v1.2.3 From eb7bea2f262ffa4faa39d4f163950892c5640c0f Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Wed, 4 Oct 2023 10:09:43 +0700 Subject: pricelist di cart dan list variant --- src/pages/api/shop/product-detail.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js index 5c3a8231..23adcb5f 100644 --- a/src/pages/api/shop/product-detail.js +++ b/src/pages/api/shop/product-detail.js @@ -26,17 +26,19 @@ export default async function handler(req, res) { const productResponseMap = (products, pricelist) => { return products.map((product) => { - let price = product.price_f || 0 + 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 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}_v2_f`] || 0 } if (product?.flashsale_id_i > 0) { @@ -86,17 +88,12 @@ const productResponseMap = (products, pricelist) => { } const productVariantsResponseMap = (parent, products, pricelist) => { return products.map((product) => { - let price = product.price_f || 0 + 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}_v2_f`] || 0 } if (product?.flashsale_id_i > 0) { -- cgit v1.2.3 From 1deaba0e528600f524df68463140bfef30aa155a Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 4 Oct 2023 13:10:30 +0700 Subject: Fix product map on search solr --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 7b44ef37..823e2a61 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -116,7 +116,7 @@ const productResponseMap = (products, pricelist) => { // if (pricelistDiscountPerc && pricelistDiscountPerc > 0) // discountPercentage = pricelistDiscountPerc - price = product?.[`price_${pricelist}_v2_f`] || 0 + price = product?.[`price_${pricelist}_f`] || 0 } if (product?.flashsale_id_i > 0) { -- cgit v1.2.3 From f14ff937c240edf636e0df66521ca30c3e6a8dcd Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Wed, 4 Oct 2023 13:39:31 +0700 Subject: bugs fix --- src/pages/api/shop/product-detail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js index 23adcb5f..60433459 100644 --- a/src/pages/api/shop/product-detail.js +++ b/src/pages/api/shop/product-detail.js @@ -38,7 +38,7 @@ const productResponseMap = (products, pricelist) => { if (pricelistDiscountPerc && pricelistDiscountPerc > 0) discountPercentage = pricelistDiscountPerc */ - price = product?.[`price_${pricelist}_v2_f`] || 0 + price = product?.[`price_${pricelist}_f`] || 0 } if (product?.flashsale_id_i > 0) { @@ -93,7 +93,7 @@ const productVariantsResponseMap = (parent, products, pricelist) => { let discountPercentage = product.discount_f || 0 if (pricelist) { - price = product?.[`price_${pricelist}_v2_f`] || 0 + price = product?.[`price_${pricelist}_f`] || 0 } if (product?.flashsale_id_i > 0) { -- cgit v1.2.3 From 72e7db4e20c2999bc4e6db3cef2ebe281898e915 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Wed, 4 Oct 2023 13:56:11 +0700 Subject: mapping product solr --- src/pages/api/shop/product-detail.js | 16 +++++----------- src/pages/api/shop/search.js | 7 ++++--- 2 files changed, 9 insertions(+), 14 deletions(-) (limited to 'src/pages/api') 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 }) -} +}*/ -- cgit v1.2.3 From 427feacedcdc511fcead8d2289264aa58bafd038 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Wed, 4 Oct 2023 15:34:39 +0700 Subject: set tier auth --- src/pages/api/shop/product-detail.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js index e9236571..e77ae53a 100644 --- a/src/pages/api/shop/product-detail.js +++ b/src/pages/api/shop/product-detail.js @@ -10,13 +10,12 @@ export default async function handler(req, res) { process.env.SOLR_HOST + `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100` ) - let { auth } = req.cookies - if (auth) auth = JSON.parse(auth) - let result = productMappingSolr(productTemplate.data.response.docs, auth?.pricelist || false) + let auth = req.query.auth + let result = productMappingSolr(productTemplate.data.response.docs, auth || false) result[0].variants = variantsMappingSolr( productTemplate.data.response.docs[0], productVariants.data.response.docs, - auth?.pricelist || false + auth || false ) res.status(200).json(result) } catch (error) { -- cgit v1.2.3 From e9f65fadbfcf319db1f2f73e0984acad4f9aa505 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Thu, 5 Oct 2023 10:35:30 +0700 Subject: error query params --- src/pages/api/shop/product-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js index e77ae53a..8571b623 100644 --- a/src/pages/api/shop/product-detail.js +++ b/src/pages/api/shop/product-detail.js @@ -10,7 +10,7 @@ export default async function handler(req, res) { process.env.SOLR_HOST + `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100` ) - let auth = req.query.auth + let auth = JSON.parse(req.query.auth) let result = productMappingSolr(productTemplate.data.response.docs, auth || false) result[0].variants = variantsMappingSolr( productTemplate.data.response.docs[0], -- cgit v1.2.3 From 3b7a99415cf1209c300c459bbae065d9cce17864 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Thu, 5 Oct 2023 10:44:48 +0700 Subject: bug fix json parse --- src/pages/api/shop/product-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api') diff --git a/src/pages/api/shop/product-detail.js b/src/pages/api/shop/product-detail.js index 8571b623..22a53df2 100644 --- a/src/pages/api/shop/product-detail.js +++ b/src/pages/api/shop/product-detail.js @@ -10,7 +10,7 @@ export default async function handler(req, res) { process.env.SOLR_HOST + `/solr/variants/select?q=template_id_i:${req.query.id}&q.op=OR&indent=true&rows=100` ) - let auth = JSON.parse(req.query.auth) + let auth = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth let result = productMappingSolr(productTemplate.data.response.docs, auth || false) result[0].variants = variantsMappingSolr( productTemplate.data.response.docs[0], -- cgit v1.2.3