From 308397571d713733e6ea7902be3ca3d7a18db4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Mon, 23 Dec 2019 15:42:13 +0100 Subject: [PATCH 1/6] [ADD] b_w_portal: Total pos order amount for a user --- beesdoo_website_posorder_amount/__init__.py | 2 ++ .../__openerp__.py | 19 ++++++++++++ .../controllers/__init__.py | 2 ++ .../controllers/main.py | 30 +++++++++++++++++++ .../templates/portal_posorder_amount.xml | 26 ++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 beesdoo_website_posorder_amount/__init__.py create mode 100644 beesdoo_website_posorder_amount/__openerp__.py create mode 100644 beesdoo_website_posorder_amount/controllers/__init__.py create mode 100644 beesdoo_website_posorder_amount/controllers/main.py create mode 100644 beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml diff --git a/beesdoo_website_posorder_amount/__init__.py b/beesdoo_website_posorder_amount/__init__.py new file mode 100644 index 0000000..2fa08e5 --- /dev/null +++ b/beesdoo_website_posorder_amount/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf8 -*- +import controllers diff --git a/beesdoo_website_posorder_amount/__openerp__.py b/beesdoo_website_posorder_amount/__openerp__.py new file mode 100644 index 0000000..3ed5327 --- /dev/null +++ b/beesdoo_website_posorder_amount/__openerp__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2019 Coop IT Easy SCRLfs +# Rémy Taymans +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "Portal Website POS order amount", + "summary": """ + Show the total amount of pos order in the website portal. + """, + "description": """ + """, + "author": "Coop IT Easy SCRLfs", + "license": "AGPL-3", + "version": "9.0.1.0", + "website": "https://github.com/beescoop/Obeesdoo", + "category": "Website", + "depends": ["website_portal_v10"], + "data": ["templates/portal_posorder_amount.xml"], +} diff --git a/beesdoo_website_posorder_amount/controllers/__init__.py b/beesdoo_website_posorder_amount/controllers/__init__.py new file mode 100644 index 0000000..757b12a --- /dev/null +++ b/beesdoo_website_posorder_amount/controllers/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import main diff --git a/beesdoo_website_posorder_amount/controllers/main.py b/beesdoo_website_posorder_amount/controllers/main.py new file mode 100644 index 0000000..ba10fbc --- /dev/null +++ b/beesdoo_website_posorder_amount/controllers/main.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- + +# Copyright 2018 Rémy Taymans +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from openerp.addons.website_portal_v10.controllers.main import WebsiteAccount +from openerp.http import request + + +class PortalPosOrderAmount(WebsiteAccount): + + def _prepare_portal_layout_values(self): + values = super( + PortalPosOrderAmount, self + )._prepare_portal_layout_values() + user = request.env.user + owned_posorder = request.env["pos.order"].sudo().search( + [ + ("partner_id", "=", user.partner_id.commercial_partner_id.id), + ("state", "!=", "cancel"), + ] + ) + values["posorder_amount"] = sum( + po.amount_total for po in owned_posorder + ) + values["company_currency"] = ( + request.env["res.company"]._company_default_get().currency_id + ) + return values diff --git a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml new file mode 100644 index 0000000..145c266 --- /dev/null +++ b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml @@ -0,0 +1,26 @@ + + + + + + + + From 5f3c32460eaee29b519467f2ea8384de9d933235 Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Sun, 26 Jan 2020 12:30:45 +0100 Subject: [PATCH 2/6] [MIG] beesdoo_website_posorder_amount: Migration to 10.0 --- .../{__openerp__.py => __manifest__.py} | 2 +- beesdoo_website_posorder_amount/controllers/main.py | 4 ++-- .../templates/portal_posorder_amount.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename beesdoo_website_posorder_amount/{__openerp__.py => __manifest__.py} (95%) diff --git a/beesdoo_website_posorder_amount/__openerp__.py b/beesdoo_website_posorder_amount/__manifest__.py similarity index 95% rename from beesdoo_website_posorder_amount/__openerp__.py rename to beesdoo_website_posorder_amount/__manifest__.py index 3ed5327..c009b2e 100644 --- a/beesdoo_website_posorder_amount/__openerp__.py +++ b/beesdoo_website_posorder_amount/__manifest__.py @@ -11,7 +11,7 @@ """, "author": "Coop IT Easy SCRLfs", "license": "AGPL-3", - "version": "9.0.1.0", + "version": "10.0.1.0.0", "website": "https://github.com/beescoop/Obeesdoo", "category": "Website", "depends": ["website_portal_v10"], diff --git a/beesdoo_website_posorder_amount/controllers/main.py b/beesdoo_website_posorder_amount/controllers/main.py index ba10fbc..9380511 100644 --- a/beesdoo_website_posorder_amount/controllers/main.py +++ b/beesdoo_website_posorder_amount/controllers/main.py @@ -4,8 +4,8 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.addons.website_portal_v10.controllers.main import WebsiteAccount -from openerp.http import request +from odoo.addons.website_portal_v10.controllers.main import WebsiteAccount +from odoo.http import request class PortalPosOrderAmount(WebsiteAccount): diff --git a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml index 145c266..a4d68e6 100644 --- a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml +++ b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml @@ -3,7 +3,7 @@ Copyright 2018 Rémy Taymans License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - + - + From 1a7c7284d1980143f65f0b0074e1f8ee86f4b1af Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Sun, 26 Jan 2020 12:35:48 +0100 Subject: [PATCH 3/6] [MIG] beesdoo_website_posorder_amount: Migration to 11.0 --- beesdoo_website_posorder_amount/__init__.py | 2 +- beesdoo_website_posorder_amount/__manifest__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/beesdoo_website_posorder_amount/__init__.py b/beesdoo_website_posorder_amount/__init__.py index 2fa08e5..35b969a 100644 --- a/beesdoo_website_posorder_amount/__init__.py +++ b/beesdoo_website_posorder_amount/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf8 -*- -import controllers +from . import controllers diff --git a/beesdoo_website_posorder_amount/__manifest__.py b/beesdoo_website_posorder_amount/__manifest__.py index c009b2e..7f9291b 100644 --- a/beesdoo_website_posorder_amount/__manifest__.py +++ b/beesdoo_website_posorder_amount/__manifest__.py @@ -11,7 +11,7 @@ """, "author": "Coop IT Easy SCRLfs", "license": "AGPL-3", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "website": "https://github.com/beescoop/Obeesdoo", "category": "Website", "depends": ["website_portal_v10"], From bb7967422c92d727c25ad6025a5de0b18b050b43 Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Sun, 26 Jan 2020 12:43:23 +0100 Subject: [PATCH 4/6] [MIG] beesdoo_website_posorder_amount: Migration to 12.0 --- beesdoo_website_posorder_amount/__init__.py | 1 - beesdoo_website_posorder_amount/__manifest__.py | 3 +-- beesdoo_website_posorder_amount/controllers/__init__.py | 1 - beesdoo_website_posorder_amount/controllers/main.py | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/beesdoo_website_posorder_amount/__init__.py b/beesdoo_website_posorder_amount/__init__.py index 35b969a..e046e49 100644 --- a/beesdoo_website_posorder_amount/__init__.py +++ b/beesdoo_website_posorder_amount/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf8 -*- from . import controllers diff --git a/beesdoo_website_posorder_amount/__manifest__.py b/beesdoo_website_posorder_amount/__manifest__.py index 7f9291b..0bac2f2 100644 --- a/beesdoo_website_posorder_amount/__manifest__.py +++ b/beesdoo_website_posorder_amount/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2019 Coop IT Easy SCRLfs # Rémy Taymans # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -11,7 +10,7 @@ """, "author": "Coop IT Easy SCRLfs", "license": "AGPL-3", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "website": "https://github.com/beescoop/Obeesdoo", "category": "Website", "depends": ["website_portal_v10"], diff --git a/beesdoo_website_posorder_amount/controllers/__init__.py b/beesdoo_website_posorder_amount/controllers/__init__.py index 757b12a..12a7e52 100644 --- a/beesdoo_website_posorder_amount/controllers/__init__.py +++ b/beesdoo_website_posorder_amount/controllers/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import main diff --git a/beesdoo_website_posorder_amount/controllers/main.py b/beesdoo_website_posorder_amount/controllers/main.py index 9380511..e3a86fa 100644 --- a/beesdoo_website_posorder_amount/controllers/main.py +++ b/beesdoo_website_posorder_amount/controllers/main.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright 2018 Rémy Taymans # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). From 0d524f8436e50b5e542616bec45d878fdc6e813a Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Sun, 26 Jan 2020 14:23:28 +0100 Subject: [PATCH 5/6] [MIG] beesdoo_website_posorder_amount: Adaptation for 12.0 --- beesdoo_website_posorder_amount/__manifest__.py | 2 +- beesdoo_website_posorder_amount/controllers/main.py | 4 ++-- .../templates/portal_posorder_amount.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/beesdoo_website_posorder_amount/__manifest__.py b/beesdoo_website_posorder_amount/__manifest__.py index 0bac2f2..8e82888 100644 --- a/beesdoo_website_posorder_amount/__manifest__.py +++ b/beesdoo_website_posorder_amount/__manifest__.py @@ -13,6 +13,6 @@ "version": "12.0.1.0.0", "website": "https://github.com/beescoop/Obeesdoo", "category": "Website", - "depends": ["website_portal_v10"], + "depends": ["portal", "point_of_sale"], "data": ["templates/portal_posorder_amount.xml"], } diff --git a/beesdoo_website_posorder_amount/controllers/main.py b/beesdoo_website_posorder_amount/controllers/main.py index e3a86fa..7e886ce 100644 --- a/beesdoo_website_posorder_amount/controllers/main.py +++ b/beesdoo_website_posorder_amount/controllers/main.py @@ -2,11 +2,11 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.addons.website_portal_v10.controllers.main import WebsiteAccount +from odoo.addons.portal.controllers.portal import CustomerPortal from odoo.http import request -class PortalPosOrderAmount(WebsiteAccount): +class PortalPosOrderAmount(CustomerPortal): def _prepare_portal_layout_values(self): values = super( diff --git a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml index a4d68e6..5772feb 100644 --- a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml +++ b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml @@ -10,8 +10,8 @@ id="total_pos_order_amount" name="Portal total POS order amount" priority="40" - inherit_id="website_portal_v10.portal_layout"> - + inherit_id="portal.portal_layout"> +

Purchases

From 195f61dff298552680497b0d118ec8d0fafb15cf Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Sun, 26 Jan 2020 14:39:14 +0100 Subject: [PATCH 6/6] [ADD] beesdoo_website_posorder_amount: changed style of the Purchase block's header --- .../templates/portal_posorder_amount.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml index 5772feb..9edfc7c 100644 --- a/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml +++ b/beesdoo_website_posorder_amount/templates/portal_posorder_amount.xml @@ -12,8 +12,9 @@ priority="40" inherit_id="portal.portal_layout"> -

-

Purchases

+
+

Purchases

+

You have purchased a total amount of