<iman> update code

2 files changed, 19 insertions, 7 deletions

diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index fcf7e4db..ebf5de08 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -333,15 +333,23 @@ class Partner(controller.Controller):
             'streetInvoice': ['alias:street_invoice'],
             'stateInvoice': ['alias:state_id_invoice'],
             'cityInvoice': ['alias:city_id_invoice'],
-            'isSameAddrees':['alias:is_same_address'],
-            'isSameAddreesStreet': ['alias:is_same_address_street'],
         })
 
+        # Konversi nilai 'true' ke boolean True
+        is_same_address = kw.get('isSameAddrees', 'false').lower() == 'true'
+        is_same_address_street = kw.get('isSameAddreesStreet', 'false').lower() == 'true'
+
+        # Tambahkan nilai yang dikonversi ke params
+        if kw.get('isSameAddrees') != '':
+            params['value']['is_same_address'] = is_same_address
+        if kw.get('isSameAddreesStreet') != '':
+            params['value']['is_same_address_street'] = is_same_address_street
+
         if not params['valid']:
             return self.response(code=400, description=params)
 
-        # Filter data baru yang dikirim (non-kosong)
-        new_data = {key: value for key, value in params['value'].items() if value}
+        # Filter data baru yang dikirim (non-kosong, boolean False tetap masuk)
+        new_data = {key: value for key, value in params['value'].items() if value != ''}
 
         if pengajuan_tempo:
             # Jika pengajuan_tempo sudah ada, hanya write data baru yang non-kosong
@@ -431,7 +439,7 @@ class Partner(controller.Controller):
         user_tempo_request = []
         if tempo_request:
             user_tempo_request = request.env['user.pengajuan.tempo.request'].create({
-                'user_id': user.id,
+                'user_id': id,
                 'pengajuan_tempo_id': pengajuan_tempo.id,
                 'user_company_id': partner_id.id,
                 'tempo_duration': pengajuan_tempo.tempo_duration.id,
@@ -496,7 +504,7 @@ class Partner(controller.Controller):
                 return http.Response(status=400, json_body={'error': 'Invalid JSON format for formDokumen'})
 
 
-            pengajuan_tempo.user_id = user_account.id
+            # pengajuan_tempo.user_id = id
             template = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_request_tempo_review')
             template.send_mail(pengajuan_tempo.id, force_send=True)
             template2 = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_new_tempo_to_sales')
diff --git a/indoteknik_api/controllers/api_v1/state.py b/indoteknik_api/controllers/api_v1/state.py
index 598ef70b..958359a7 100644
--- a/indoteknik_api/controllers/api_v1/state.py
+++ b/indoteknik_api/controllers/api_v1/state.py
@@ -8,7 +8,11 @@ class District(controller.Controller):
     @http.route(prefix + 'state', auth='public', methods=['GET', 'OPTIONS'])
     @controller.Controller.must_authorized()
     def get_state(self, **kw):
+        tempo = kw.get('tempo')
         parameters = []
+        if tempo == 'true':
+            parameters.append(('country_id', '=', 100))
+
         
         name = kw.get('name')
         if name:
@@ -18,7 +22,7 @@ class District(controller.Controller):
         states = request.env['res.country.state'].search(parameters)
         data = []
         for state in states:
-            data.append({ 'id': state.id, 'name': state.name })
+            data.append({ 'id': state.id, 'name': state.name})
         
         return self.response(data)