Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][FIX] shopinvader track_external_mixin #1560

Open
wants to merge 2 commits into
base: 14.0
Choose a base branch
from
Open

[14.0][FIX] shopinvader track_external_mixin #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b07841d
[FIX] shopinvader: track.external.mixin create
acsonefho Jun 11, 2024
fe7bc00
[IMP] shopinvader_cart_expiry: improve job
acsonefho Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion shopinvader/models/track_external_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class TrackExternalMixin(models.AbstractModel):

last_external_update_date = fields.Datetime()

@api.model
def is_rest_request(self):
return self.env.context.get("shopinvader_request", False)

Expand All @@ -28,4 +29,4 @@ def create(self, values_list):
new_vals = []
for vals in values_list:
new_vals.append(self._fill_last_external_update_date(vals))
return super().create(values_list)
return super().create(new_vals)
2 changes: 1 addition & 1 deletion shopinvader_cart_expiry/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "ACSONE SA/NV",
"website": "https://github.com/shopinvader/odoo-shopinvader",
"category": "e-commerce",
"version": "14.0.1.0.2",
"version": "14.0.1.0.3",
"license": "AGPL-3",
"depends": ["shopinvader"],
"data": [
Expand Down
36 changes: 36 additions & 0 deletions shopinvader_cart_expiry/migrations/14.0.1.0.3/post-migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright 2024 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

import logging
from datetime import timedelta

from odoo import SUPERUSER_ID, api, fields

_logger = logging.getLogger(__name__)


def migrate(cr, version):
_logger.info("Upgrade shopinvader_cart_expiry: delete old carts")
if not version:
return
with api.Environment.manage():
env = api.Environment(cr, SUPERUSER_ID, {})
domain = [("cart_expiry_delay", ">", 0)]
for backend in env["shopinvader.backend"].search(domain):
backend = backend.with_company(backend.company_id.id).sudo_tech()
expiry_date = fields.Datetime.from_string(fields.Datetime.now())
delta_arg = {backend.cart_expiry_delay_unit: backend.cart_expiry_delay}
expiry_date -= timedelta(**delta_arg)
domain = [
("shopinvader_backend_id", "=", backend.id),
("typology", "=", "cart"),
("state", "=", "draft"),
("last_external_update_date", "=", False),
]
cart_expired = backend.env["sale.order"].search(domain)
if cart_expired:
if backend.cart_expiry_policy == "cancel":
cart_expired.action_cancel()
else:
cart_expired.unlink()
return
5 changes: 4 additions & 1 deletion shopinvader_cart_expiry/models/shopinvader_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ def _scheduler_manage_cart_expiry(self, domain=False):
domain = expression.AND([domain, [("cart_expiry_delay", ">", 0)]])
for backend in self.search(domain):
description = _("Manage cart expired for backend %s") % backend.name
backend.with_delay(description=description).manage_cart_expiry()
backend.with_delay(
description=description,
identity_key="shopinvader_manage_cart_expiry_%s" % (str(backend.id),),
).manage_cart_expiry()

def _get_cart_expiry_delay_domain(self):
expiry_date = fields.Datetime.from_string(fields.Datetime.now())
Expand Down
8 changes: 4 additions & 4 deletions shopinvader_cart_expiry/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down
Loading