From c2b0656c12dcba3b564c7a562b78d7ea7092be0d Mon Sep 17 00:00:00 2001 From: "Xavier BOL (xbo)" Date: Wed, 15 Dec 2021 18:51:02 +0100 Subject: [PATCH] [IMP] sale: create some hook methods to avoid duplicating code This commit moves some code used in methods for `/my/quotes` and `/my/orders` because the code was duplicated for the both routes. So, with this commit, we can now call those hooks when we need this code in another routes. task-2648955 Closes #82379 --- addons/sale/controllers/portal.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py index acedaadf124..3d662c016fc 100644 --- a/addons/sale/controllers/portal.py +++ b/addons/sale/controllers/portal.py @@ -39,6 +39,13 @@ class CustomerPortal(portal.CustomerPortal): # Quotations and Sales Orders # + def _get_sale_searchbar_sortings(self): + return { + 'date': {'label': _('Order Date'), 'order': 'date_order desc'}, + 'name': {'label': _('Reference'), 'order': 'name'}, + 'stage': {'label': _('Stage'), 'order': 'state'}, + } + @http.route(['/my/quotes', '/my/quotes/page/'], type='http', auth="user", website=True) def portal_my_quotes(self, page=1, date_begin=None, date_end=None, sortby=None, **kw): values = self._prepare_portal_layout_values() @@ -50,12 +57,7 @@ class CustomerPortal(portal.CustomerPortal): ('state', 'in', ['sent', 'cancel']) ] - searchbar_sortings = { - 'date': {'label': _('Order Date'), 'order': 'date_order desc'}, - 'name': {'label': _('Reference'), 'order': 'name'}, - 'stage': {'label': _('Stage'), 'order': 'state'}, - } - + searchbar_sortings = self._get_sale_searchbar_sortings() # default sortby order if not sortby: sortby = 'date' @@ -100,11 +102,7 @@ class CustomerPortal(portal.CustomerPortal): ('state', 'in', ['sale', 'done']) ] - searchbar_sortings = { - 'date': {'label': _('Order Date'), 'order': 'date_order desc'}, - 'name': {'label': _('Reference'), 'order': 'name'}, - 'stage': {'label': _('Stage'), 'order': 'state'}, - } + searchbar_sortings = self._get_sale_searchbar_sortings() # default sortby order if not sortby: sortby = 'date'