Merged in CR/form-merchant (pull request #310)odoo-production

odoo quotation view & merchant view

1 files changed, 18 insertions, 6 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index c0974367..967bbcc9 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -60,7 +60,9 @@ class User(controller.Controller):
                 'user': self.response_with_token(user),
             }
             return self.response(data)
-        except:
+        except Exception as e:
+            respon = str(e)
+            print(respon)
             return self.response({
                 'is_auth': False,
                 'reason': 'NOT_FOUND'
@@ -131,6 +133,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,9 +165,7 @@ 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
@@ -182,7 +183,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,
@@ -190,6 +193,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
 
@@ -213,6 +219,10 @@ class User(controller.Controller):
                     '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,
@@ -247,8 +257,10 @@ 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 = '-'