From 8a4d7247dd4163050f95055f13391b709bb29e66 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 10 Aug 2024 13:22:42 +0700
Subject: <iman> add feature tracking order

---
 src/pages/tracking-order.jsx | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/pages/tracking-order.jsx

(limited to 'src/pages')

diff --git a/src/pages/tracking-order.jsx b/src/pages/tracking-order.jsx
new file mode 100644
index 00000000..18e1a78a
--- /dev/null
+++ b/src/pages/tracking-order.jsx
@@ -0,0 +1,26 @@
+import Seo from '@/core/components/Seo'
+import dynamic from 'next/dynamic'
+import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+const PageTrackingOrder = dynamic(() => import('@/lib/tracking-order/component/TrackingOrder'))
+
+export default function TrackingOrder() {
+  return (
+    <>
+      <Seo title='Tracking Order - Indoteknik.com' />
+
+      <DesktopView>
+        <BasicLayout>
+          <PageTrackingOrder/>
+        </BasicLayout>
+      </DesktopView>
+
+      <MobileView>
+        
+        <SimpleFooter />
+      </MobileView>
+    </>
+  );
+}
-- 
cgit v1.2.3


From bbb2736f0e21192467c1d6888b1c05d290c49863 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 28 Aug 2024 09:22:35 +0700
Subject: <iman> update mobile view

---
 src/pages/tracking-order.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/tracking-order.jsx b/src/pages/tracking-order.jsx
index 18e1a78a..002acd42 100644
--- a/src/pages/tracking-order.jsx
+++ b/src/pages/tracking-order.jsx
@@ -18,8 +18,9 @@ export default function TrackingOrder() {
       </DesktopView>
 
       <MobileView>
-        
-        <SimpleFooter />
+        <BasicLayout>
+          <PageTrackingOrder/>
+        </BasicLayout>
       </MobileView>
     </>
   );
-- 
cgit v1.2.3


From 3159d3a9772eb03231cb56730997b627a44d0a81 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 15:47:59 +0700
Subject: fixing error goole merhanct

---
 src/pages/google_merchant/products/[page].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pages')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 6e0eb703..80017f93 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -50,7 +50,7 @@ export async function getServerSideProps({ res, query }) {
     let categoryId = null;
 
     if (brandId && brandId in brandsData) {
-      categoryId = brandsData[brandId].category_ids?.[0] ?? null;
+      categoryId = brandsData[brandId]?.category_ids?.[0] ?? null;
     } else {
       const solrBrand = await getBrandById(brandId);
       brandsData[brandId] = solrBrand;
-- 
cgit v1.2.3


From 2dff6fa7f787306aaaa5546d453fab17e4cbe811 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 29 Aug 2024 09:02:15 +0700
Subject: bug fixing google merchants

---
 src/pages/google_merchant/products/[page].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pages')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 80017f93..0c2cf3c5 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -58,7 +58,7 @@ export async function getServerSideProps({ res, query }) {
     }
 
     if (categoryId && categoryId in categoriesData) {
-      categoryName = categoriesData[categoryId].name_s ?? null;
+      categoryName = categoriesData[categoryId]?.name_s ?? null;
     } else {
       const solrCategory = await getCategoryById(categoryId);
       categoriesData[categoryId] = solrCategory;
-- 
cgit v1.2.3