From 25f96a0fc3620d1c1a55975a634a77f822d764f6 Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Tue, 28 Dec 2021 23:12:37 +0100 Subject: [PATCH] [IMP] pms-api-rest: add calendar fields --- pms_api_rest/datamodels/pms_calendar_info.py | 7 +++++++ pms_api_rest/services/calendar_service.py | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pms_api_rest/datamodels/pms_calendar_info.py b/pms_api_rest/datamodels/pms_calendar_info.py index 029b7e0dc..38fc75121 100644 --- a/pms_api_rest/datamodels/pms_calendar_info.py +++ b/pms_api_rest/datamodels/pms_calendar_info.py @@ -6,11 +6,18 @@ from odoo.addons.datamodel.core import Datamodel class PmsCalendarInfo(Datamodel): _name = "pms.calendar.info" id = fields.Integer(required=False, allow_none=True) + state = fields.String(required=False, allow_none=True) date = fields.String(required=False, allow_none=True) roomId = fields.Integer(required=False, allow_none=True) + toAssign = fields.Boolean(required=False, allow_none=True) partnerId = fields.Integer(required=False, allow_none=True) + partnerName = fields.String(required=False, allow_none=True) reservationId = fields.Integer(required=False, allow_none=True) + reservationName = fields.String(required=False, allow_none=True) + reservationType = fields.String(required=False, allow_none=True) isFirstDay = fields.Boolean(required=False, allow_none=True) isLastDay = fields.Boolean(required=False, allow_none=True) totalPrice = fields.Float(required=False, allow_none=True) + pendingPayment = fields.Float(required=False, allow_none=True) numNotifications = fields.Integer(required=False, allow_none=True) + adults = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/services/calendar_service.py b/pms_api_rest/services/calendar_service.py index 93619d705..bdcdc7c55 100644 --- a/pms_api_rest/services/calendar_service.py +++ b/pms_api_rest/services/calendar_service.py @@ -44,15 +44,22 @@ class PmsCalendarService(Component): result_lines.append( PmsCalendarInfo( id=line.id, - roomId=line.room_id.id, + state=line.reservation_id.state, date=datetime.combine(line.date, datetime.min.time()).isoformat(), + roomId=line.room_id.id, + toAssign=line.reservation_id.to_assign, partnerId=line.reservation_id.partner_id.id or None, + partnerName=line.reservation_id.partner_name or None, reservationId=line.reservation_id, + reservationName=line.reservation_id.name, + reservationType=line.reservation_id.reservation_type, isFirstDay=line.reservation_id.checkin == line.date, isLastDay=line.reservation_id.checkout == (line.date + timedelta(days=1)), totalPrice=line.reservation_id.price_total, + pendingPayment=line.reservation_id.folio_pending_amount, numNotifications=len(line.reservation_id.message_ids), + adults=line.reservation_id.adults, ) ) return result_lines