Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

1 files changed, 21 insertions, 8 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index b5b7e055..28ac8a5e 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -396,7 +396,7 @@ class User(controller.Controller):
             'user': request.env['res.users'].api_single_response(user)
         })
 
-    @http.route(prefix + 'user/<id>', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
+    @http.route(prefix + 'user/<id>', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def update_user(self, **kw):
         id = kw.get('id')
@@ -446,7 +446,7 @@ class User(controller.Controller):
 
         return self.response(address)
 
-    @http.route(prefix + 'user/<id>/switch', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
+    @http.route(prefix + 'user/<id>/switch', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def switch_account(self, **kw):
         id = int(kw.get('id'))
@@ -489,7 +489,7 @@ class User(controller.Controller):
 
         if type_acc == 'business':
             parameter = [
-                ('company_type', '=', 'company'),
+                ('is_company', '=', True),
                 ('name', 'ilike', business_name)
             ]
             if parent_id:
@@ -674,11 +674,11 @@ class User(controller.Controller):
         #     request_company.send_company_request_mail_switch()
 
         request_company.send_company_request_mail_switch()
-        response['switch'] = 'Pending'
+        response['switch'] = 'pending'
         return self.response(response)
 
     @http.route(prefix + 'user/<id>/switch_progres', auth='public', methods=['GET', 'OPTIONS'], csrf=False)
-    # @controller.Controller.must_authorized()
+    @controller.Controller.must_authorized()
     def switch_account_progres(self, **kw):
         id = int(kw.get('id'))
         # user = request.env['res.partner'].search([('id', '=', id)], limit=1)
@@ -691,15 +691,28 @@ class User(controller.Controller):
         new_company_request = request.env['user.company.request'].search(parameter, limit=1)
         is_approve = ''
         if new_company_request:
-            # Mengambil nilai is_approve
-            if new_company_request.is_approve == False:
+            if not new_company_request.is_approve:  # None atau ''
                 response['status'] = 'pending'
             else:
-                response['status'] = new_company_request.is_approve
+                response['status'] = new_company_request.is_approve  # 'approved' atau 'rejected'
         else:
             response['status'] = False
         return self.response(response)
 
+    # @http.route(prefix + 'user/<id>/parent_status', auth='public', methods=['GET', 'OPTIONS'], csrf=False)
+    # # @controller.Controller.must_authorized()
+    # def parent_status(self, **kw):
+    #     id = int(kw.get('id'))
+    #     response = {
+    #         'parentId': None,
+    #         'parentName': None
+    #     }
+    #     partner = request.env['res.partner'].sudo().search([('id', '=', id)], limit=1)
+    #     if partner and partner.parent_id:
+    #         response['parentId'] = partner.parent_id.id
+    #         response['parentName'] = partner.parent_id.name
+    #     return self.response(response)
+
     def get_user_by_email(self, email):
         return request.env['res.users'].search([
             ('login', '=', email),