From 3d2cab3d2e5d8974adf624ebdad64d9b8c532d92 Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Wed, 1 Feb 2023 19:45:23 +0100 Subject: [PATCH] [IMP] pms: host complete style --- pms/controllers/pms_portal.py | 34 ++- pms/models/pms_checkin_partner.py | 12 +- pms/views/precheckin_portal_templates.xml | 265 ++++++++++++++++------ 3 files changed, 220 insertions(+), 91 deletions(-) diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py index b3aded6a9..b65c98a55 100644 --- a/pms/controllers/pms_portal.py +++ b/pms/controllers/pms_portal.py @@ -1,6 +1,4 @@ -import re - -from odoo import _, fields, http, tools +from odoo import _, http from odoo.exceptions import AccessError, MissingError from odoo.http import request @@ -378,7 +376,7 @@ class PortalPrecheckin(CustomerPortal): def portal_precheckin_folio(self, folio_id, **kw): folio = request.env["pms.folio"].sudo().browse(folio_id) values = {} - values.update({"no_breadcrumbs": True,"folio": folio}) + values.update({"no_breadcrumbs": True, "folio": folio}) return request.render("pms.portal_my_prechekin_folio", values) @http.route( @@ -393,7 +391,7 @@ class PortalPrecheckin(CustomerPortal): reservation = request.env["pms.reservation"].sudo().browse(reservation_id) values = {} values.update({"folio": folio}) - values.update({"no_breadcrumbs": True,"reservation": reservation}) + values.update({"reservation": reservation}) return request.render("pms.portal_my_prechekin_reservation", values) @http.route( @@ -424,8 +422,7 @@ class PortalPrecheckin(CustomerPortal): self._precheckin_get_page_view_values(checkin_partner.id, access_token) ) values.update( - { - "no_breadcrumbs": True, + { "folio": folio, "reservation": reservation, "checkin_partner": checkin_partner, @@ -439,17 +436,20 @@ class PortalPrecheckin(CustomerPortal): return request.render("pms.portal_my_precheckin_detail", values) @http.route( - ["/my/precheckin///checkin/"], + [ + "/my/precheckin///checkin/" + ], type="http", auth="public", website=True, csrf=False, ) - def portal_precheckin_submit(self, folio_id,reservation_id, checkin_partner_id, **kw): + def portal_precheckin_submit( + self, folio_id, reservation_id, checkin_partner_id, **kw + ): checkin_partner = ( request.env["pms.checkin.partner"].sudo().browse(checkin_partner_id) ) - print(kw) values = kw values.update( @@ -458,13 +458,9 @@ class PortalPrecheckin(CustomerPortal): } ) - # if not kw.get("first") and not kw.get("back") and not error: # kw.update({"checkin_partner_id": checkin_partner_id}) - - - # if checkin_pos == len(folio_id.checkin_partner_ids): # values = { # "folio": folio_id, @@ -472,7 +468,6 @@ class PortalPrecheckin(CustomerPortal): # } # return request.render("pms.portal_my_precheckin_end", values) - # if checkin_pos >= 0: # available_checkins = folio_id.checkin_partner_ids.filtered( # lambda c: c.state in ["dummy", "draft"] @@ -487,10 +482,11 @@ class PortalPrecheckin(CustomerPortal): reservation = request.env["pms.reservation"].sudo().browse(reservation_id) values.update( - { - "folio": folio, - "reservation": reservation, - }) + { + "folio": folio, + "reservation": reservation, + } + ) # values.update({"no_breadcrumbs": True}) # if checkin_partner.state not in ["dummy", "draft"]: # return request.render("pms.portal_not_checkin", values) diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index aaa3db135..85d71834e 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -799,7 +799,6 @@ class PmsCheckinPartner(models.Model): ): today = fields.datetime.today() datetime_doc_date = datetime.strptime(doc_date, DEFAULT_SERVER_DATE_FORMAT) - print(datetime_doc_date) if datetime_doc_date < today: return datetime_doc_date datetime_birthdate = datetime.strptime(birthdate, DEFAULT_SERVER_DATE_FORMAT) @@ -898,11 +897,12 @@ class PmsCheckinPartner(models.Model): if values.get("document_expedition_date"): values.update( { - "document_expedition_date": - datetime.strptime(values.get("document_expedition_date"), "%d/%m/%Y").strftime("%Y-%m-%d"), - "birthdate_date": - datetime.strptime(values.get("birthdate_date"), "%d/%m/%Y").strftime("%Y-%m-%d"), - + "document_expedition_date": datetime.strptime( + values.get("document_expedition_date"), "%d/%m/%Y" + ).strftime("%Y-%m-%d"), + "birthdate_date": datetime.strptime( + values.get("birthdate_date"), "%d/%m/%Y" + ).strftime("%Y-%m-%d"), } ) doc_date = values.get("document_expedition_date") diff --git a/pms/views/precheckin_portal_templates.xml b/pms/views/precheckin_portal_templates.xml index ac50847a7..6e45e6be3 100644 --- a/pms/views/precheckin_portal_templates.xml +++ b/pms/views/precheckin_portal_templates.xml @@ -12,17 +12,21 @@
@@ -63,23 +67,33 @@ - +