From 38eb70262a87c5486166e0423f4b145020186466 Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Thu, 13 Oct 2022 19:20:08 +0200 Subject: [PATCH] [IMP] pms-pwa: add avail. plan id to response @ av. plan rules service --- .../services/pms_availability_plan_service.py | 1 + .../services/pms_cancelation_rule_service.py | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pms_api_rest/services/pms_availability_plan_service.py b/pms_api_rest/services/pms_availability_plan_service.py index 18651bfa1..98f117d16 100644 --- a/pms_api_rest/services/pms_availability_plan_service.py +++ b/pms_api_rest/services/pms_availability_plan_service.py @@ -141,6 +141,7 @@ class PmsAvailabilityPlanService(Component): closedArrival=rule.closed_arrival, quota=rule.quota if rule.quota != -1 else 0, maxAvailability=rule.max_avail, + availabilityPlanId=rule.availability_plan_id, ) result.append(availability_plan_rule_info) diff --git a/pms_api_rest/services/pms_cancelation_rule_service.py b/pms_api_rest/services/pms_cancelation_rule_service.py index 2f16b5cbd..d0616f032 100644 --- a/pms_api_rest/services/pms_cancelation_rule_service.py +++ b/pms_api_rest/services/pms_cancelation_rule_service.py @@ -34,16 +34,16 @@ class PmsCancelationRuleService(Component): ) if cancelation_rule_search_param.pmsPropertyId: domain.extend( - [ - '|', - ( - "pms_property_ids", - "in", - [cancelation_rule_search_param.pmsPropertyId], - ), - ("pms_property_ids", "=", False), - ] - ) + [ + "|", + ( + "pms_property_ids", + "in", + [cancelation_rule_search_param.pmsPropertyId], + ), + ("pms_property_ids", "=", False), + ] + ) result_cancelation_rules = [] PmsCancelationRuleInfo = self.env.datamodels["pms.cancelation.rule.info"] for cancelation_rule in self.env["pms.cancelation.rule"].search(