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-pwa: fix precommit

Browse Source
This commit is contained in:
miguelpadin
2022-10-17 18:29:35 +02:00
committed by Darío Lodeiros
parent bff5b2d9c4
commit ba5124cb30
2 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pms_api_rest/services/pms_partner_service.py
View File

@@ -41,12 +41,21 @@ class PmsPartnerService(Component):
domain.append(("id", "in", partners_housed.ids))
if pms_partner_search_params.filter:
domain.append(("display_name", "ilike", pms_partner_search_params.filter))
if pms_partner_search_params.vatNumber:
domain.append([
"|",
("vat", "ilike", pms_partner_search_params.vatNumber),
("aeat_identification", "ilike", pms_partner_search_params.vatNumber),
])
if pms_partner_search_params.vatNumberOrName:
subdomains = [
[("vat", "ilike", pms_partner_search_params.vatNumberOrName)],
[
(
"aeat_identification",
"ilike",
pms_partner_search_params.vatNumberOrName,
)
],
[("display_name", "ilike", pms_partner_search_params.vatNumberOrName)],
]
domain_vat_or_name = expression.OR(subdomains)
domain = expression.AND([domain, domain_vat_or_name])
PmsPartnerResults = self.env.datamodels["pms.partner.results"]
PmsPartnerInfo = self.env.datamodels["pms.partner.info"]
total_partners = self.env["res.partner"].search_count(domain)

44
pms_api_rest/services/pms_reservation_service.py
View File

@@ -128,6 +128,28 @@ class PmsReservationService(Component):
input_param=Datamodel("pms.reservation.info", is_list=False),
auth="jwt_api_pms",
)
def _create_vals_from_params(self, reservation_vals, reservation_data):
if reservation_data.preferredRoomId:
reservation_vals.update(
{"preferred_room_id": reservation_data.preferredRoomId}
)
if reservation_data.boardServiceId:
reservation_vals.update(
{"board_service_room_id": reservation_data.boardServiceId}
)
if reservation_data.pricelistId:
reservation_vals.update({"pricelist_id": reservation_data.pricelistId})
if reservation_data.adults:
reservation_vals.update({"adults": reservation_data.adults})
if reservation_data.children:
reservation_vals.update({"children": reservation_data.children})
if reservation_data.segmentationId:
reservation_vals.update(
{"segmentation_ids": [(6, 0, [reservation_data.segmentationId])]}
)
return reservation_vals
# TODO: route changed because bug route CORS patch
def update_reservation(self, reservation_id, reservation_data):
reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)])
@@ -170,30 +192,16 @@ class PmsReservationService(Component):
}
)
if reservation_data.preferredRoomId:
reservation_vals.update(
{"preferred_room_id": reservation_data.preferredRoomId}
)
if reservation_data.boardServiceId:
reservation_vals.update(
{"board_service_room_id": reservation_data.boardServiceId}
)
if reservation_data.pricelistId:
reservation_vals.update({"pricelist_id": reservation_data.pricelistId})
if reservation_data.adults:
reservation_vals.update({"adults": reservation_data.adults})
if reservation_data.children:
reservation_vals.update({"children": reservation_data.children})
if reservation_data.segmentationId:
reservation_vals.update(
{"segmentation_ids": [(6, 0, [reservation_data.segmentationId])]}
)
if reservation_data.toAssign is not None and not reservation_data.toAssign:
reservation.action_assign()
if reservation_data.stateCode == "cancel":
reservation.action_cancel()
if reservation_data.stateCode == "confirm":
reservation.confirm()
reservation_vals = self._create_vals_from_params(
reservation_vals, reservation_data
)
if reservation_vals:
reservation.write(reservation_vals)