Merge branch 'master' into development_tri/feedback_UAT

2 files changed, 6 insertions, 6 deletions

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index bab96237..19b9655a 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -15,19 +15,19 @@ export default async function handler(req, res) {
     limit = 30
   } = req.query
 
-  let paramOrderBy = 'product_rating_f DESC'
+  let paramOrderBy = ''
   switch (orderBy) {
     case 'price-asc':
-      paramOrderBy += ', price_discount_f ASC'
+      paramOrderBy += 'price_discount_f ASC'
       break
     case 'price-desc':
-      paramOrderBy += ', price_discount_f DESC'
+      paramOrderBy += 'price_discount_f DESC'
       break
     case 'popular':
-      paramOrderBy += ', search_rank_i DESC'
+      paramOrderBy += 'search_rank_i DESC'
       break
     case 'stock':
-      paramOrderBy += ', stock_total_f DESC'
+      paramOrderBy += 'stock_total_f DESC'
       break
   }
 
diff --git a/src/pages/video.jsx b/src/pages/video.jsx
index 708c3368..61790dbb 100644
--- a/src/pages/video.jsx
+++ b/src/pages/video.jsx
@@ -33,7 +33,7 @@ export default function Video() {
               <div className='shadow bg-white rounded' key={video.id}>
                 <LazyLoadComponent>
                   <iframe
-                    src={`https://www.youtube.com/embed/${video.url.match(/v=([^&]*)/)[1]}`}
+                    src={`https://www.youtube.com/embed/${video.url.match(/v=([^&]*)/)?.[1] || ''}`}
                     title='YouTube video player'
                     allow='accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share'
                     allowFullScreen={true}