From c74cb6050001295d117cc4922cdcb53490d031a6 Mon Sep 17 00:00:00 2001 From: braisab Date: Thu, 29 Apr 2021 11:27:56 +0200 Subject: [PATCH] [IMP] added precheckin option for reservation in portal --- pms/controllers/pms_portal.py | 56 +------ pms/views/folio_portal_templates.xml | 135 +++++++++++++--- pms/views/precheckin_portal_templates.xml | 127 +-------------- pms/views/reservation_portal_templates.xml | 173 ++++++++++++++++++++- 4 files changed, 295 insertions(+), 196 deletions(-) diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py index e6bd85914..083914c49 100644 --- a/pms/controllers/pms_portal.py +++ b/pms/controllers/pms_portal.py @@ -233,12 +233,14 @@ class PortalReservation(CustomerPortal): return request.render("pms.portal_my_reservation_detail", values) @http.route( - ["/my/reservations/precheckin/"], + ["/my/reservations//precheckin"], type="http", auth="user", website=True, ) - def portal_my_reservation_precheckin(self, reservation_id, access_token=None, **kw): + def portal_my_reservation_precheckin( + self, reservation_id, access_token=None, report_type=None, download=False, **kw + ): try: reservation_sudo = self._document_check_access( "pms.reservation", @@ -247,8 +249,6 @@ class PortalReservation(CustomerPortal): ) except (AccessError, MissingError): return request.redirect("/my") - # for attachment in reservation_sudo.attachment_ids: - # attachment.generate_access_token() values = self._reservation_get_page_view_values( reservation_sudo, access_token, **kw ) @@ -282,52 +282,6 @@ class PortalPrecheckin(CustomerPortal): **kwargs ) - @http.route( - ["/my/precheckins", "/my/precheckins/page/"], - type="http", - auth="user", - website=True, - ) - def portal_my_precheckin( - self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw - ): - partner = request.env.user.partner_id - values = self._prepare_portal_layout_values() - Reservation = request.env["pms.reservation"] - values["reservations"] = Reservation.search( - [ - ("partner_id", "child_of", partner.id), - ] - ) - domain = [ - ("partner_id", "child_of", partner.id), - ] - if date_begin and date_end: - domain += [ - ("create_date", ">", date_begin), - ("create_date", "<=", date_end), - ] - - reservations = Reservation.search(domain) - checkin_count = len(reservations.checkin_partner_ids) - pager = portal_pager( - url="/my/precheckins", - url_args={"date_begin": date_begin, "date_end": date_end}, - total=checkin_count, - page=page, - step=self._items_per_page, - ) - request.session["my_precheckins_history"] = reservations.ids[:100] - values.update( - { - "date": date_begin, - "page_name": "precheckins", - "pager": pager, - "default_url": "/my/precheckins", - } - ) - return request.render("pms.portal_my_precheckin", values) - @http.route( ["/my/precheckin/"], type="http", @@ -343,7 +297,5 @@ class PortalPrecheckin(CustomerPortal): ) except (AccessError, MissingError): return request.redirect("/my") - # for attachment in reservation_sudo.attachment_ids: - # attachment.generate_access_token() values = self._precheckin_get_page_view_values(checkin_sudo, access_token, **kw) return request.render("pms.portal_my_precheckin_detail", values) diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml index a2d4c20d2..13901751b 100644 --- a/pms/views/folio_portal_templates.xml +++ b/pms/views/folio_portal_templates.xml @@ -171,11 +171,6 @@ -