Merge branch 'release' into CR/product_detail

# Conflicts:
#	src-migrate/modules/product-detail/components/ProductDetail.tsx

1 files changed, 27 insertions, 0 deletions

diff --git a/src/pages/tracking-order.jsx b/src/pages/tracking-order.jsx
new file mode 100644
index 00000000..002acd42
--- /dev/null
+++ b/src/pages/tracking-order.jsx
@@ -0,0 +1,27 @@
+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>
+        <BasicLayout>
+          <PageTrackingOrder/>
+        </BasicLayout>
+      </MobileView>
+    </>
+  );
+}