Skip to content

Commit

Permalink
[FIX] shopinvader: track.external.mixin create
Browse files Browse the repository at this point in the history
During the creation of a model who inherites of track;external.mixin, the last_external_update_date was not set (with current datetime)
  • Loading branch information
acsonefho committed Jun 11, 2024
1 parent 0b031e8 commit 2f22c7a
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 6 deletions.
3 changes: 2 additions & 1 deletion shopinvader/models/track_external_mixin.py
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
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
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.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
8 changes: 4 additions & 4 deletions shopinvader_cart_expiry/static/description/index.html
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

0 comments on commit 2f22c7a

Please sign in to comment.