Skip to content

Commit

Permalink
[IMP] shopinvader: black, isort, prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierrick Brun committed Jan 27, 2021
1 parent 93d3cf8 commit 5bd7f47
Show file tree
Hide file tree
Showing 96 changed files with 1,599 additions and 1,477 deletions.
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ exclude: |
# NOT INSTALLABLE ADDONS
^partner_contact_company/|
^product_online_category/|
^shopinvader/|
^shopinvader_algolia/|
^shopinvader_assortment/|
^shopinvader_backend_image_proxy/|
Expand Down
1 change: 1 addition & 0 deletions setup/shopinvader/odoo/addons/shopinvader
6 changes: 6 additions & 0 deletions setup/shopinvader/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)
2 changes: 1 addition & 1 deletion shopinvader/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "Akretion",
"license": "AGPL-3",
"application": True,
"installable": False,
"installable": True,
"external_dependencies": {"python": ["cerberus", "unidecode"], "bin": []},
"depends": [
"base_rest",
Expand Down
4 changes: 1 addition & 3 deletions shopinvader/components/access_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ def for_address(self, address_id):
if self.partner_user is not None:
if not self.is_main_partner():
if not self.is_owner(address_id):
info.update(
{"read": True, "update": False, "delete": False}
)
info.update({"read": True, "update": False, "delete": False})
else:
# only main partner can delete your address
info["delete"] = False
Expand Down
9 changes: 2 additions & 7 deletions shopinvader/components/partner_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ def validate_partner(self, partner):
if self.backend.validate_customers:
validator = getattr(
self,
"_validate_partner_{}".format(
self.backend.validate_customers_type
),
"_validate_partner_{}".format(self.backend.validate_customers_type),
lambda partner: True,
)
validator(partner)
Expand All @@ -36,10 +34,7 @@ def _validate_partner_all(self, partner):
pass

def _validate_partner_address(self, partner):
if (
not partner.shopinvader_enabled
and not partner.address_type == "address"
):
if not partner.shopinvader_enabled and not partner.address_type == "address":
# raise PartnerNotValidatedError(
# "Address found but not validated yet."
# )
Expand Down
8 changes: 2 additions & 6 deletions shopinvader/components/product_product_event_listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@ def on_record_create(self, record, fields=None):
:param fields: list of str
:return:
"""
shopinv_products = record.mapped(
"product_tmpl_id.shopinvader_bind_ids"
)
shopinv_variants = self._launch_shopinvader_variant_creation(
shopinv_products
)
shopinv_products = record.mapped("product_tmpl_id.shopinvader_bind_ids")
shopinv_variants = self._launch_shopinvader_variant_creation(shopinv_products)
# If at least 1 is True, force False
if any(shopinv_variants.mapped("active")):
shopinv_variants.write({"active": False})
Expand Down
23 changes: 7 additions & 16 deletions shopinvader/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
import logging

from odoo import _
from odoo.addons.base_rest.controllers import main
from odoo.exceptions import MissingError
from odoo.http import request, route

from odoo.addons.base_rest.controllers import main

_logger = logging.getLogger(__name__)


Expand All @@ -23,9 +24,7 @@ class InvaderController(main.RestController):
@route(["/shopinvader/<service>/<int:_id>/download"], methods=["GET"])
def service_download(self, service, _id=None, **params):
params["id"] = _id
return self._process_method(
service, "download", _id=_id, params=params
)
return self._process_method(service, "download", _id=_id, params=params)

@classmethod
def _get_partner_from_headers(cls, headers):
Expand All @@ -42,9 +41,7 @@ def _get_partner_from_headers(cls, headers):
if len(partner) > 1:
_logger.warning(
"More than one shopinvader.partner found for:"
" backend_id={} email={}".format(
backend.id, partner_email
)
" backend_id={} email={}".format(backend.id, partner_email)
)
# Could be because the email is not related to a partner or
# because the partner is inactive
Expand All @@ -57,9 +54,7 @@ def _find_partner(cls, backend, partner_email):
("partner_email", "=", partner_email),
("backend_id", "=", backend.id),
]
return request.env["shopinvader.partner"].search(
partner_domain, limit=2
)
return request.env["shopinvader.partner"].search(partner_domain, limit=2)

@classmethod
def _validate_partner(cls, backend, partner):
Expand Down Expand Up @@ -92,9 +87,7 @@ def _get_component_context(self):
* shopinvader_backend: current shopinvader backend (matching API key)
"""
res = super(InvaderController, self)._get_component_context()
res[
"shopinvader_backend"
] = self._get_shopinvader_backend_from_request()
res["shopinvader_backend"] = self._get_shopinvader_backend_from_request()
headers = request.httprequest.environ
# TODO: all services should rely on shopinvader partner
# rather than the real partner
Expand All @@ -104,7 +97,5 @@ def _get_component_context(self):
res["partner_user"] = partner
# The partner user for the main account or for sale order may differ.
res["partner"] = partner.get_shop_partner(res["shopinvader_backend"])
res[
"shopinvader_session"
] = self._get_shopinvader_session_from_headers(headers)
res["shopinvader_session"] = self._get_shopinvader_session_from_headers(headers)
return res
2 changes: 1 addition & 1 deletion shopinvader/data/cart_step.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>

<record id="cart_index" model="shopinvader.cart.step">
Expand Down
Loading

0 comments on commit 5bd7f47

Please sign in to comment.