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] sort room types by sequence in the hotel calendar

Browse Source
This commit is contained in:
Pablo
2019-05-14 12:01:06 +02:00
parent 7f4e051f38
commit b2b424d8ff
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hotel_calendar/models/inherited_hotel_reservation.py
View File

@@ -3,6 +3,7 @@
import logging import logging
from datetime import timedelta from datetime import timedelta
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from odoo.models import operator
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -246,16 +247,16 @@ class HotelReservation(models.Model):
self.env.cr.execute(''' self.env.cr.execute('''
WITH RECURSIVE gen_table_days AS ( WITH RECURSIVE gen_table_days AS (
SELECT hrt.id, %s::Date AS date SELECT hrt.id, %s::Date AS date, hrt.sequence
FROM hotel_room_type AS hrt FROM hotel_room_type AS hrt
UNION ALL UNION ALL
SELECT hrt.id, (td.date + INTERVAL '1 day')::Date SELECT hrt.id, (td.date + INTERVAL '1 day')::Date, hrt.sequence
FROM gen_table_days as td FROM gen_table_days as td
LEFT JOIN hotel_room_type AS hrt ON hrt.id=td.id LEFT JOIN hotel_room_type AS hrt ON hrt.id=td.id
WHERE td.date < %s WHERE td.date < %s
) )
SELECT SELECT
TO_CHAR(gtd.date, 'DD/MM/YYYY') as date, gtd.id as room_type_id, TO_CHAR(gtd.date, 'DD/MM/YYYY') as date, gtd.id as room_type_id, gtd.sequence,
pt.name, ppi.fixed_price as price, pt.list_price pt.name, ppi.fixed_price as price, pt.list_price
FROM gen_table_days AS gtd FROM gen_table_days AS gtd
LEFT JOIN hotel_room_type AS hrt ON hrt.id = gtd.id LEFT JOIN hotel_room_type AS hrt ON hrt.id = gtd.id
@@ -273,13 +274,17 @@ class HotelReservation(models.Model):
json_data.setdefault(results['room_type_id'], {}).update({ json_data.setdefault(results['room_type_id'], {}).update({
'title': results['name'], 'title': results['name'],
'room': results['room_type_id'], 'room': results['room_type_id'],
'sequence': results['sequence'],
}) })
json_data[results['room_type_id']].setdefault('days', {}).update({ json_data[results['room_type_id']].setdefault('days', {}).update({
results['date']: results['price'] or results['list_price'] results['date']: results['price'] or results['list_price']
}) })
json_data_by_sequence = list(json_data.values())
json_data_by_sequence.sort(key=operator.itemgetter('sequence'))
json_rooms_prices = {} json_rooms_prices = {}
for prices in list(json_data.values()): for prices in json_data_by_sequence:
json_rooms_prices.setdefault(pricelist_id, []).append(prices) json_rooms_prices.setdefault(pricelist_id, []).append(prices)
return json_rooms_prices return json_rooms_prices