Merge branch 'new-release' into feature/integrasi_biteship

# Conflicts:
#	src/lib/address/components/EditAddress.jsx

1 files changed, 23 insertions, 11 deletions

diff --git a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx
index 5bef5134..7cf201b7 100644
--- a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx
+++ b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx
@@ -173,11 +173,11 @@ const PengajuanTempo = () => {
         }
         return data; // Jika bukan object atau array, kembalikan nilai aslinya
       };
-
+      const payment = auth?.parentId ? auth?.parentId : auth?.partnerId;
       try {
         const dataPaymentTerm = await odooApi(
           'GET',
-          `/api/v1/partner/detail-tempo/${auth.parentId}`
+          `/api/v1/partner/detail-tempo/${payment}`
         );
         const transformedData = transformKeysToCamelCase(dataPaymentTerm);
         setBigData(transformedData);
@@ -191,7 +191,6 @@ const PengajuanTempo = () => {
 
   useEffect(() => {
     const cachedData = bigData;
-
     const loadBigData = async () => {
       if (cachedData) {
         // Ambil kunci-kunci yang relevan berdasarkan currentStep dari stepDivsForm
@@ -218,6 +217,10 @@ const PengajuanTempo = () => {
                   : String(bigData[key]); // Untuk tipe primitif
               // Kirim data yang sudah diubah ke string ke stepDivsUpdateForm
               stepDivsUpdateForm[currentStep](key, stringData);
+              if (key == 'dokumenProsedur') {
+                const stringData = bigData[key];
+                stepDivsUpdateForm[currentStep](key, stringData);
+              }
             }
           });
         }
@@ -293,11 +296,14 @@ const PengajuanTempo = () => {
     try {
       const address = await createPengajuanTempoApi({
         id: idTempo,
-        user_id: auth.parentId,
+        user_id: auth.parentId ? auth.parentId : auth.partnerId,
         partner_id: auth.partnerId,
         section: label,
         tempo_request: tempoRequest,
         ...formData,
+        formDokumenProsedur: formData.dokumenProsedur
+          ? JSON.stringify(formData.dokumenProsedur)
+          : false,
       });
       if (address.id) {
         setIdTempo(address.id);
@@ -341,7 +347,7 @@ const PengajuanTempo = () => {
     try {
       const address = await createPengajuanTempoApi({
         id: idTempo,
-        user_id: auth.parentId,
+        user_id: auth.parentId ? auth.parentId : auth.partnerId,
         partner_id: auth.partnerId,
         formDocs: JSON.stringify(formattedDokumen),
       });
@@ -402,7 +408,7 @@ const PengajuanTempo = () => {
     try {
       const address = await createPengajuanTempoApi({
         id: idTempo,
-        user_id: auth.parentId,
+        user_id: auth.parentId ? auth.parentId : auth.partnerId,
         partner_id: auth.partnerId,
         formSupplier: JSON.stringify(productOrder),
       });
@@ -447,7 +453,7 @@ const PengajuanTempo = () => {
       const address = await createPengajuanTempoApi({
         id: 0,
         partner_id: auth.partnerId,
-        user_id: auth.parentId,
+        user_id: auth.parentId ? auth.parentId : auth.partnerId,
         tempo_request: false,
         ...form,
       });
@@ -466,6 +472,9 @@ const PengajuanTempo = () => {
             user_id: address2.userId,
             tempo_request: false,
             ...formPengiriman,
+            formDokumenProsedur: formPengiriman.dokumenProsedur
+            ? JSON.stringify(formPengiriman.dokumenProsedur)
+            : false,
           });
           if (address3.id && formattedDokumen.length > 0) {
             // Kirim dokumen yang sudah difilter
@@ -518,7 +527,7 @@ const PengajuanTempo = () => {
       toast.dismiss(toastId);
       setIsLoading(false);
 
-      toast.error('Terjadi kesalahan dalam pengiriman formulir');
+      toast.error('Terjadi kesalahan dalam pengiriman formulir hehehehe');
       console.error(error);
     }
   };
@@ -647,11 +656,14 @@ const PengajuanTempo = () => {
               <TempoTermCondition onCheckChange={handleCheckChange} />
               <Button
                 colorScheme='red'
-                w={`${isMobile ? 'full' : '36'}`}
-                isDisabled={!isCheckedTNC}
+                w={`${isMobile ? 'full' : '48'}`}
+                isDisabled={!isCheckedTNC || isLoading}
                 onClick={handleDaftarTempo}
               >
-                Daftar Tempo {<ChevronRightIcon className='w-5' />}
+                {isLoading
+                  ? 'Loading...'
+                  : 'Daftar Tempo'}
+                  {!isLoading && <ChevronRightIcon className='w-5' />}
               </Button>
             </div>
           )}