Merge branch 'Feature/new-register' into Feature/switch-account

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 580aaeb8..ff6b1f12 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -29,7 +29,6 @@ const EditAddress = ({ id, defaultValues }) => {
     resolver: yupResolver(validationSchema),
     defaultValues,
   });
-
   const [cities, setCities] = useState([]);
   const [districts, setDistricts] = useState([]);
   const [subDistricts, setSubDistricts] = useState([]);
@@ -43,6 +42,7 @@ const EditAddress = ({ id, defaultValues }) => {
       setValue('npwp', dataProfile.npwp);
       setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak);
       setValue('alamat_bisnis', dataProfile.alamatBisnis);
+      setValue('business_name', dataProfile.name);
     };
     if (auth) loadProfile();
   }, [auth, setValue]);
@@ -103,7 +103,6 @@ const EditAddress = ({ id, defaultValues }) => {
       loadSubDistricts();
     }
   }, [watchDistrict, setValue, getValues]);
-
   const onSubmitHandler = async (values) => {
     const data = {
       ...values,
@@ -117,13 +116,15 @@ const EditAddress = ({ id, defaultValues }) => {
     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,
+        business_name: values.business_name,
+        name: values.business_name,
+        npwp: values.npwp,
       };
       isUpdated = await odooApi(
         'PUT',
@@ -133,7 +134,7 @@ const EditAddress = ({ id, defaultValues }) => {
     }
 
     // if (isUpdated?.id) {
-    if (address?.id) {
+    if (address?.id && isUpdated?.id) {
       toast.success('Berhasil mengubah alamat');
       router.back();
     } else {
@@ -195,6 +196,7 @@ const EditAddress = ({ id, defaultValues }) => {
                   placeholder='johndoe@example.com'
                   type='email'
                   className='form-input'
+                  disabled={auth?.partnerId == id && true}
                 />
                 <div className='text-caption-2 text-danger-500 mt-1'>
                   {errors.email?.message}