Merge views subtree

ecomplus-stores · Apr 1, 2022 · 069ffc6 · 069ffc6
2 parents 26b9c4e + b4e6c80
commit 069ffc6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 29 deletions.
diff --git a/template/pages/@/layout/header.ejs b/template/pages/@/layout/header.ejs
@@ -274,10 +274,10 @@ const hasMegamenu = header.desktop_megamenu
                     <nav class="header__submenu" id="<%= `s-${slug.replace(/\//g, '_')}` %>">
                       <% subcategories.forEach(subcategory => { %>
                         <div>               
-                          <a href="<%= subcategory.slug %>"><%= subcategory.name %></a>
+                          <a href="/<%= subcategory.slug %>"><%= subcategory.name %></a>
                           <% const thirdCategories = _.categories.filter(({ parent }) => parent && parent.slug === subcategory.slug) %>
                           <% thirdCategories.forEach(thirdCategory => { %>
-                            <a class="header__submenu-subcategory" href="<%= thirdCategory.slug %>">
+                            <a class="header__submenu-subcategory" href="/<%= thirdCategory.slug %>">
                               <%= thirdCategory.name %>
                             </a>
                           <% }) %>

diff --git a/template/pages/@/sections/offers-timer.ejs b/template/pages/@/sections/offers-timer.ejs
@@ -1,35 +1,45 @@
 <%
 if (Array.isArray(opt.offers) && opt.offers.length) {
   const search = new _.EcomSearch()
-  await search.setProductIds(opt.offers).fetch(true)
-  const items = search.getItems().filter(item => _.ecomUtils.inStock(item))
-  %>
+  let items
+  try {
+    await search.setProductIds(opt.offers).fetch(true)
+    items = search.getItems().filter(item => _.ecomUtils.inStock(item))
+  } catch (err) {
+    console.error(err)
+    items = []
+  }
 
-  <section class="offers-timer my-4 my-lg-5">
-    <div class="container">
-      <div class="row">
-        <div
-          <% if (items.length <= 3) { %>
-            class="col-12 col-md-<%= (7 - items.length) %>"
-          <% } else { %>
-            class="col-12 col-lg-3"
-          <% } %>
-        >
-          <%- await include('@/sections/inc/timer', { _, opt }) %>
-        </div>
-
-        <div class="col-12 col-md">
-          <div class="row">
-            <% for (let i = 0; i < items.length; i++) { %>
-              <div class="col-6 col-md">
-                <%- await include('@/sections/inc/product-item', {
-                  _, opt: { item: items[i] }
-                }) %>
-              </div>
+  if (items.length) {
+    %>
+    <section class="offers-timer my-4 my-lg-5">
+      <div class="container">
+        <div class="row">
+          <div
+            <% if (items.length <= 3) { %>
+              class="col-12 col-md-<%= (7 - items.length) %>"
+            <% } else { %>
+              class="col-12 col-lg-3"
             <% } %>
+          >
+            <%- await include('@/sections/inc/timer', { _, opt }) %>
+          </div>
+
+          <div class="col-12 col-md">
+            <div class="row">
+              <% for (let i = 0; i < items.length; i++) { %>
+                <div class="col-6 col-md">
+                  <%- await include('@/sections/inc/product-item', {
+                    _, opt: { item: items[i] }
+                  }) %>
+                </div>
+              <% } %>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-  </section>
-<% } %>
+    </section>
+    <%
+  }
+}
+%>