diff --git a/pms_api_rest/datamodels/pms_reservation.py b/pms_api_rest/datamodels/pms_reservation.py index 6f4e9aefb..2bf69abe3 100644 --- a/pms_api_rest/datamodels/pms_reservation.py +++ b/pms_api_rest/datamodels/pms_reservation.py @@ -16,7 +16,7 @@ class PmsReservationShortInfo(Datamodel): stateCode = fields.String(required=False, allow_none=True) stateDescription = fields.String(required=False, allow_none=True) children = fields.Integer(required=False, allow_none=True) - paymentStateDescription = fields.String(required=False, allow_none=True) + paymentState = fields.String(required=False, allow_none=True) readyForCheckin = fields.Boolean(required=False, allow_none=True) allowedCheckout = fields.Boolean(required=False, allow_none=True) splitted = fields.Boolean(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/res_country.py b/pms_api_rest/datamodels/res_country.py index ac4921d82..f8b8fdbf1 100644 --- a/pms_api_rest/datamodels/res_country.py +++ b/pms_api_rest/datamodels/res_country.py @@ -7,7 +7,7 @@ class PmsResCountriesInfo(Datamodel): _name = "res.country.info" id = fields.Integer(required=False, allow_none=True) name = fields.String(required=False, allow_none=True) - alpha3 = fields.String(required=False, allow_none=True) + code = fields.String(required=False, allow_none=True) class PmsResCountryStatesInfo(Datamodel): diff --git a/pms_api_rest/services/pms_partner_service.py b/pms_api_rest/services/pms_partner_service.py index c8b038f00..d77b653cc 100644 --- a/pms_api_rest/services/pms_partner_service.py +++ b/pms_api_rest/services/pms_partner_service.py @@ -159,9 +159,7 @@ class PmsPartnerService(Component): reservation = self.env["pms.reservation"].search( [("id", "=", checkin.reservation_id.id)] ) - folio = self.env["pms.folio"].search( - [("id", "=", reservation.folio_id.id)] - ) + reservations.append( PmsReservationShortInfo( id=reservation.id, @@ -169,14 +167,8 @@ class PmsPartnerService(Component): checkout=reservation.checkout.strftime("%d/%m/%Y"), adults=reservation.adults, priceTotal=round(reservation.price_room_services_set, 2), - stateDescription=dict( - reservation.fields_get(["state"])["state"]["selection"] - )[reservation.state], - paymentStateDescription=dict( - folio.fields_get(["payment_state"])["payment_state"][ - "selection" - ] - )[folio.payment_state], + stateCode=reservation.state, + paymentState=reservation.folio_payment_state, ) ) return reservations @@ -219,7 +211,6 @@ class PmsPartnerService(Component): PmsReservationShortInfo = self.env.datamodels["pms.reservation.short.info"] reservations = [] for reservation in partnerReservations: - folio = self.env["pms.folio"].search([("id", "=", reservation.folio_id.id)]) reservations.append( PmsReservationShortInfo( checkin=datetime.combine( @@ -230,14 +221,8 @@ class PmsPartnerService(Component): ).isoformat(), adults=reservation.adults, priceTotal=round(reservation.price_room_services_set, 2), - stateDescription=dict( - reservation.fields_get(["state"])["state"]["selection"] - )[reservation.state], - paymentStateDescription=dict( - folio.fields_get(["payment_state"])["payment_state"][ - "selection" - ] - )[folio.payment_state], + stateCode=reservation.state, + paymentState=reservation.folio_payment_state, ) ) return reservations @@ -382,6 +367,7 @@ class PmsPartnerService(Component): nationality=doc_number.partner_id.nationality_id.id if doc_number.partner_id.nationality_id else None, + # aquĆ­ tiene que ser id countryState=doc_number.partner_id.residence_state_id.id if doc_number.partner_id.residence_state_id else None, diff --git a/pms_api_rest/services/res_country_service.py b/pms_api_rest/services/res_country_service.py index c34f0e4b0..ea6d7b194 100644 --- a/pms_api_rest/services/res_country_service.py +++ b/pms_api_rest/services/res_country_service.py @@ -29,7 +29,7 @@ class ResCountryService(Component): ResCountriesInfo( id=country.id, name=country.name, - alpha3=country.code_alpha3 if country.code_alpha3 else None, + code=country.code if country.code else None, ) ) return result_countries