From 04095199dcdbf20918a512dc0f7ceaed54d8d30a Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Wed, 8 Sep 2021 12:46:21 +0200 Subject: [PATCH] [IMP] Pms_api_rest: add sales person in folio_short_info --- pms_api_rest/datamodels/pms_folio_short_info.py | 3 ++- pms_api_rest/services/folio_services.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pms_api_rest/datamodels/pms_folio_short_info.py b/pms_api_rest/datamodels/pms_folio_short_info.py index dad4ac0d8..ade9d172a 100644 --- a/pms_api_rest/datamodels/pms_folio_short_info.py +++ b/pms_api_rest/datamodels/pms_folio_short_info.py @@ -14,8 +14,9 @@ class PmsFolioShortInfo(Datamodel): partnerName = fields.String(required=False, allow_none=True) partnerPhone = fields.String(required=False, allow_none=True) partnerEmail = fields.String(required=False, allow_none=True) - channelType = fields.String(required=False, allow_none=True) + saleChannel = fields.String(required=False, allow_none=True) agency = fields.String(required=False, allow_none=True) state = fields.String(required=False, allow_none=True) pendingAmount = fields.Float(required=False, allow_none=True) reservations = fields.List(fields.Dict(required=False, allow_none=True)) + salesPerson = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/services/folio_services.py b/pms_api_rest/services/folio_services.py index 3da29c61f..15291dfd9 100644 --- a/pms_api_rest/services/folio_services.py +++ b/pms_api_rest/services/folio_services.py @@ -59,7 +59,6 @@ class PmsFolioService(Component): else "", } ) - result_folios.append( PmsFolioShortInfo( id=folio.id, @@ -67,13 +66,14 @@ class PmsFolioService(Component): partnerName=folio.partner_name if folio.partner_name else "", partnerPhone=folio.mobile if folio.mobile else "", partnerEmail=folio.email if folio.email else "", - channelType=folio.channel_type_id if folio.channel_type_id else "", - agency=folio.agency_id if folio.agency_id else "", + saleChannel=folio.channel_type_id.name if folio.channel_type_id else "", + agency=folio.agency_id.name if folio.agency_id else "", state=dict(folio.fields_get(["state"])["state"]["selection"])[ folio.state ], pendingAmount=folio.pending_amount, reservations=[] if not reservations else reservations, + salesPerson=folio.user_id.name if folio.user_id else "", ) ) return result_folios @@ -122,10 +122,10 @@ class PmsFolioService(Component): ], priceTotal=reservation.price_total, adults=reservation.adults, - channelTypeId=reservation.channel_type_id + channelTypeId=reservation.channel_type_id.name if reservation.channel_type_id else "", - agencyId=reservation.agency_id if reservation.agency_id else "", + agencyId=reservation.agency_id.name if reservation.agency_id else "", boardServiceId=reservation.board_service_room_id.pms_board_service_id.name if reservation.board_service_room_id else "",