Skip to content

Commit

Permalink
[IMP] pms_api_rest: wizard state service done
Browse files Browse the repository at this point in the history
  • Loading branch information
@saralb9 @DarioLodeiros
saralb9 authored and DarioLodeiros committed Feb 8, 2024
1 parent af1c6a0 commit 5ded1d0
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 48 deletions.
1 change: 1 addition & 0 deletions pms_api_rest/datamodels/pms_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ class PmsServiceInfo(Datamodel):
isBoardService = fields.Boolean(required=False, allow_none=True)
serviceLines = fields.List(NestedModel("pms.service.line.info"))
priceUnit = fields.Float(required=False, allow_none=True)
isCancelPenalty = fields.Boolean(required=False, allow_none=True)
133 changes: 85 additions & 48 deletions pms_api_rest/services/pms_reservation_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from odoo.addons.base_rest import restapi
from odoo.addons.base_rest_datamodel.restapi import Datamodel
from odoo.addons.component.core import Component
from odoo.odoo.osv import expression
from odoo.odoo.tools.safe_eval import safe_eval
from odoo.osv import expression
from odoo.tools.safe_eval import safe_eval


class PmsReservationService(Component):
Expand Down Expand Up @@ -490,6 +490,7 @@ def get_reservation_services(self, reservation_id):
discount=round(service.discount, 2),
isBoardService=service.is_board_service,
serviceLines=service_lines,
isCancelPenalty=service.is_cancel_penalty,
)
)
return result_services
Expand Down Expand Up @@ -1077,15 +1078,19 @@ def departures_report(self, pms_report_search_param):
)
def wizard_states(self, reservation_id):
reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)])
today = datetime.now().strftime('%Y-%m-%d')
wizard_states = [
{
"code": "overbooking_with_availability",
"title": "Overbooking",
"domain": "["
"('state', 'in', ['draft', 'confirm', 'arrival_delayed']), "
"('overbooking', '=', True), "
"('reservation_type', 'in', ['normal', 'staff'])]",
"text": f"Parece que ha entrado una reserva sin haber disponibilidad para {reservation.room_type_id.name}",
f"('checkin', '>=', '{today}'),"
"('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,
},
{
Expand All @@ -1094,129 +1099,150 @@ def wizard_states(self, reservation_id):
"domain": "["
"('state', 'in', ['draft', 'confirm', 'arrival_delayed']), "
"('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}."
f"Por desgracia no parece que hay ninguna "
f"habitación disponible con la capacidad suficiente para esta reserva",
"priority": 150,
},
{
"code": "splitted",
"code": "splitted_without_availability",
"title": "Divididas",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('splitted', '=', True),"
f"('checkin', '>=', '{today}'),"
"('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,
},
{
"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",
"title": "Por asignar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('to_assign', '=', True),"
"('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '==', today),"
# "('checkin', '>', today),"
f"('checkin', '>=', '{today}'),"
"]",
"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,
},
{
"code": "to_confirm",
"title": "Por confirmar",
"domain": "[('state', '=', 'draft'),"
# "('checkin', '==', today),"
# "('checkin', '>', today),"
"('reservation_type', '=', 'normal'),"
f"('checkin', '>=', '{today}'),"
"('reservation_type', 'in', ['normal', 'staff']),"
"]",
"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",
"text": f"La reserva de {reservation.partner_name} está pendiente de confirmar, puedes confirmarla desde aquí.",
"priority": 400,
},
{
"code": "checkin_done_precheckin",
"title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today),"
f"('checkin', '=', '{today}'),"
"('pending_checkin_data', '=', 0),"
"('reservation_type', 'in', ['normal', 'staff'])"
"]",
"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,
},
{
"code": "checkin_partial_precheckin",
"title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today),"
"('ratio_checkin_data', '>', 0),"
"('ratio_checkin_data','<', 100),"
f"('checkin', '=', '{today}'),"
"('pending_checkin_data', '>', 0),"
"('checkin_partner_ids.state','=', 'precheckin'),"
"('reservation_type', 'in', ['normal', 'staff'])"
"]",
"text": f"Faltan {reservation.pending_checkin_data} huéspedes por registrar sus datos,"
f"puedes marcar la entrada de la habitación [Marcar entrada] y/o abrir el asistente de checkin"
f"para completar los huéspedes",
"text": f"Faltan {reservation.pending_checkin_data} {' huésped ' if reservation.pending_checkin_data == 1 else ' huéspedes '} "
f"por registrar sus datos.Puedes abrir el asistente de checkin "
f" para completar los datos.",
"priority": 530,
},
{
"code": "checkin_no_precheckin",
"title": "Entrada Hoy",
"domain": "[('state', '=', 'confirm'),"
# "('checkin', '=', today),"
"('ration_checkin_data','=', 100),"
"domain": "[('state', '=', 'confirm'),"
f"('checkin', '=', '{today}'),"
"('pending_checkin_data', '>', 0),"
"('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,
},
{
"code": "confirmed_without_payment_and_precheckin",
"title": "Confirmadas a futuro sin pagar y sin precheckin realizado",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today),"
f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '>', 0),"
"('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,
},
{
"code": "confirmed_without_payment",
"title": "Confirmadas a futuro sin pagar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today),"
f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '=', 0),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]",
"text": "REVISAR",
"text": "Esta reserva está pendiente de cobro, puedes enviarle sun recordatorio desde aquí",
"priority": 630,
},
{
"code": "confirmed_without_precheckin",
"title": "Confirmadas a futuro sin pagar",
"domain": "[('state', 'in', ['draft', 'confirm', 'arrival_delayed']),"
"('reservation_type', 'in', ['normal', 'staff']),"
# "('checkin', '>', today),"
f"('checkin', '>', '{today}'),"
"('pending_checkin_data', '>', 0),"
"('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,
},
{
"code": "cancelled",
"title": "Cancelada con cargos y sin cobrar",
"domain": "[('state', '=', 'cancel'),"
"('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],"
"puedes eliminar la penalización en caso de que no se vaya a cobrar...",
"filtered": "lambda r: r.service_ids.filtered(lambda s: s.is_cancel_penalty and s.price_total > 0)",
"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,
},
{
Expand All @@ -1225,45 +1251,56 @@ def wizard_states(self, reservation_id):
"domain": "[('state', 'in', ['onboard', 'departure_delayed']),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]",
"text": f"En esta reserva tenemos un pago pendiente de {reservation.folio_pending_amount} que aparentemente deberia "
f"efectuar el {reservation.agency_id if reservation.folio_id.invoice_to_agency else reservation.partner_id.name}. Puedes registrar el pago desde aquí.",
"text": f"En esta reserva tenemos un pago pendiente de {reservation.folio_pending_amount}. Puedes registrar el pago desde aquí.",
"priority": 800,
}, {
},
{
"code": "done_without_payment",
"title": "Por cobrar pasadas",
"domain": "[('state', '=', 'done'),"
"('folio_payment_state', 'in', ['not_paid', 'partial'])"
"]",
"text": f"Esta reserva ha quedado con un cargo pendiente de {reservation.folio_pending_amount}."
"Cuando gestiones el cobro puedes registrarlo desde aquí.",
"text": f"Esta reserva ha quedado con un cargo pendiente de {reservation.folio_pending_amount}€."
" Cuando gestiones el cobro puedes registrarlo desde aquí.",
"priority": 900,
}, {
},
{
"code":"checkout",
"title": "Checkout",
"domain": "[('state', 'in', ['onboard', 'departure_delayed']),"
# "('checkout', '=', datetime.today()),"
f"('checkout', '=', '{today}'),"
"]",
"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'])
PmsWizardStateInfo = self.env.datamodels["pms.wizard.state.info"]
taoday = datetime.today()
for state in sorted_wizard_states:

domain = expression.AND([
[("id", "=", reservation_id)],
safe_eval(state["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(
code=state["code"],
title=state["title"],
text=state["text"],
)

return PmsWizardStateInfo(
code='',
title='',
text='',
)


0 comments on commit 5ded1d0

Please sign in to comment.