[18.0] [MIG] website_oca_integrator

Author: Kiplangatdan

requirements.txt

@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+responses

website_oca_integrator/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ======================
 Website OCA Integrator
 ======================
@@ -17,17 +13,17 @@ Website OCA Integrator
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Foca--custom-lightgray.png?logo=github
-    :target: https://github.com/OCA/oca-custom/tree/14.0/website_oca_integrator
+    :target: https://github.com/OCA/oca-custom/tree/18.0/website_oca_integrator
     :alt: OCA/oca-custom
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/oca-custom-14-0/oca-custom-14-0-website_oca_integrator
+    :target: https://translation.odoo-community.org/projects/oca-custom-18-0/oca-custom-18-0-website_oca_integrator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/oca-custom&target_branch=14.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/oca-custom&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -46,29 +42,29 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/oca-custom/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/oca-custom/issues/new?body=module:%20website_oca_integrator%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/oca-custom/issues/new?body=module:%20website_oca_integrator%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
 Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Surekha Technologies
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-  * Víctor M.M. Torres
-  * Carlos Roca
-  * Ernesto Tejeda
+  - Víctor M.M. Torres
+  - Carlos Roca
+  - Ernesto Tejeda
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -80,6 +76,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/oca-custom <https://github.com/OCA/oca-custom/tree/14.0/website_oca_integrator>`_ project on GitHub.
+This module is part of the `OCA/oca-custom <https://github.com/OCA/oca-custom/tree/18.0/website_oca_integrator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_oca_integrator/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Website OCA Integrator",
     "summary": "Displays Integrators in website.",
-    "version": "14.0.1.0.1",
+    "version": "18.0.1.0.1",
     "category": "Website",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/oca-custom",
@@ -13,15 +13,14 @@
         "website",
         "website_crm_partner_assign",
         "website_sale",
-        "website_apps_store",
+        # "website_apps_store",
         "membership",
         "website_membership",
         "website_customer",
-        "apps_product_creator",
+        # "apps_product_creator",
     ],
     "data": [
         "security/ir.model.access.csv",
-        "views/assets.xml",
         "views/website_oca_integrator_templates.xml",
         "views/website_oca_integrator_product_templates.xml",
         "views/website_oca_integrator_contributor_templates.xml",
@@ -32,5 +31,13 @@
         "data/ir_cron.xml",
     ],
     "external_dependencies": {"python": ["responses"]},
+    "assets": {
+        "web.assets_frontend": [
+            "website_oca_integrator/static/src/js/integrator_portal.js",
+        ],
+        "website.assets_tests": [
+            "website_oca_integrator/static/src/js/integrator_portal_tour.js",
+        ],
+    },
     "installable": True,
 }

website_oca_integrator/controllers/__init__.py

@@ -1,4 +1,3 @@
 from . import main
 from . import member
 from . import portal
-from . import website_sale

website_oca_integrator/controllers/main.py

@@ -2,14 +2,12 @@
 # Part of Odoo. See Odoo LICENSE file for full copyright and licensing details.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import werkzeug
+from werkzeug.urls import url_encode
 
 from odoo import http
 from odoo.http import request
 from odoo.tools.translate import _
 
-from odoo.addons.http_routing.models.ir_http import slug, unslug
-
 
 class WebsiteIntegrator(http.Controller):
     _references_per_page = 40
@@ -75,7 +73,7 @@ def integrators(self, country=None, page=0, **post):
 
         if country:
             base_integrator_domain += [("country_id", "=", country.id)]
-            url = "/integrators/country/" + slug(country)
+            url = "/integrators/country/" + request.env["ir.http"]._slug(country)
         else:
             url = "/integrators"
 
@@ -98,9 +96,9 @@ def integrators(self, country=None, page=0, **post):
         # search integrators matching current search parameters
         integrator_ids = partner_obj.sudo().search(
             base_integrator_domain,
-            order="grade_id ASC, implemented_count DESC,"
+            order="grade_id ASC, implemented_partner_count DESC,"
             "contributor_count DESC, member_count DESC,"
-            "display_name ASC",
+            "name ASC",
             offset=pager["offset"],
             limit=self._references_per_page,
         )
@@ -118,7 +116,7 @@ def integrators(self, country=None, page=0, **post):
             "google_map_integrator_ids": google_map_integrator_ids,
             "pager": pager,
             "searches": post,
-            "search_path": "%s" % werkzeug.url_encode(post),
+            "search_path": "?%s" % url_encode(post),
             "google_maps_api_key": google_maps_api_key,
         }
 
@@ -181,7 +179,7 @@ def integrators_detail(self, integrator_id, **post):
         """
         Display integrator's detail.
         """
-        _, integrator_id = unslug(integrator_id)
+        _, integrator_id = request.env["ir.http"]._unslug(integrator_id)
         current_country = None
         country_id = post.get("country_id")
 
@@ -192,7 +190,7 @@ def integrators_detail(self, integrator_id, **post):
         if integrator_id:
             integrator = request.env["res.partner"].sudo().browse(integrator_id)
 
-            is_website_publisher = request.env["res.users"].has_group(
+            is_website_publisher = request.env.user.has_group(
                 "website.group_website_publisher"
             )
 
@@ -243,7 +241,7 @@ def integrator_contributors(
         self, integrator_id=None, country_name=None, country_id=0, page=1, **post
     ):
         integrator = integrator_id
-        integrator_name, integrator_id = unslug(integrator_id)
+        integrator_name, integrator_id = request.env["ir.http"]._unslug(integrator_id)
         country = request.env["res.country"]
         partner = request.env["res.partner"]
 
@@ -318,7 +316,7 @@ def integrator_contributors(
 
         contributors = partner.sudo().search(
             country_domain,
-            order="display_name ASC",
+            order="name ASC",
             offset=pager["offset"],
             limit=self._references_per_page,
         )
@@ -333,7 +331,7 @@ def integrator_contributors(
             "current_country_id": current_country and current_country["id"] or 0,
             "pager": pager,
             "post": post,
-            "search": "?%s" % werkzeug.url_encode(post),
+            "search": "?%s" % url_encode(post),
         }
 
         return request.render("website_oca_integrator.contributor_index", values)

website_oca_integrator/controllers/portal.py

@@ -1,28 +1,23 @@
 # Copyright 2018 Surekha Technologies (https://www.surekhatech.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import json
-
 from odoo import http
 from odoo.http import request, route
 
 from odoo.addons.portal.controllers.portal import CustomerPortal
 
 
 class IntegratorPortal(CustomerPortal):
-    OPTIONAL_BILLING_FIELDS = CustomerPortal.OPTIONAL_BILLING_FIELDS + [
-        "github_organization",
-        "favourite_module_ids",
-        "website_short_description",
-        "website_description",
-    ]
-
     @route()
     def account(self, redirect=None, **post):
         if post:
-            modules = post.get("favourite_module_ids")
+            modules = request.httprequest.form.getlist("favourite_module_ids")
+            if not modules:
+                modules = post.get("favourite_module_ids")
+                if modules:
+                    modules = modules.split(",")
             if modules:
-                post["favourite_module_ids"] = [int(id) for id in modules.split(",")]
+                post["favourite_module_ids"] = [int(id) for id in modules]
             else:
                 post["favourite_module_ids"] = False
         return super().account(redirect=redirect, **post)
@@ -45,7 +40,7 @@ def integrator_developed_module_read(self, query="", limit=25, **post):
             fields=["id", "name"],
             limit=int(limit),
         )
-        return json.dumps(modules_data)
+        return request.make_json_response(modules_data)
 
     @http.route(
         "/my/account/get_favourite_modules",
@@ -59,7 +54,7 @@ def integrator_favourite_module_read(self):
         integrator = request.env.user.partner_id
         modules = integrator.favourite_module_ids
         modules_data = [{"id": m.id, "name": m.name} for m in modules]
-        return json.dumps(modules_data)
+        return request.make_json_response(modules_data)
 
     def details_form_validate(self, data):
         # after adding HTML editor in portal page, if we click on