Merged in CR/UI (pull request #102)

CR/UI

3 files changed, 9 insertions, 6 deletions

diff --git a/src/lib/flashSale/components/FlashSale.jsx b/src/lib/flashSale/components/FlashSale.jsx
index 87545d8d..3d5c4e0e 100644
--- a/src/lib/flashSale/components/FlashSale.jsx
+++ b/src/lib/flashSale/components/FlashSale.jsx
@@ -63,7 +63,7 @@ const FlashSaleProduct = ({ flashSaleId }) => {
   useEffect(() => {
     const loadProducts = async () => {
       const dataProducts = await productSearchApi({
-        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500`,
+        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc`,
         operation: 'AND'
       })
       setProducts(dataProducts.response)
diff --git a/src/lib/product/components/ProductFilter.jsx b/src/lib/product/components/ProductFilter.jsx
index 69738b33..d52fcb90 100644
--- a/src/lib/product/components/ProductFilter.jsx
+++ b/src/lib/product/components/ProductFilter.jsx
@@ -184,7 +184,7 @@ const ProductFilter = ({ active, close, brands, categories, prefixUrl, defaultBr
             ))}
           </div>
         </div>
-        <div>
+        {/* <div>
           <label>Ketersedian Stok</label>
           <div className='mt-2'>
             <Checkbox
@@ -196,7 +196,7 @@ const ProductFilter = ({ active, close, brands, categories, prefixUrl, defaultBr
               Ketersedian Stok
             </Checkbox>
           </div>
-        </div>
+        </div> */}
         <button type='button' className='btn-solid-red w-full mt-2' onClick={handleSubmit}>
           Terapkan Filter
         </button>
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 31497c51..b4d67c5d 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -20,13 +20,13 @@ export default async function handler(req, res) {
   let paramOrderBy = ''
   switch (orderBy) {
     case 'price-asc':
-      paramOrderBy += 'price_discount_f ASC'
+      paramOrderBy += 'price_tier1_v2_f ASC'
       break
     case 'price-desc':
-      paramOrderBy += 'price_discount_f DESC'
+      paramOrderBy += 'price_tier1_v2_f DESC'
       break
     case 'popular':
-      paramOrderBy += 'search_rank_i DESC'
+      paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,'
       break
     case 'popular-weekly':
       paramOrderBy += 'search_rank_weekly_i DESC'
@@ -34,6 +34,9 @@ export default async function handler(req, res) {
     case 'stock':
       paramOrderBy += 'stock_total_f DESC'
       break
+    case 'flashsale-price-asc':
+      paramOrderBy += 'flashsale_price_f ASC'
+      break
     default:
       paramOrderBy += 'product_rating_f DESC, price_discount_f DESC'
       break