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

[WIP] refactoring res.config.settings' for hotel calendar

Browse Source
This commit is contained in:
Pablo
2019-08-29 19:40:46 +02:00
parent a41c4c6902
commit be9348ce96
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hotel_calendar/models/hotel_calendar_management.py
View File

@@ -141,11 +141,11 @@ class HotelCalendarManagement(models.TransientModel):
date_start_str = date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT) date_start_str = date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
user_id = self.env['res.users'].browse(self.env.uid) user_id = self.env['res.users'].browse(self.env.uid)
domain = [] domain = []
if user_id.pms_allowed_events_tags: if self.env.user.hotel_id.pms_allowed_events_tags:
domain.append(('categ_ids', 'in', user_id.pms_allowed_events_tags)) domain.append(('categ_ids', 'in', self.env.user.hotel_id.pms_allowed_events_tags))
if user_id.pms_denied_events_tags: if self.env.user.hotel_id.pms_denied_events_tags:
domain.append( domain.append(
('categ_ids', 'not in', user_id.pms_denied_events_tags)) ('categ_ids', 'not in', self.env.user.hotel_id.pms_denied_events_tags))
events_raw = self.env['calendar.event'].search(domain) events_raw = self.env['calendar.event'].search(domain)
events_ll = self.env['calendar.event'].search([ events_ll = self.env['calendar.event'].search([
('start', '<=', dto), ('start', '<=', dto),
@@ -272,6 +272,6 @@ class HotelCalendarManagement(models.TransientModel):
'eday_week': user_id.npms_end_day_week, 'eday_week': user_id.npms_end_day_week,
'eday_week_offset': user_id.npms_end_day_week_offset, 'eday_week_offset': user_id.npms_end_day_week_offset,
'days': user_id.npms_default_num_days, 'days': user_id.npms_default_num_days,
'show_notifications': user_id.pms_show_notifications, 'show_notifications': self.env.user.pms_show_notifications,
'show_num_rooms': user_id.pms_show_num_rooms, 'show_num_rooms': self.env.user.hotel_id.pms_show_num_rooms,
} }

39
hotel_calendar/models/inherited_hotel_reservation.py
View File

@@ -295,16 +295,19 @@ class HotelReservation(models.Model):
@api.model @api.model
def get_hcalendar_restrictions_data(self, dfrom_dt, dto_dt): def get_hcalendar_restrictions_data(self, dfrom_dt, dto_dt):
# TODO: refactoring res.config.settings', 'default_restriction_id by the current hotel.property.restriction_id """ Returns the room type restrictions between dfrom_dt and dto_dt
restriction_id = self.env.user.hotel_id.restriction_id.id for the room types of the current_hotel and the its default restriction plan
"""
hotel_id = self.env.user.hotel_id.id hotel_id = self.env.user.hotel_id.id
# Get Restrictions restriction_id = self.env.user.hotel_id.restriction_id.id
json_rooms_rests = {} json_rooms_rests = {}
room_typed_ids = self.env['hotel.room.type'].search([], order='sequence ASC') room_typed_ids = self.env['hotel.room.type'].search([
('hotel_id', '=', hotel_id)
], order='sequence ASC')
room_type_rest_obj = self.env['hotel.room.type.restriction.item'] room_type_rest_obj = self.env['hotel.room.type.restriction.item']
rtype_rest_ids = room_type_rest_obj.search([ rtype_rest_ids = room_type_rest_obj.search([
('hotel_id', '=', hotel_id),
('room_type_id', 'in', room_typed_ids.ids), ('room_type_id', 'in', room_typed_ids.ids),
('date', '>=', dfrom_dt), ('date', '>=', dfrom_dt),
('date', '<=', dto_dt), ('date', '<=', dto_dt),
@@ -340,31 +343,31 @@ class HotelReservation(models.Model):
('start', '>=', dfrom_dt.strftime(DEFAULT_SERVER_DATE_FORMAT)), ('start', '>=', dfrom_dt.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('stop', '<=', dto_dt.strftime(DEFAULT_SERVER_DATE_FORMAT)) ('stop', '<=', dto_dt.strftime(DEFAULT_SERVER_DATE_FORMAT))
] ]
if user_id.pms_allowed_events_tags: if self.env.user.hotel_id.pms_allowed_events_tags:
domain.append(('categ_ids', 'in', user_id.pms_allowed_events_tags)) domain.append(('categ_ids', 'in', self.env.user.hotel_id.pms_allowed_events_tags))
if user_id.pms_denied_events_tags: if self.env.user.hotel_id.pms_denied_events_tags:
domain.append( domain.append(
('categ_ids', 'not in', user_id.pms_denied_events_tags)) ('categ_ids', 'not in', self.env.user.hotel_id.pms_denied_events_tags))
events_raw = self.env['calendar.event'].search(domain) events_raw = self.env['calendar.event'].search(domain)
return self._hcalendar_event_data(events_raw) return self._hcalendar_event_data(events_raw)
@api.model @api.model
def get_hcalendar_settings(self): def get_hcalendar_settings(self):
user_id = self.env['res.users'].browse(self.env.uid) user_id = self.env['res.users'].browse(self.env.uid)
type_move = user_id.pms_type_move type_move = self.env.user.hotel_id.pms_type_move
return { return {
'divide_rooms_by_capacity': user_id.pms_divide_rooms_by_capacity, 'divide_rooms_by_capacity': self.env.user.hotel_id.pms_divide_rooms_by_capacity,
'eday_week': user_id.pms_end_day_week, 'eday_week': self.env.user.hotel_id.pms_end_day_week,
'eday_week_offset': user_id.pms_end_day_week_offset, 'eday_week_offset': self.env.user.hotel_id.pms_end_day_week_offset,
'days': user_id.pms_default_num_days, 'days': self.env.user.hotel_id.pms_default_num_days,
'allow_invalid_actions': type_move == 'allow_invalid', 'allow_invalid_actions': type_move == 'allow_invalid',
'assisted_movement': type_move == 'assisted', 'assisted_movement': type_move == 'assisted',
'default_arrival_hour': self.env.user.hotel_id.arrival_hour, 'default_arrival_hour': self.env.user.hotel_id.arrival_hour,
'default_departure_hour': self.env.user.hotel_id.departure_hour, 'default_departure_hour': self.env.user.hotel_id.departure_hour,
'show_notifications': user_id.pms_show_notifications, 'show_notifications': self.env.user.pms_show_notifications,
'show_pricelist': user_id.pms_show_pricelist, 'show_pricelist': self.env.user.pms_show_pricelist,
'show_availability': user_id.pms_show_availability, 'show_availability': self.env.user.pms_show_availability,
'show_num_rooms': user_id.pms_show_num_rooms, 'show_num_rooms': self.env.user.hotel_id.pms_show_num_rooms,
} }
@api.model @api.model