2 files changed, 28 insertions, 21 deletions
diff --git a/src/lib/address/components/Addresses.jsx b/src/lib/address/components/Addresses.jsx
index a8879607..9ca617ae 100644
--- a/src/lib/address/components/Addresses.jsx
+++ b/src/lib/address/components/Addresses.jsx
@@ -149,6 +149,7 @@ const AddressCard = ({
   setSelectedForChange,
 }) => {
   const auth = useAuth();
+  const router = useRouter();
 
   return (
     <div
@@ -179,8 +180,12 @@ const AddressCard = ({
       </div>
       <button
         onClick={() => {
-          setSelectedForChange(address.id); // Set alamat yang dipilih
-          setChangeConfirmation(true); // Tampilkan popup konfirmasi
+          if (type == 'Contact Address' && auth.parentId) {
+            setSelectedForChange(address.id); // Set alamat yang dipilih
+            setChangeConfirmation(true); // Tampilkan popup konfirmasi
+          } else {
+            router.push(`/my/address/${address.id}/edit`);
+          }
         }}
         className='btn-light bg-white mt-3 w-full !text-gray_r-11'
       >
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 626709db..580aaeb8 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -37,7 +37,6 @@ const EditAddress = ({ id, defaultValues }) => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId });
-      setValue('name', dataProfile.name);
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
       setValue('taxName', dataProfile.taxName);
@@ -113,25 +112,28 @@ const EditAddress = ({ id, defaultValues }) => {
       district_id: values.district,
       sub_district_id: values.subDistrict,
     };
-    const dataAlamat = {
-      ...values,
-      id_user: auth.partnerId,
-      company_type_id: values.companyType,
-      industry_id: values.industry,
-      tax_name: values.taxName,
-      alamat_lengkap_text: values.alamat_wajib_pajak,
-      street: values.street,
-    };
-
-    // const address = await editAddressApi({ id, data });
-    const isUpdated = await odooApi(
-      'PUT',
-      `/api/v1/partner/${auth.parentId}`,
-      dataAlamat
-    );
+    const address = await editAddressApi({ id, data });
+    let dataAlamat;
+    let isUpdated = true;
+    if (auth?.partnerId == id) {
+      dataAlamat = {
+        ...values,
+        id_user: auth.partnerId,
+        company_type_id: values.companyType,
+        industry_id: values.industry,
+        tax_name: values.taxName,
+        alamat_lengkap_text: values.alamat_wajib_pajak,
+        street: values.street,
+      };
+      isUpdated = await odooApi(
+        'PUT',
+        `/api/v1/partner/${auth.parentId}`,
+        dataAlamat
+      );
+    }
 
-    if (isUpdated?.id) {
-      // if (address?.id && isUpdated?.id) {
+    // if (isUpdated?.id) {
+    if (address?.id) {
       toast.success('Berhasil mengubah alamat');
       router.back();
     } else {