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

[RFC]pms_api_rest: disables subquery services daily invoices in calendar get

Browse Source
This commit is contained in:
Darío Lodeiros
2022-12-14 11:44:34 +01:00
parent 2ca1dfdb5e
commit a2e19f115f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pms_api_rest/services/pms_calendar_service.py
View File

@@ -30,14 +30,14 @@ class PmsCalendarService(Component):
count_nights = (date_to - date_from).days + 1 count_nights = (date_to - date_from).days + 1
target_dates = [date_from + timedelta(days=x) for x in range(count_nights)] target_dates = [date_from + timedelta(days=x) for x in range(count_nights)]
pms_property_id = calendar_search_param.pmsPropertyId pms_property_id = calendar_search_param.pmsPropertyId
subselect_sum_services_price = ( # subselect_sum_services_price = (
"(" # "("
" SELECT COALESCE(SUM(s.price_day_total),0) price_day_total_services " # " SELECT COALESCE(SUM(s.price_day_total),0) price_day_total_services "
" FROM pms_service_line s " # " FROM pms_service_line s "
" WHERE s.reservation_id = night.reservation_id " # " WHERE s.reservation_id = night.reservation_id "
" AND s.date = night.date AND NOT s.is_board_service " # " AND s.date = night.date AND NOT s.is_board_service "
" ) " # " ) "
) # )
selected_fields_mapper = { selected_fields_mapper = {
"id": "night.id", "id": "night.id",
"state": "night.state", "state": "night.state",
@@ -58,7 +58,7 @@ class PmsCalendarService(Component):
"folio_pending_amount": "folio.pending_amount", "folio_pending_amount": "folio.pending_amount",
"adults": "reservation.adults", "adults": "reservation.adults",
"price_day_total": "night.price_day_total", "price_day_total": "night.price_day_total",
"price_day_total_services": subselect_sum_services_price, # "price_day_total_services": subselect_sum_services_price,
} }
selected_fields_sql = list(selected_fields_mapper.values()) selected_fields_sql = list(selected_fields_mapper.values())
selected_fields = list(selected_fields_mapper.keys()) selected_fields = list(selected_fields_mapper.keys())
@@ -142,7 +142,8 @@ class PmsCalendarService(Component):
totalPrice=round(line["price_total"], 2), totalPrice=round(line["price_total"], 2),
pendingPayment=round(line["folio_pending_amount"], 2), pendingPayment=round(line["folio_pending_amount"], 2),
priceDayTotal=round(line["price_day_total"], 0), priceDayTotal=round(line["price_day_total"], 0),
priceDayTotalServices=round(line["price_day_total_services"], 0), # TODO: priceDayTotalServices=round(line["price_day_total_services"], 0),
priceDayTotalServices=0,
# TODO: line.reservation_id.message_needaction_counter is computed field, # TODO: line.reservation_id.message_needaction_counter is computed field,
numNotifications=0, numNotifications=0,
adults=line["adults"], adults=line["adults"],