Merge branch 'odoo-backup' into CR/form-merchant

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 21 insertions, 10 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index f71af89f..b5b7e055 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -98,7 +98,7 @@ class User(controller.Controller):
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = user.name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id = 395
             user.partner_id.property_account_payable_id = 438
         data = {
@@ -131,6 +131,7 @@ class User(controller.Controller):
         nama_wajib_pajak = kw.get('nama_wajib_pajak', False)
         is_pkp = kw.get('is_pkp')
         is_terdaftar = kw.get('is_terdaftar', False)
+        is_terdaftar = False if is_terdaftar == 'false' else is_terdaftar
         type_acc = kw.get('type_acc', 'individu') or 'individu'
 
         if not name or not email or not password:
@@ -162,16 +163,15 @@ class User(controller.Controller):
             'sel_groups_1_9_10': 9
         }
 
-        user = request.env['res.users'].create(user_data)
-        user.partner_id.email = email
-        user.partner_id.mobile = phone
+
 
         if type_acc == 'business' and business_name:
             # Eksekusi query SQL menggunakan Levenshtein distance
             query = """
                 SELECT id, name, levenshtein(name::text, %s) AS distance
                 FROM res_partner
-                WHERE levenshtein(name::text, %s) < 3   
+                WHERE is_company = true AND active = true
+                AND levenshtein(name::text, %s) < 3 
                 ORDER BY distance ASC
             """
             params = (business_name, business_name)
@@ -181,7 +181,9 @@ class User(controller.Controller):
             if result and is_terdaftar:
                 match_company_name = result[2]
                 match_company_id = result[0]
-
+                user = request.env['res.users'].create(user_data)
+                user.partner_id.email = email
+                user.partner_id.mobile = phone
                 # Create a user company request
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
@@ -189,6 +191,9 @@ class User(controller.Controller):
                     'user_input': business_name
                 })
             else:
+                if not result and is_terdaftar:
+                    response['reason'] = 'BISNIS_NOT_FOUND'
+                    return self.response(response)
                 if not nama_wajib_pajak and is_pkp == 'false':
                     nama_wajib_pajak = business_name
 
@@ -207,11 +212,15 @@ class User(controller.Controller):
                     'email': email_partner,
                     'street': alamat_bisnis,
                     'company_type': 'company',
-                    'user_id': 3222,
+                    'user_id': 11314,
                     'property_account_receivable_id': 395,
                     'property_account_payable_id': 438,
                     'active': False,
                 }
+
+                user = request.env['res.users'].create(user_data)
+                user.partner_id.email = email
+                user.partner_id.mobile = phone
                 new_company = request.env['res.partner'].create(new_company_data)
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
@@ -246,13 +255,15 @@ class User(controller.Controller):
                         'mimetype': sppkp_mimetype
                     })
                     new_company.message_post(body="SPPKP Uploaded", attachment_ids=[sppkp_attachment.id])
-
         if type_acc == 'individu':
+            user = request.env['res.users'].create(user_data)
+            user.partner_id.email = email
+            user.partner_id.mobile = phone
             user.partner_id.customer_type = 'nonpkp'
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id= 395
             user.partner_id.property_account_payable_id = 438
 
@@ -604,7 +615,7 @@ class User(controller.Controller):
                         'email': email_partner,
                         'street': alamat_bisnis,
                         'company_type': 'company',
-                        'user_id': 3222,
+                        'user_id': 11314,
                         'property_account_receivable_id': 395,
                         'property_account_payable_id': 438,
                         'active': False,