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] Use real_dates for showing correct checkin/checkout in splitted reservation

Browse Source
This commit is contained in:
Pablo
2019-01-22 18:50:39 +01:00
parent 81a69f5a1d
commit ed9ffcb31e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hotel_calendar/models/bus_hotel_calendar.py
View File

@@ -68,6 +68,7 @@ class BusHotelCalendar(models.TransientModel):
'type': vals['reservation_type'], 'type': vals['reservation_type'],
'out_service_description': vals['out_service_description'], 'out_service_description': vals['out_service_description'],
'splitted': vals['splitted'], 'splitted': vals['splitted'],
'real_dates': vals['real_dates'],
'channel_type': vals['channel_type'], 'channel_type': vals['channel_type'],
} }
} }

1
hotel_calendar/models/inherited_hotel_reservation.py
View File

@@ -117,6 +117,7 @@ class HotelReservation(models.Model):
or _('No reason given'), or _('No reason given'),
'splitted': reserv['splitted'], 'splitted': reserv['splitted'],
'channel_type': reserv['channel_type'], 'channel_type': reserv['channel_type'],
'real_dates': [reserv['real_checkin'], reserv['real_checkout']],
# TODO: Add Board Services and Extra Service as Cradle, Bed, ... # TODO: Add Board Services and Extra Service as Cradle, Bed, ...
} }
}) })

8
hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
View File

@@ -746,10 +746,10 @@ var PMSCalendarController = AbstractController.extend({
'room_type_name': tp['room_type_name'], 'room_type_name': tp['room_type_name'],
'adults': tp['adults'], 'adults': tp['adults'],
'children': tp['children'], 'children': tp['children'],
'checkin': HotelCalendar.toMomentUTC(tp['checkin'], '').format("DD MMMM"), 'checkin': HotelCalendar.toMomentUTC(tp['real_dates'][0], '').format("DD MMMM"),
'checkin_day_of_week': HotelCalendar.toMomentUTC(tp['checkin'], '').format("dddd"), 'checkin_day_of_week': HotelCalendar.toMomentUTC(tp['real_dates'][0], '').format("dddd"),
'checkout': HotelCalendar.toMomentUTC(tp['checkout'], '').format("DD MMMM"), 'checkout': HotelCalendar.toMomentUTC(tp['real_dates'][1], '').format("DD MMMM"),
'checkout_day_of_week': HotelCalendar.toMomentUTC(tp['checkout'], '').format("dddd"), 'checkout_day_of_week': HotelCalendar.toMomentUTC(tp['real_dates'][1], '').format("dddd"),
'arrival_hour': tp['arrival_hour'], 'arrival_hour': tp['arrival_hour'],
'departure_hour': tp['departure_hour'], 'departure_hour': tp['departure_hour'],
'amount_total': Number(tp['amount_total']).toLocaleString(), 'amount_total': Number(tp['amount_total']).toLocaleString(),