Merge branch 'new-release' into CR/new_product_detail

4 files changed, 44 insertions, 22 deletions

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 6269d3ed..49a5fe69 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -23,6 +23,9 @@ export default async function handler(req, res) {
 
   let paramOrderBy = '';
   switch (orderBy) {
+    case 'flashsale-discount-desc':
+      paramOrderBy += 'flashsale_discount_f DESC';
+      break;
     case 'price-asc':
       paramOrderBy += 'price_tier1_v2_f ASC';
       break;
@@ -68,15 +71,23 @@ export default async function handler(req, res) {
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = escapeSolrQuery(q);
 
-  const formattedQuery = `(${newQ.split(' ').map(term => `${term}*`).join(' ') })`;
-  const mm = checkQ.length > 2 ?  checkQ.length > 5 ? '55%' : '85%' : `${checkQ.length}`;
+  const formattedQuery = `(${newQ
+    .split(' ')
+    .map((term) => `${term}*`)
+    .join(' ')})`;
+  const mm =
+    checkQ.length > 2
+      ? checkQ.length > 5
+        ? '55%'
+        : '85%'
+      : `${checkQ.length}`;
 
   const filterQueries = [
     '-publish_b:false',
     'product_rating_f:[8 TO *]',
-    'price_tier1_v2_f:[1 TO *]'
+    'price_tier1_v2_f:[1 TO *]',
   ];
-  
+
   const fq_ = filterQueries.join('AND ');
 
   let offset = (page - 1) * limit;
@@ -87,7 +98,13 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=OR`,
-    `q=${source == 'similar' || checkQ.length < 3  ?  checkQ.length < 2 ?  newQ : newQ + '*' : formattedQuery }`,
+    `q=${
+      source == 'similar' || checkQ.length < 3
+        ? checkQ.length < 2
+          ? newQ
+          : newQ + '*'
+        : formattedQuery
+    }`,
     `defType=edismax`,
     'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s',
     `start=${parseInt(offset)}`,
@@ -135,12 +152,14 @@ export default async function handler(req, res) {
   if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
   // Multi fq in url params
   if (Array.isArray(fq))
-    parameter = parameter.concat(fq.map((val) => `fq=${encodeURIComponent(val)}`));
-  
+    parameter = parameter.concat(
+      fq.map((val) => `fq=${encodeURIComponent(val)}`)
+    );
+
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
-  
+
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index ac925b4e..cc4d68db 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -60,11 +60,11 @@ const CategoryHomeId = dynamic(() =>
 );
 
 const CategoryDynamic = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamic'), {ssr : false}
+  import('@/lib/home/components/CategoryDynamic')
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-import('@/lib/home/components/CategoryDynamicMobile'), {ssr: false}
+import('@/lib/home/components/CategoryDynamicMobile')
 );
 
 const CustomerReviews = dynamic(() =>
diff --git a/src/pages/my/address/[id]/edit.jsx b/src/pages/my/address/[id]/edit.jsx
index c552659b..19d7af41 100644
--- a/src/pages/my/address/[id]/edit.jsx
+++ b/src/pages/my/address/[id]/edit.jsx
@@ -37,12 +37,15 @@ export async function getServerSideProps(context) {
     mobile: address.mobile,
     street: address.street,
     zip: address.zip,
-    city: address.city?.id || '',
+    state: address.stateId?.id || '',
+    oldCity: address.city?.id || '',
+    city: '',
     oldDistrict: address.district?.id || '',
     district: '',
     oldSubDistrict: address.subDistrict?.id || '',
     subDistrict: '',
     business_name: '',
   };
+  // console.log('ini default',defaultValues);
   return { props: { id, defaultValues } };
 }
diff --git a/src/pages/shop/checkout/[status].jsx b/src/pages/shop/checkout/[status].jsx
index 2c3bebcf..0d5cffe8 100644
--- a/src/pages/shop/checkout/[status].jsx
+++ b/src/pages/shop/checkout/[status].jsx
@@ -1,22 +1,22 @@
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import IsAuth from '@/lib/auth/components/IsAuth'
-import FinishCheckoutComponent from '@/lib/checkout/components/FinishCheckout'
-import { useRouter } from 'next/router'
-import axios from 'axios'
-import Seo from '@/core/components/Seo'
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import IsAuth from '@/lib/auth/components/IsAuth';
+import FinishCheckoutComponent from '@/lib/checkout/components/FinishCheckout';
+import { useRouter } from 'next/router';
+import axios from 'axios';
+import Seo from '@/core/components/Seo';
 
 export async function getServerSideProps(context) {
-  const { order_id } = context.query
+  const { order_id } = context.query;
   await axios.post(
     `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/finish-checkout?orderName=${order_id}`,
     {},
     { headers: context.req.headers }
-  )
-  return { props: {} }
+  );
+  return { props: {} };
 }
 
 export default function Finish() {
-  const router = useRouter()
+  const router = useRouter();
 
   return (
     <>
@@ -28,5 +28,5 @@ export default function Finish() {
         </BasicLayout>
       </IsAuth>
     </>
-  )
+  );
 }