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

[FIX] pms-api-rest: num. services, amenities, round(discount), cancelation rule.

Browse Source
This commit is contained in:
miguelpadin
2022-07-12 10:35:44 +02:00
committed by Darío Lodeiros
parent f661b67a4a
commit c87c5153ef
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pms_api_rest/datamodels/pms_reservation.py
View File

@@ -53,7 +53,7 @@ class PmsReservationInfo(Datamodel):
pendingCheckinData = fields.Integer(required=False, allow_none=True) pendingCheckinData = fields.Integer(required=False, allow_none=True)
createDate = fields.String(required=False, allow_none=True) createDate = fields.String(required=False, allow_none=True)
segmentationId = fields.Integer(required=False, allow_none=True) segmentationId = fields.Integer(required=False, allow_none=True)
cancellationPolicyId = fields.Integer(required=False, allow_none=True) cancelationRuleId = fields.Integer(required=False, allow_none=True)
toAssign = fields.Boolean(required=False, allow_none=True) toAssign = fields.Boolean(required=False, allow_none=True)
reservationType = fields.String(required=False, allow_none=True) reservationType = fields.String(required=False, allow_none=True)

2
pms_api_rest/datamodels/pms_room.py
View File

@@ -23,4 +23,4 @@ class PmsRoomInfo(Datamodel):
roomTypeClassId = fields.Integer(required=False, allow_none=True) roomTypeClassId = fields.Integer(required=False, allow_none=True)
ubicationId = fields.Integer(required=False, allow_none=True) ubicationId = fields.Integer(required=False, allow_none=True)
extraBedsAllowed = fields.Integer(required=False, allow_none=True) extraBedsAllowed = fields.Integer(required=False, allow_none=True)
roomAmenityIds = fields.List(fields.Integer(), required=False) roomAmenityIds = fields.List(fields.Integer(), required=False, allow_none=True)

5
pms_api_rest/services/pms_folio_service.py
View File

@@ -266,10 +266,13 @@ class PmsFolioService(Component):
allowedCheckout=reservation.allowed_checkout, allowedCheckout=reservation.allowed_checkout,
splitted=reservation.splitted, splitted=reservation.splitted,
priceTotal=reservation.price_room_services_set, priceTotal=reservation.price_room_services_set,
servicesCount=len( # TODO: REVIEW IF THIS OR QTY OF EACH ONE
servicesCount=sum(
reservation.service_ids.filtered( reservation.service_ids.filtered(
lambda x: not x.is_board_service lambda x: not x.is_board_service
) )
.mapped("product_qty")
), ),
) )
) )

6
pms_api_rest/services/pms_pricelist_service.py
View File

@@ -60,10 +60,12 @@ class PmsPricelistService(Component):
PmsPricelistInfo( PmsPricelistInfo(
id=pricelist.id, id=pricelist.id,
name=pricelist.name, name=pricelist.name,
cancellationPolicyId=pricelist.cancelation_rule_id.id cancelationRuleId=pricelist.cancelation_rule_id.id
if pricelist.cancelation_rule_id if pricelist.cancelation_rule_id
else None, else None,
defaultAvailabilityPlanId=pricelist.availability_plan_id.id, defaultAvailabilityPlanId=pricelist.availability_plan_id.id
if pricelist.availability_plan_id else None
,
pmsPropertyIds=pricelist.pms_property_ids.mapped("id"), pmsPropertyIds=pricelist.pms_property_ids.mapped("id"),
) )
) )

2
pms_api_rest/services/pms_reservation_service.py
View File

@@ -105,7 +105,7 @@ class PmsReservationService(Component):
reservationType=reservation.reservation_type, reservationType=reservation.reservation_type,
priceTotal=reservation.price_room_services_set, priceTotal=reservation.price_room_services_set,
discount=reservation.discount, discount=reservation.discount,
commissionAmount=reservation.commission_amount commissionAmount=round(reservation.commission_amount, 2)
if reservation.commission_amount if reservation.commission_amount
else None, else None,
priceOnlyServices=reservation.price_services, priceOnlyServices=reservation.price_services,