Merge branch 'new-release' into feature/integrasi_biteship

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

3 files changed, 14 insertions, 11 deletions

diff --git a/src/lib/address/api/stateApi.js b/src/lib/address/api/stateApi.js
index cea49e7e..6bfd36d2 100644
--- a/src/lib/address/api/stateApi.js
+++ b/src/lib/address/api/stateApi.js
@@ -1,8 +1,8 @@
-import odooApi from '@/core/api/odooApi'
+import odooApi from '@/core/api/odooApi';
 
-const stateApi = async () => {
-  const dataState = await odooApi('GET', '/api/v1/state')
-  return dataState
-}
+const stateApi = async ({ tempo = false }) => {
+  const dataState = await odooApi('GET', `/api/v1/state?tempo=${tempo}`);
+  return dataState;
+};
 
-export default stateApi
\ No newline at end of file
+export default stateApi;
diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx
index 5f041eb2..8c51dd89 100644
--- a/src/lib/address/components/CreateAddress.jsx
+++ b/src/lib/address/components/CreateAddress.jsx
@@ -64,7 +64,7 @@ const CreateAddress = () => {
 
   useEffect(() => {
     const loadState = async () => {
-      let dataState = await stateApi();
+      let dataState = await stateApi({ tempo: false });
       dataState = dataState.map((state) => ({
         value: state.id,
         label: state.name,
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 7675db9d..60ca20b7 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -79,13 +79,16 @@ const EditAddress = ({ id, defaultValues }) => {
       setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak);
       setValue('alamat_bisnis', dataProfile.alamatBisnis);
       setValue('business_name', dataProfile.name);
+      setValue('city', dataProfile.city?.id);
+      setValue('district', dataProfile.district?.id);
+      setValue('subDistrict', dataProfile.subDistrict?.id);
     };
     if (auth) loadProfile();
   }, [auth?.parentId]);
 
   useEffect(() => {
     const loadStates = async () => {
-      let dataStates = await stateApi();
+      let dataStates = await stateApi({ tempo: false });
       dataStates = dataStates.map((state) => ({
         value: state.id,
         label: state.name,
@@ -133,8 +136,8 @@ const EditAddress = ({ id, defaultValues }) => {
 
   const watchCity = watch('city');
   useEffect(() => {
-    setValue('district', '');
     if (watchCity) {
+      // setValue('district', '');
       const loadDistricts = async () => {
         let dataDistricts = await districtApi({ cityId: watchCity });
         dataDistricts = dataDistricts.map((district) => ({
@@ -144,7 +147,7 @@ const EditAddress = ({ id, defaultValues }) => {
         setDistricts(dataDistricts);
         let oldDistrict = getValues('oldDistrict');
         if (oldDistrict) {
-          setValue('district', oldDistrict);
+          // setValue('district', oldDistrict);
           setValue('oldDistrict', '');
         }
       };
@@ -171,8 +174,8 @@ const EditAddress = ({ id, defaultValues }) => {
 
   const watchDistrict = watch('district');
   useEffect(() => {
-    setValue('subDistrict', '');
     if (watchDistrict) {
+      // setValue('subDistrict', '');
       const loadSubDistricts = async () => {
         let dataSubDistricts = await subDistrictApi({
           districtId: watchDistrict,