audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] pms_api_rest: wizard state service done

Browse Source
This commit is contained in:
Sara Lago
2023-11-10 17:11:09 +01:00
committed by Darío Lodeiros
parent 0bd8ac03ac
commit 91f3ef37b6
2 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms_api_rest/datamodels/pms_service.py
View File

@@ -18,3 +18,4 @@ class PmsServiceInfo(Datamodel):
isBoardService = fields.Boolean(required=False, allow_none=True) isBoardService = fields.Boolean(required=False, allow_none=True)
serviceLines = fields.List(NestedModel("pms.service.line.info")) serviceLines = fields.List(NestedModel("pms.service.line.info"))
priceUnit = fields.Float(required=False, allow_none=True) priceUnit = fields.Float(required=False, allow_none=True)
isCancelPenalty = fields.Boolean(required=False, allow_none=True)

133
pms_api_rest/services/pms_reservation_service.py
View File

@@ -7,8 +7,8 @@ from odoo.exceptions import MissingError
from odoo.addons.base_rest import restapi from odoo.addons.base_rest import restapi
from odoo.addons.base_rest_datamodel.restapi import Datamodel from odoo.addons.base_rest_datamodel.restapi import Datamodel
from odoo.addons.component.core import Component from odoo.addons.component.core import Component
from odoo.odoo.osv import expression from odoo.osv import expression
from odoo.odoo.tools.safe_eval import safe_eval from odoo.tools.safe_eval import safe_eval
class PmsReservationService(Component): class PmsReservationService(Component):
@@ -490,6 +490,7 @@ class PmsReservationService(Component):
discount=round(service.discount, 2), discount=round(service.discount, 2),
isBoardService=service.is_board_service, isBoardService=service.is_board_service,
serviceLines=service_lines, serviceLines=service_lines,
isCancelPenalty=service.is_cancel_penalty,
) )
) )
return result_services return result_services
@@ -1077,6 +1078,7 @@ class PmsReservationService(Component):
) )
def wizard_states(self, reservation_id): def wizard_states(self, reservation_id):
reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)]) reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)])
today = datetime.now().strftime('%Y-%m-%d')
wizard_states = [ wizard_states = [
{ {
"code": "overbooking_with_availability", "code": "overbooking_with_availability",
@@ -1084,8 +1086,11 @@ class PmsReservationService(Component):
"domain": "[" "domain": "["
"('state', 'in', ['draft', 'confirm', 'arrival_delayed']), " "('state', 'in', ['draft', 'confirm', 'arrival_delayed']), "
"('overbooking', '=', True), " "('overbooking', '=', True), "
"('reservation_type', 'in', ['normal', 'staff'])]", f"('checkin', '>=', '{today}'),"
"text": f"Parece que ha entrado una reserva sin haber disponibilidad para {reservation.room_type_id.name}", "('reservation_type', 'in', ['normal', 'staff'])"
"]",
"filtered": "lambda r: r.count_alternative_free_rooms",
"text": f"Parece que ha entrado una reserva sin haber disponibilidad para {reservation.room_type_id.name}.",
"priority": 100, "priority": 100,
}, },
{ {
@@ -1094,82 +1099,101 @@ class PmsReservationService(Component):
"domain": "[" "domain": "["
"('state', 'in', ['draft', 'confirm', 'arrival_delayed']), " "('state', 'in', ['draft', 'confirm', 'arrival_delayed']), "
"('overbooking', '=', True), " "('overbooking', '=', True), "
"('reservation_type', 'in', ['normal', 'staff'])]", f"('checkin', '>=', '{today}'),"
"('reservation_type', 'in', ['normal', 'staff'])"
"]",
"filtered": "lambda r: r.count_alternative_free_rooms <= 0",
"text": f"Parece que ha entrado una reserva sin haber disponibilidad para {reservation.room_type_id.name}." "text": f"Parece que ha entrado una reserva sin haber disponibilidad para {reservation.room_type_id.name}."
f"Por desgracia no parece que hay ninguna " f"Por desgracia no parece que hay ninguna "
f"habitación disponible con la capacidad suficiente para esta reserva", f"habitación disponible con la capacidad suficiente para esta reserva",
"priority": 150, "priority": 150,
}, },
{ {
"code": "splitted", "code": "splitted_without_availability",
"title": "Divididas", "title": "Divididas",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed'])," "domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('splitted', '=', True)," "('splitted', '=', True),"
f"('checkin', '>=', '{today}'),"
"('reservation_type', 'in', ['normal', 'staff'])" "('reservation_type', 'in', ['normal', 'staff'])"
"]", "]",
"text": "", "filtered": "lambda r: r.count_alternative_free_rooms <= 0",
"text": f"Parece que a {reservation.partner_name} le ha tocado dormir en habitaciones diferentes "
f" pero no hay ninguna habitación disponible para asignarle, puedes probar a mover otras reservas "
f" para poder establecerle una única habitación. ",
"priority": 200, "priority": 200,
}, },
{
"code": "splitted_with_availability",
"title": "Divididas",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('splitted', '=', True),"
f"('checkin', '>=', '{today}'),"
"('reservation_type', 'in', ['normal', 'staff'])"
"]",
"filtered": "lambda r: r.count_alternative_free_rooms",
"text": f"Parece que a {reservation.partner_name} le ha tocado dormir en habitaciones diferentes"
f" pero tienes la posibilidad de moverlo a {reservation.count_alternative_free_rooms} "
f" {' habitación' if reservation.count_alternative_free_rooms == 1 else ' habitaciones'}.",
"priority": 220,
},
{ {
"code": "to_assign", "code": "to_assign",
"title": "Por asignar", "title": "Por asignar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed'])," "domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('to_assign', '=', True)," "('to_assign', '=', True),"
"('reservation_type', 'in', ['normal', 'staff'])," "('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '==', today)," f"('checkin', '>=', '{today}'),"
# "('checkin', '>', today),"
"]", "]",
"text": f"La reserva de {reservation.partner_name} ha sido asignada a la habitación {reservation.preferred_room_id.name}," "text": f"La reserva de {reservation.partner_name} ha sido asignada a la habitación {reservation.preferred_room_id.name},"
"puedes confirmar la habitación o cambiar a otra desde aquí.", " puedes confirmar la habitación o cambiar a otra desde aquí.",
"priority": 300, "priority": 300,
}, },
{ {
"code": "to_confirm", "code": "to_confirm",
"title": "Por confirmar", "title": "Por confirmar",
"domain": "[('state', '=', 'draft')," "domain": "[('state', '=', 'draft'),"
# "('checkin', '==', today)," f"('checkin', '>=', '{today}'),"
# "('checkin', '>', today)," "('reservation_type', 'in', ['normal', 'staff']),"
"('reservation_type', '=', 'normal'),"
"]", "]",
"text": f"La reserva de {reservation.partner_name} está pendiente de confirmar, puedes confirmarla desde aquí" "text": f"La reserva de {reservation.partner_name} está pendiente de confirmar, puedes confirmarla desde aquí.",
"o en caso contrario podrías cancelar la reserva",
"priority": 400, "priority": 400,
}, },
{ {
"code": "checkin_done_precheckin", "code": "checkin_done_precheckin",
"title": "Entrada Hoy", "title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm')," "domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today)," f"('checkin', '=', '{today}'),"
"('pending_checkin_data', '=', 0)," "('pending_checkin_data', '=', 0),"
"('reservation_type', 'in', ['normal', 'staff'])" "('reservation_type', 'in', ['normal', 'staff'])"
"]", "]",
"text": "Todos los huéspedes de esta reserva tienen los datos registrados, " "text": "Todos los huéspedes de esta reserva tienen los datos registrados, "
"puedes marcar la entrada directamente desde aquí", " puedes marcar la entrada directamente desde aquí",
"priority": 500, "priority": 500,
}, },
{ {
"code": "checkin_partial_precheckin", "code": "checkin_partial_precheckin",
"title": "Entrada Hoy", "title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm')," "domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today)," f"('checkin', '=', '{today}'),"
"('ratio_checkin_data', '>', 0)," "('pending_checkin_data', '>', 0),"
"('ratio_checkin_data','<', 100)," "('checkin_partner_ids.state','=', 'precheckin'),"
"('reservation_type', 'in', ['normal', 'staff'])" "('reservation_type', 'in', ['normal', 'staff'])"
"]", "]",
"text": f"Faltan {reservation.pending_checkin_data} huéspedes por registrar sus datos," "text": f"Faltan {reservation.pending_checkin_data} {' huésped ' if reservation.pending_checkin_data == 1 else ' huéspedes '} "
f"puedes marcar la entrada de la habitación [Marcar entrada] y/o abrir el asistente de checkin" f"por registrar sus datos.Puedes abrir el asistente de checkin "
f"para completar los huéspedes", f" para completar los datos.",
"priority": 530, "priority": 530,
}, },
{ {
"code": "checkin_no_precheckin", "code": "checkin_no_precheckin",
"title": "Entrada Hoy", "title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm')," "domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today)," f"('checkin', '=', '{today}'),"
"('ration_checkin_data','=', 100)," "('pending_checkin_data', '>', 0),"
"('reservation_type', 'in', ['normal', 'staff'])" "('reservation_type', 'in', ['normal', 'staff'])"
"]", "]",
"text": "Registra los datos de los huéspedes desde el asistente del checkin", "filtered": "lambda r: all([c.state in ('draft','dummy') for c in r.checkin_partner_ids]) ",
"text": "Registra los datos de los huéspedes desde el asistente del checkin.",
"priority": 580, "priority": 580,
}, },
{ {
@@ -1177,11 +1201,12 @@ class PmsReservationService(Component):
"title": "Confirmadas a futuro sin pagar y sin precheckin realizado", "title": "Confirmadas a futuro sin pagar y sin precheckin realizado",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed'])," "domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff'])," "('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today)," f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '>', 0)," "('pending_checkin_data', '>', 0),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])" "('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]", "]",
"text": "REVISAR", "text": "Esta reserva está pendiente de cobro y de que los huéspedes "
" registren sus datos: puedes enviarles un recordatorio desde aquí",
"priority": 600, "priority": 600,
}, },
{ {
@@ -1189,11 +1214,11 @@ class PmsReservationService(Component):
"title": "Confirmadas a futuro sin pagar", "title": "Confirmadas a futuro sin pagar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed'])," "domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff'])," "('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today)," f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '=', 0)," "('pending_checkin_data', '=', 0),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])" "('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]", "]",
"text": "REVISAR", "text": "Esta reserva está pendiente de cobro, puedes enviarle sun recordatorio desde aquí",
"priority": 630, "priority": 630,
}, },
{ {
@@ -1201,11 +1226,11 @@ class PmsReservationService(Component):
"title": "Confirmadas a futuro sin pagar", "title": "Confirmadas a futuro sin pagar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed'])," "domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff'])," "('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today)," f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '>', 0)," "('pending_checkin_data', '>', 0),"
"('folio_payment_state', 'in', ['paid', 'overpayment','nothing_to_pay'])" "('folio_payment_state', 'in', ['paid', 'overpayment','nothing_to_pay'])"
"]", "]",
"text": "REVISAR", "text": "Esta reserva no tiene los datos de los huéspedes registrados, puedes enviarles un recordatorio desde aquí",
"priority": 660, "priority": 660,
}, },
{ {
@@ -1213,10 +1238,11 @@ class PmsReservationService(Component):
"title": "Cancelada con cargos y sin cobrar", "title": "Cancelada con cargos y sin cobrar",
"domain": "[('state', '=', 'cancel')," "domain": "[('state', '=', 'cancel'),"
"('cancelled_reason', 'in',['late','noshow'])," "('cancelled_reason', 'in',['late','noshow']),"
"('reservation_type', 'in', ['normal', 'staff'])" "('folio_payment_state', 'in', ['not_paid', 'partial']),"
"]", "]",
"text": f"La reserva de {reservation.partner_name} ha sido cancelada con una penalización de [penalizacion]," "filtered": "lambda r: r.service_ids.filtered(lambda s: s.is_cancel_penalty and s.price_total > 0)",
"puedes eliminar la penalización en caso de que no se vaya a cobrar...", "text": f"La reserva de {reservation.partner_name} ha sido cancelada con una penalización de {reservation.service_ids.filtered(lambda s: s.is_cancel_penalty).price_total}€,"
" puedes eliminar la penalización en caso de que no se vaya a cobrar.",
"priority": 700, "priority": 700,
}, },
{ {
@@ -1225,45 +1251,56 @@ class PmsReservationService(Component):
"domain": "[('state', 'in', ['onboard', 'departure_delayed'])," "domain": "[('state', 'in', ['onboard', 'departure_delayed']),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])" "('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]", "]",
"text": f"En esta reserva tenemos un pago pendiente de {reservation.folio_pending_amount} que aparentemente deberia " "text": f"En esta reserva tenemos un pago pendiente de {reservation.folio_pending_amount}. Puedes registrar el pago desde aquí.",
f"efectuar el {reservation.agency_id if reservation.folio_id.invoice_to_agency else reservation.partner_id.name}. Puedes registrar el pago desde aquí.",
"priority": 800, "priority": 800,
}, { },
{
"code": "done_without_payment", "code": "done_without_payment",
"title": "Por cobrar pasadas", "title": "Por cobrar pasadas",
"domain": "[('state', '=', 'done')," "domain": "[('state', '=', 'done'),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])" "('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]", "]",
"text": f"Esta reserva ha quedado con un cargo pendiente de {reservation.folio_pending_amount}." "text": f"Esta reserva ha quedado con un cargo pendiente de {reservation.folio_pending_amount}€."
"Cuando gestiones el cobro puedes registrarlo desde aquí.", " Cuando gestiones el cobro puedes registrarlo desde aquí.",
"priority": 900, "priority": 900,
}, { },
{
"code":"checkout", "code":"checkout",
"title": "Checkout", "title": "Checkout",
"domain": "[('state', 'in', ['onboard', 'departure_delayed'])," "domain": "[('state', 'in', ['onboard', 'departure_delayed']),"
# "('checkout', '=', datetime.today())," f"('checkout', '=', '{today}'),"
"]", "]",
"text": "Reserva lista para el checkout, marca la salida directamente desde aquí.", "text": "Reserva lista para el checkout, marca la salida directamente desde aquí.",
"priority": 10, "priority": 1000,
}, },
] ]
# We order the states by priority and return the first state whose domain meets the reservation;
# if the state also has the key 'filtered,' it must also meet that filter.
sorted_wizard_states = sorted(wizard_states, key=lambda x: x['priority']) sorted_wizard_states = sorted(wizard_states, key=lambda x: x['priority'])
PmsWizardStateInfo = self.env.datamodels["pms.wizard.state.info"] PmsWizardStateInfo = self.env.datamodels["pms.wizard.state.info"]
taoday = datetime.today()
for state in sorted_wizard_states: for state in sorted_wizard_states:
domain = expression.AND([ domain = expression.AND([
[("id", "=", reservation_id)], [("id", "=", reservation_id)],
safe_eval(state["domain"]) safe_eval(state["domain"])
]) ])
if self.env["pms.reservation"].search_count(domain): if self.env["pms.reservation"].search_count(domain):
print(state) if (
state.get("filtered")
and not self.env["pms.reservation"].browse(reservation_id).filtered(safe_eval(state["filtered"]))
):
continue
return PmsWizardStateInfo( return PmsWizardStateInfo(
code=state["code"], code=state["code"],
title=state["title"], title=state["title"],
text=state["text"], text=state["text"],
) )
return PmsWizardStateInfo(
code='',
title='',
text='',
)