(andri) resolve conflict

5 files changed, 102 insertions, 16 deletions

diff --git a/src/pages/api/flashsale-header.js b/src/pages/api/flashsale-header.js
index 578801ae..916a9cd2 100644
--- a/src/pages/api/flashsale-header.js
+++ b/src/pages/api/flashsale-header.js
@@ -35,7 +35,7 @@ export default async function handler(req, res) {
       }
       return res.status(200).json({ data });
     } else {
-      const flashSale = await odooApi('GET', `/api/v1/flashsale/header`);
+      const flashSale = await odooApi('GET', `/api/v1/flashsale/header?is_show_program=true`);
       if (flashSale.length === 0) {
         return res.status(200).json({ data: [] });
       } else {
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 63ec7ca0..a1eecc52 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -19,6 +19,7 @@ export default async function handler(req, res) {
     source = '',
   } = req.query;
 
+
   let { stock = '' } = req.query;
   let paramOrderBy = '';
   switch (orderBy) {
diff --git a/src/pages/daftar-merchant.jsx b/src/pages/daftar-merchant.jsx
deleted file mode 100644
index e1fa9bcb..00000000
--- a/src/pages/daftar-merchant.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import Seo from '@/core/components/Seo'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import CreateMerchant from '@/lib/form/components/Merchant'
-
-export default function DaftarMerchant() {
-  return (
-    <>
-      <Seo title='Daftar Merchant - Indoteknik.com' />
-
-      <BasicLayout>
-        <CreateMerchant></CreateMerchant>
-      </BasicLayout>
-    </>
-  )
-}
diff --git a/src/pages/daftar-merchant/[status].jsx b/src/pages/daftar-merchant/[status].jsx
new file mode 100644
index 00000000..61c07571
--- /dev/null
+++ b/src/pages/daftar-merchant/[status].jsx
@@ -0,0 +1,47 @@
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import IsAuth from '@/lib/auth/components/IsAuth';
+import StatusMerchant from '@/lib/merchant/components/AccountSwitch';
+import { useRouter } from 'next/router';
+import axios from 'axios';
+import { useState, useEffect } from 'react';
+import Seo from '@/core/components/Seo';
+import { getAuth } from '~/libs/auth';
+
+export async function getServerSideProps(context) {
+  const { status } = context.query;
+  //   await axios.post(
+  //     `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo/${status}`,
+  //     {},
+  //     { headers: context.req.headers }
+  //   );
+  return { props: {} };
+}
+
+export default function Finish() {
+  const [isLoading, setIsLoading] = useState(true);
+  const router = useRouter();
+  const auth = getAuth();
+  useEffect(() => {
+    if (!auth) {
+      const nextUrl = encodeURIComponent(router.asPath);
+      router.push(`/login?next=${nextUrl}`);
+    } else {
+      setIsLoading(false);
+    }
+  }, [auth]);
+
+  if (isLoading || !auth) {
+    return null; // Tidak render apa pun selama loading atau auth/tempo belum tersedia
+  }
+  return (
+    <>
+      <Seo title='Pengajuan Tempo Indoteknik.com' />
+
+      <IsAuth>
+        <BasicLayout>
+          <StatusMerchant query={router.query || {}} />
+        </BasicLayout>
+      </IsAuth>
+    </>
+  );
+}
diff --git a/src/pages/daftar-merchant/index.jsx b/src/pages/daftar-merchant/index.jsx
new file mode 100644
index 00000000..36fedafc
--- /dev/null
+++ b/src/pages/daftar-merchant/index.jsx
@@ -0,0 +1,53 @@
+import Seo from '@/core/components/Seo';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import CreateMerchant from '@/lib/merchant/components/Merchant';
+import ErrorMerchant from '@/lib/merchant/components/AccountSwitch';
+import getMerchantProgresApi from '@/lib/merchant/api/getMerchantProgresApi';
+import useAuth from '@/core/hooks/useAuth';
+import { useRouter } from 'next/router';
+import React, { useEffect, useState } from 'react';
+export default function DaftarMerchant() {
+  const router = useRouter();
+  const auth = useAuth();
+  const [isLoading, setIsLoading] = useState(true);
+  useEffect(() => {
+    const loadData = async () => {
+      setIsLoading(true);
+      try {
+        const data = await getMerchantProgresApi();
+        switch (data) {
+          case 'draft':
+            router.push(`/daftar-merchant/review`);
+            break;
+          case 'approve':
+            router.push(`/daftar-merchant/approve`);
+            break;
+          case 'reject':
+            router.push(`/daftar-merchant/reject`);
+            break;
+        }
+      } catch (error) {
+        console.error('Error loading profile:', error);
+        handleIsError(true); // Jika ada error, panggil fungsi error handler
+      }
+      setIsLoading(false);
+    };
+
+    loadData();
+  }, []);
+  if (auth == false) {
+    router.push(`/login?next=${encodeURIComponent('/daftar-merchant')}`);
+  }
+  if (!auth || isLoading) {
+    return;
+  }
+  return (
+    <>
+      <Seo title='Daftar Merchant - Indoteknik.com' />
+
+      <BasicLayout>
+        {auth && auth?.company ? <CreateMerchant /> : <ErrorMerchant />}
+      </BasicLayout>
+    </>
+  );
+}