From e1ecdbe5dd1857d1aa2f3317c0d763241ebaa6e5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 9 Jan 2025 17:09:17 +0700
Subject: <iman> update code

---
 src/lib/merchant/components/Merchant.jsx | 273 +++++++++++++++++++++++++++++++
 1 file changed, 273 insertions(+)
 create mode 100644 src/lib/merchant/components/Merchant.jsx

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
new file mode 100644
index 00000000..30ad0130
--- /dev/null
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -0,0 +1,273 @@
+import React from 'react';
+import { useMemo, useState, useEffect, useRef } from 'react';
+import Image from '~/components/ui/image';
+import InformasiPerusahaan from './InformasiPerusahaan';
+import InformasiVendor from './InformasiVendor';
+import SyaratDagang from './SyaratDagang';
+import { getAuth } from '~/libs/auth';
+import { setAuth } from '@/core/utils/auth';
+import useAuth from '@/core/hooks/useAuth';
+import { useRouter } from 'next/router';
+import { Controller, useForm } from 'react-hook-form';
+import { ChevronRightIcon, ChevronLeftIcon } from '@heroicons/react/24/outline';
+import { Button, Checkbox, Spinner, Tooltip } from '@chakra-ui/react';
+import clsxm from '~/libs/clsxm';
+import { toast } from 'react-hot-toast';
+import useDevice from '@/core/hooks/useDevice';
+import odooApi from '~/libs/odooApi';
+import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
+import PageContent from '@/lib/content/components/PageContent';
+const Merchant = () => {
+  const { isDesktop, isMobile } = useDevice();
+  const [currentStep, setCurrentStep] = React.useState(0);
+  const NUMBER_OF_STEPS = 6;
+  const [isLoading, setIsLoading] = useState(false);
+  const [bigData, setBigData] = useState();
+  const [idTempo, setIdTempo] = useState(0);
+  const { control, watch, setValue } = useForm();
+  const auth = useAuth();
+  const router = useRouter();
+  const [BannerTempo, setBannerTempo] = useState();
+  const [notValid, setNotValid] = useState(false);
+  const [buttonSubmitClick, setButtonSubmitClick] = useState(false);
+  const stepDivs = [
+    <InformasiPerusahaan />,
+    <InformasiVendor />,
+    <SyaratDagang />,
+  ];
+
+  const stepLabels = [
+    'informasi_perusahaan',
+    'kontak_person',
+    'Pengiriman',
+    'Referensi',
+    'Dokumen',
+    'Konfirmasi',
+  ];
+
+  // useEffect(() => {
+  //   const loadBigData = async () => {
+  //     const toCamelCase = (str) =>
+  //       str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+
+  //     const transformKeysToCamelCase = (data) => {
+  //       if (Array.isArray(data)) {
+  //         return data.map((item) => transformKeysToCamelCase(item));
+  //       } else if (data && typeof data === 'object') {
+  //         return Object.keys(data).reduce((acc, key) => {
+  //           const camelKey = toCamelCase(key); // Ubah kunci menjadi camelCase
+  //           acc[camelKey] = transformKeysToCamelCase(data[key]); // Rekursif untuk nested object atau array
+  //           return acc;
+  //         }, {});
+  //       }
+  //       return data; // Jika bukan object atau array, kembalikan nilai aslinya
+  //     };
+
+  //     try {
+  //       const dataPaymentTerm = await odooApi(
+  //         'GET',
+  //         `/api/v1/partner/detail-tempo/${auth.parentId}`
+  //       );
+  //       const transformedData = transformKeysToCamelCase(dataPaymentTerm);
+  //       setBigData(transformedData);
+  //     } catch (error) {
+  //       console.error('Error loading dataPaymentTerm:', error);
+  //     }
+  //   };
+
+  //   loadBigData();
+  // }, [auth]);
+
+  // useEffect(() => {
+  //   const cachedData = bigData;
+
+  //   const loadBigData = async () => {
+  //     if (cachedData) {
+  //       // Ambil kunci-kunci yang relevan berdasarkan currentStep dari stepDivsForm
+  //       const formKeys = stepDivsForm[currentStep]
+  //         ? Object.keys(stepDivsForm[currentStep])
+  //         : [];
+  //       if (currentStep === 3) {
+  //         stepDivsUpdateForm[currentStep](cachedData.supplierIds);
+  //       } else if (currentStep === 4) {
+  //         formKeys.forEach((key) => {
+  //           if (cachedData[key]) {
+  //             // Proses hanya kunci yang ada di cachedData
+  //             const { name, format, base64 } = cachedData[key];
+  //             stepDivsUpdateForm[currentStep](key, name, format, base64);
+  //           }
+  //         });
+  //       } else {
+  //         formKeys.forEach((key) => {
+  //           if (bigData[key]) {
+  //             // Ubah data menjadi string
+  //             const stringData =
+  //               typeof bigData[key] === 'object'
+  //                 ? JSON.stringify(bigData[key]) // Untuk objek atau array
+  //                 : String(bigData[key]); // Untuk tipe primitif
+  //             // Kirim data yang sudah diubah ke string ke stepDivsUpdateForm
+  //             stepDivsUpdateForm[currentStep](key, stringData);
+  //           }
+  //         });
+  //       }
+  //     }
+  //   };
+  //   loadBigData();
+  //   validate();
+  //   validateKontakPerson();
+  //   validatePengiriman();
+  //   validateDokumen();
+  //   validateSupplier();
+  //   updateHasSave(true);
+  // }, [currentStep, bigData, auth]);
+
+  const goToNextStep = () => {
+    // if (!isFormValid) {
+    //   setNotValid(true);
+    //   setButtonSubmitClick(!buttonSubmitClick);
+    //   return;
+    // } else {
+    //   // saveToLocalStorage(stepLabels[currentStep], stepDivsForm[currentStep]);
+    //   if (currentStep == 3) {
+    //     handleDaftarTempoSupplier();
+    //   } else if (currentStep == 4) {
+    //     handleDaftarTempoDokumen();
+    //   } else {
+    //     handleDaftarTempoPerPage(
+    //       stepLabels[currentStep],
+    //       stepDivsForm[currentStep]
+    //     );
+    //   }
+    //   setButtonSubmitClick(!buttonSubmitClick);
+    //   setNotValid(false);
+    // }
+    setCurrentStep((prev) => (prev === NUMBER_OF_STEPS - 1 ? prev : prev + 1));
+  };
+
+  const goPrevStep = () => {
+    setCurrentStep((prev) => (prev === NUMBER_OF_STEPS - 1 ? prev : prev - 1));
+  };
+
+  useEffect(() => {
+    const getBanner = async () => {
+      const get = await odooApi('GET', '/api/v1/banner?type=banner-form-tempo');
+      // setBannerTempo(get[0].image);
+      setBannerTempo(
+        'https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/431'
+      );
+    };
+    getBanner();
+  }, []);
+  return (
+    <>
+      <div className='container flex flex-col items-center '>
+        {BannerTempo && (
+          <Image
+            src={BannerTempo}
+            alt='FORM Tempo'
+            width={500}
+            height={160}
+            className='w-full mt-6'
+          />
+        )}
+        <h1 className=' font-semibold text-center mb-6'>
+          Form Pengajuan Tempo
+        </h1>
+        <p
+          className={`text-center  ${
+            isMobile ? 'w-full text-sm' : 'w-3/4 mb-4'
+          }`}
+        >
+          Pembayaran tempo adalah layanan pembayaran berjangka yang difasilitasi
+          indoteknik.com untuk konsumen akun bisnis yang terdaftar dengan waktu
+          pembayaran mulai dari 7, 14, 21 hingga 30 Hari.
+        </p>
+      </div>
+      <div
+        className={`h-[2px] w-full ${isMobile ? 'mt-4' : 'mb-4'}  bg-gray_r-3`}
+      />
+
+      <div className={`container ${isMobile ? 'mt-4' : ''} flex flex-col`}>
+        <div>{stepDivs[currentStep]}</div>
+        {isDesktop && <section className='flex gap-10 mt-10'></section>}
+        {isMobile && (
+          <div className='h-[2px] bg-gray-300 w-[120%] inset-0 mt-4 mb-4 relative transform -translate-x-5'></div>
+        )}
+        <div
+          className={`flex ${
+            isMobile
+              ? 'flex-col justify-start items-start'
+              : 'flex-col justify-end items-end'
+          }    mb-8 gap-2`}
+        >
+          <span className='text-xs opacity-60'>
+            *Pastikan data yang anda masukan sudah benar dan sesuai
+          </span>
+          <div
+            className={` flex flex-row ${
+              currentStep > 0 && currentStep < 5
+                ? 'justify-between'
+                : 'justify-end'
+            } items-center w-full ${isMobile ? 'gap-x-4 ' : ''}`}
+          >
+            {currentStep < 5 && currentStep > 0 && (
+              <Button
+                colorScheme='yellow'
+                w={`${isMobile ? 'full' : 'fit'}`}
+                onClick={goPrevStep}
+              >
+                {<ChevronLeftIcon className='w-5' />}
+                <span className={`font-medium ${isMobile ? 'text-xs' : ''} `}>
+                  Langkah Sebelumnya
+                </span>
+              </Button>
+            )}
+            {currentStep < 5 && (
+              <>
+                <Tooltip
+                  label={clsxm({
+                    'Klik simpan data terlebih dahulu':
+                      currentStep === 3 && !hasSavedata,
+                  })}
+                >
+                  <Button
+                    colorScheme='red'
+                    w={`${isMobile ? 'full' : 'fit'}`}
+                    isDisabled={
+                      (currentStep === 3 && !hasSavedata) ||
+                      currentStep === NUMBER_OF_STEPS - 1
+                    }
+                    onClick={goToNextStep}
+                  >
+                    <span className={`${isMobile ? 'text-xs' : ''} `}>
+                      Langkah Selanjutnya
+                    </span>
+                    {<ChevronRightIcon className='w-5' />}
+                  </Button>
+                </Tooltip>
+              </>
+            )}
+          </div>
+          {currentStep == 5 && (
+            <div
+              className={`flex flex-col ${
+                isMobile ? 'items-start' : 'items-end'
+              } w-full justify-start gap-4`}
+            >
+              <Button
+                colorScheme='red'
+                w={`${isMobile ? 'full' : '36'}`}
+                isDisabled={!isCheckedTNC}
+                onClick={handleDaftarTempo}
+              >
+                Daftar Tempo {<ChevronRightIcon className='w-5' />}
+              </Button>
+            </div>
+          )}
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default Merchant;
-- 
cgit v1.2.3


From c42e3256fa8f059a937629b1e44a2dc50d736928 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 10 Jan 2025 13:33:16 +0700
Subject: <iman> update code

---
 src/lib/merchant/components/Merchant.jsx | 57 +++++++++++++++++---------------
 1 file changed, 31 insertions(+), 26 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 30ad0130..c4661d46 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -4,6 +4,7 @@ import Image from '~/components/ui/image';
 import InformasiPerusahaan from './InformasiPerusahaan';
 import InformasiVendor from './InformasiVendor';
 import SyaratDagang from './SyaratDagang';
+import Dokumen from './Dokumen';
 import { getAuth } from '~/libs/auth';
 import { setAuth } from '@/core/utils/auth';
 import useAuth from '@/core/hooks/useAuth';
@@ -20,7 +21,7 @@ import PageContent from '@/lib/content/components/PageContent';
 const Merchant = () => {
   const { isDesktop, isMobile } = useDevice();
   const [currentStep, setCurrentStep] = React.useState(0);
-  const NUMBER_OF_STEPS = 6;
+  const NUMBER_OF_STEPS = 5;
   const [isLoading, setIsLoading] = useState(false);
   const [bigData, setBigData] = useState();
   const [idTempo, setIdTempo] = useState(0);
@@ -30,10 +31,19 @@ const Merchant = () => {
   const [BannerTempo, setBannerTempo] = useState();
   const [notValid, setNotValid] = useState(false);
   const [buttonSubmitClick, setButtonSubmitClick] = useState(false);
+
+  const [error, setError] = useState(false);
+
+  const handleIsError = (value) => {
+    console.log('value yang dihasilkan', value);
+    goToNextStep();
+    setError(value); // Memperbarui state berdasarkan isError
+  };
   const stepDivs = [
-    <InformasiPerusahaan />,
-    <InformasiVendor />,
+    <InformasiVendor handleIsError={handleIsError} />,
+    <InformasiPerusahaan handleIsError={handleIsError} />,
     <SyaratDagang />,
+    <Dokumen />,
   ];
 
   const stepLabels = [
@@ -45,6 +55,13 @@ const Merchant = () => {
     'Konfirmasi',
   ];
 
+  useEffect(() => {
+    window.scrollTo({
+      top: 0,
+      behavior: 'smooth',
+    });
+  }, [currentStep]);
+
   // useEffect(() => {
   //   const loadBigData = async () => {
   //     const toCamelCase = (str) =>
@@ -170,9 +187,7 @@ const Merchant = () => {
             className='w-full mt-6'
           />
         )}
-        <h1 className=' font-semibold text-center mb-6'>
-          Form Pengajuan Tempo
-        </h1>
+        <h1 className=' font-semibold text-center mb-6'>Form Merchant</h1>
         <p
           className={`text-center  ${
             isMobile ? 'w-full text-sm' : 'w-3/4 mb-4'
@@ -224,27 +239,17 @@ const Merchant = () => {
             )}
             {currentStep < 5 && (
               <>
-                <Tooltip
-                  label={clsxm({
-                    'Klik simpan data terlebih dahulu':
-                      currentStep === 3 && !hasSavedata,
-                  })}
+                <Button
+                  colorScheme='red'
+                  w={`${isMobile ? 'full' : 'fit'}`}
+                  isDisabled={currentStep === NUMBER_OF_STEPS - 1}
+                  onClick={goToNextStep}
                 >
-                  <Button
-                    colorScheme='red'
-                    w={`${isMobile ? 'full' : 'fit'}`}
-                    isDisabled={
-                      (currentStep === 3 && !hasSavedata) ||
-                      currentStep === NUMBER_OF_STEPS - 1
-                    }
-                    onClick={goToNextStep}
-                  >
-                    <span className={`${isMobile ? 'text-xs' : ''} `}>
-                      Langkah Selanjutnya
-                    </span>
-                    {<ChevronRightIcon className='w-5' />}
-                  </Button>
-                </Tooltip>
+                  <span className={`${isMobile ? 'text-xs' : ''} `}>
+                    Langkah Selanjutnya
+                  </span>
+                  {<ChevronRightIcon className='w-5' />}
+                </Button>
               </>
             )}
           </div>
-- 
cgit v1.2.3


From fb04f8d327aafa2eb5440ade12919e1f07c2c1c1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 10 Jan 2025 16:34:43 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index c4661d46..60c1b751 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -40,9 +40,9 @@ const Merchant = () => {
     setError(value); // Memperbarui state berdasarkan isError
   };
   const stepDivs = [
+    <SyaratDagang handleIsError={handleIsError}/>,
     <InformasiVendor handleIsError={handleIsError} />,
     <InformasiPerusahaan handleIsError={handleIsError} />,
-    <SyaratDagang />,
     <Dokumen />,
   ];
 
-- 
cgit v1.2.3


From ea5c6ef19717dc0eb6e1879cb48704064a263596 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 11 Jan 2025 10:01:34 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 60c1b751..a6f923e3 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -40,10 +40,10 @@ const Merchant = () => {
     setError(value); // Memperbarui state berdasarkan isError
   };
   const stepDivs = [
-    <SyaratDagang handleIsError={handleIsError}/>,
+    <Dokumen handleIsError={handleIsError} />,
+    <SyaratDagang handleIsError={handleIsError} />,
     <InformasiVendor handleIsError={handleIsError} />,
     <InformasiPerusahaan handleIsError={handleIsError} />,
-    <Dokumen />,
   ];
 
   const stepLabels = [
-- 
cgit v1.2.3


From 3692f937130e18cf396f5871d8a15bdd258bdd2b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 13 Jan 2025 16:37:28 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index a6f923e3..59f80be5 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -40,10 +40,10 @@ const Merchant = () => {
     setError(value); // Memperbarui state berdasarkan isError
   };
   const stepDivs = [
-    <Dokumen handleIsError={handleIsError} />,
-    <SyaratDagang handleIsError={handleIsError} />,
-    <InformasiVendor handleIsError={handleIsError} />,
     <InformasiPerusahaan handleIsError={handleIsError} />,
+    <InformasiVendor handleIsError={handleIsError} />,
+    <SyaratDagang handleIsError={handleIsError} />,
+    <Dokumen handleIsError={handleIsError} />,
   ];
 
   const stepLabels = [
@@ -208,7 +208,7 @@ const Merchant = () => {
         {isMobile && (
           <div className='h-[2px] bg-gray-300 w-[120%] inset-0 mt-4 mb-4 relative transform -translate-x-5'></div>
         )}
-        <div
+        {/* <div
           className={`flex ${
             isMobile
               ? 'flex-col justify-start items-start'
@@ -269,7 +269,7 @@ const Merchant = () => {
               </Button>
             </div>
           )}
-        </div>
+        </div> */}
       </div>
     </>
   );
-- 
cgit v1.2.3


From b9b4eb3ed751a69c023a45e7cdca8da01ae6b1cd Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 15 Jan 2025 13:21:48 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 59f80be5..a995cb19 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -36,7 +36,9 @@ const Merchant = () => {
 
   const handleIsError = (value) => {
     console.log('value yang dihasilkan', value);
-    goToNextStep();
+    if (!value) {
+      goToNextStep();
+    }
     setError(value); // Memperbarui state berdasarkan isError
   };
   const stepDivs = [
-- 
cgit v1.2.3


From cb083185ce59df7143ea258e147a118a1e416e56 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 20 Jan 2025 10:33:19 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 54 ++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 16 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index a995cb19..28244be6 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -5,6 +5,7 @@ import InformasiPerusahaan from './InformasiPerusahaan';
 import InformasiVendor from './InformasiVendor';
 import SyaratDagang from './SyaratDagang';
 import Dokumen from './Dokumen';
+import Konfirmasi from './Konfirmasi';
 import { getAuth } from '~/libs/auth';
 import { setAuth } from '@/core/utils/auth';
 import useAuth from '@/core/hooks/useAuth';
@@ -35,17 +36,30 @@ const Merchant = () => {
   const [error, setError] = useState(false);
 
   const handleIsError = (value) => {
-    console.log('value yang dihasilkan', value);
+    console.log('LAHKAH SELANJUTNYA', value);
     if (!value) {
       goToNextStep();
     }
     setError(value); // Memperbarui state berdasarkan isError
   };
   const stepDivs = [
-    <InformasiPerusahaan handleIsError={handleIsError} />,
-    <InformasiVendor handleIsError={handleIsError} />,
-    <SyaratDagang handleIsError={handleIsError} />,
-    <Dokumen handleIsError={handleIsError} />,
+    <InformasiPerusahaan
+      handleIsError={handleIsError}
+      buttonSubmitClick={buttonSubmitClick}
+    />,
+    <InformasiVendor
+      handleIsError={handleIsError}
+      buttonSubmitClick={buttonSubmitClick}
+    />,
+    <SyaratDagang
+      handleIsError={handleIsError}
+      buttonSubmitClick={buttonSubmitClick}
+    />,
+    <Dokumen
+      handleIsError={handleIsError}
+      buttonSubmitClick={buttonSubmitClick}
+    />,
+    <Konfirmasi handleIsError={handleIsError} />,
   ];
 
   const stepLabels = [
@@ -64,6 +78,11 @@ const Merchant = () => {
     });
   }, [currentStep]);
 
+  useEffect(() => {
+    <InformasiPerusahaan buttonSubmitClick={buttonSubmitClick} />;
+    console.log('MASUK SINI');
+  }, [buttonSubmitClick]);
+
   // useEffect(() => {
   //   const loadBigData = async () => {
   //     const toCamelCase = (str) =>
@@ -166,6 +185,9 @@ const Merchant = () => {
   const goPrevStep = () => {
     setCurrentStep((prev) => (prev === NUMBER_OF_STEPS - 1 ? prev : prev - 1));
   };
+  const handleDaftarMerchant = () => {
+    setButtonSubmitClick((prev) => !prev);
+  };
 
   useEffect(() => {
     const getBanner = async () => {
@@ -210,17 +232,17 @@ const Merchant = () => {
         {isMobile && (
           <div className='h-[2px] bg-gray-300 w-[120%] inset-0 mt-4 mb-4 relative transform -translate-x-5'></div>
         )}
-        {/* <div
+        <div
           className={`flex ${
             isMobile
               ? 'flex-col justify-start items-start'
               : 'flex-col justify-end items-end'
           }    mb-8 gap-2`}
         >
-          <span className='text-xs opacity-60'>
+          {/* <span className='text-xs opacity-60'>
             *Pastikan data yang anda masukan sudah benar dan sesuai
-          </span>
-          <div
+          </span> */}
+          {/* <div
             className={` flex flex-row ${
               currentStep > 0 && currentStep < 5
                 ? 'justify-between'
@@ -254,8 +276,8 @@ const Merchant = () => {
                 </Button>
               </>
             )}
-          </div>
-          {currentStep == 5 && (
+          </div> */}
+          {/* {currentStep == 0 && (
             <div
               className={`flex flex-col ${
                 isMobile ? 'items-start' : 'items-end'
@@ -264,14 +286,14 @@ const Merchant = () => {
               <Button
                 colorScheme='red'
                 w={`${isMobile ? 'full' : '36'}`}
-                isDisabled={!isCheckedTNC}
-                onClick={handleDaftarTempo}
+                // isDisabled={!isCheckedTNC}
+                onClick={handleDaftarMerchant}
               >
-                Daftar Tempo {<ChevronRightIcon className='w-5' />}
+                Daftar Merchant {<ChevronRightIcon className='w-5' />}
               </Button>
             </div>
-          )}
-        </div> */}
+          )} */}
+        </div>
       </div>
     </>
   );
-- 
cgit v1.2.3


From 238c675eecaf6f4f953d87c4b0a128bfa139cff4 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 22 Jan 2025 10:06:37 +0700
Subject: <iman> update merchant

---
 src/lib/merchant/components/Merchant.jsx | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 28244be6..a92619b6 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -36,7 +36,6 @@ const Merchant = () => {
   const [error, setError] = useState(false);
 
   const handleIsError = (value) => {
-    console.log('LAHKAH SELANJUTNYA', value);
     if (!value) {
       goToNextStep();
     }
@@ -80,7 +79,6 @@ const Merchant = () => {
 
   useEffect(() => {
     <InformasiPerusahaan buttonSubmitClick={buttonSubmitClick} />;
-    console.log('MASUK SINI');
   }, [buttonSubmitClick]);
 
   // useEffect(() => {
-- 
cgit v1.2.3


From 5eed16f154dee8e72d9ac55ff5eb8a958e0e6db1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 16 May 2025 08:44:23 +0700
Subject: Form Merchant

---
 src/lib/merchant/components/Merchant.jsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 3c16e3ba..7323f14a 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -16,7 +16,7 @@ import { Button, Checkbox, Spinner, Tooltip } from '@chakra-ui/react';
 import clsxm from '~/libs/clsxm';
 import { toast } from 'react-hot-toast';
 import useDevice from '@/core/hooks/useDevice';
-import odooApi from '~/libs/odooApi';
+import odooApi from '@/core/api/odooApi';
 import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
 import PageContent from '@/lib/content/components/PageContent';
 const Merchant = () => {
@@ -54,10 +54,6 @@ const Merchant = () => {
       handleIsError={handleIsError}
       buttonSubmitClick={buttonSubmitClick}
     />,
-    <Dokumen
-      handleIsError={handleIsError}
-      buttonSubmitClick={buttonSubmitClick}
-    />,
     <Konfirmasi handleIsError={handleIsError} />,
   ];
 
@@ -66,7 +62,6 @@ const Merchant = () => {
     'kontak_person',
     'Pengiriman',
     'Referensi',
-    'Dokumen',
     'Konfirmasi',
   ];
 
@@ -111,7 +106,7 @@ const Merchant = () => {
             className='w-full mt-6'
           />
         )}
-        <h1 className=' font-semibold text-center mb-6'>Form Merchant</h1>
+        <h1 className=' font-semibold text-center mb-6'>Form Pendafataran Merchant</h1>
         <p
           className={`text-center  ${
             isMobile ? 'w-full text-sm' : 'w-3/4 mb-4'
-- 
cgit v1.2.3


From 0a5e12b03eee0f559a19f7dce861161ff2ce5a49 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 May 2025 11:13:33 +0700
Subject: Revert "Form Merchant"

This reverts commit 5eed16f154dee8e72d9ac55ff5eb8a958e0e6db1.
---
 src/lib/merchant/components/Merchant.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/merchant/components/Merchant.jsx')

diff --git a/src/lib/merchant/components/Merchant.jsx b/src/lib/merchant/components/Merchant.jsx
index 7323f14a..3c16e3ba 100644
--- a/src/lib/merchant/components/Merchant.jsx
+++ b/src/lib/merchant/components/Merchant.jsx
@@ -16,7 +16,7 @@ import { Button, Checkbox, Spinner, Tooltip } from '@chakra-ui/react';
 import clsxm from '~/libs/clsxm';
 import { toast } from 'react-hot-toast';
 import useDevice from '@/core/hooks/useDevice';
-import odooApi from '@/core/api/odooApi';
+import odooApi from '~/libs/odooApi';
 import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
 import PageContent from '@/lib/content/components/PageContent';
 const Merchant = () => {
@@ -54,6 +54,10 @@ const Merchant = () => {
       handleIsError={handleIsError}
       buttonSubmitClick={buttonSubmitClick}
     />,
+    <Dokumen
+      handleIsError={handleIsError}
+      buttonSubmitClick={buttonSubmitClick}
+    />,
     <Konfirmasi handleIsError={handleIsError} />,
   ];
 
@@ -62,6 +66,7 @@ const Merchant = () => {
     'kontak_person',
     'Pengiriman',
     'Referensi',
+    'Dokumen',
     'Konfirmasi',
   ];
 
@@ -106,7 +111,7 @@ const Merchant = () => {
             className='w-full mt-6'
           />
         )}
-        <h1 className=' font-semibold text-center mb-6'>Form Pendafataran Merchant</h1>
+        <h1 className=' font-semibold text-center mb-6'>Form Merchant</h1>
         <p
           className={`text-center  ${
             isMobile ? 'w-full text-sm' : 'w-3/4 mb-4'
-- 
cgit v1.2.3

