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

Merge branch '11.0' of https://github.com/hootel/hootel into 11.0

Browse Source
This commit is contained in:
Dario Lodeiros
2019-08-07 13:50:25 +02:00
parent d107bcc2b4 92920b3e3f
commit 80fbfcee0b
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hotel_channel_connector_wubook/models/hotel_reservation/importer.py
View File

@@ -252,6 +252,18 @@ class HotelReservationImporter(Component):
return (checkin_utc_dt, checkout_utc_dt)
def _force_update_availability_wubook(self, binding):
# WuBook always add +1 in the channel manager for cancelled reservation
# However, the quota in Odoo has preference in the availability
cancelled_dates = binding.reservation_line_ids.mapped('date')
channel_availability = self.env['channel.hotel.room.type.availability'].search([
('backend_id', '=', binding.backend_id.id),
('date', 'in', cancelled_dates)
])
channel_availability.write({'channel_pushed': False})
# Force an update with the correct availability
channel_availability.push_availability(binding.backend_id)
def _update_reservation_binding(self, binding, book):
is_cancellation = book['status'] in WUBOOK_STATUS_BAD
binding.with_context({'connector_no_export': True}).write({
@@ -270,16 +282,7 @@ class HotelReservationImporter(Component):
binding.odoo_id.with_context({
'connector_no_export': True,
'ota_limits': False}).action_cancel()
# WuBook always add +1 in the channel manager for cancelled reservation
# However, the quota in Odoo has preference in the availability
cancelled_dates = binding.reservation_line_ids.mapped('date')
channel_availability = self.env['channel.hotel.room.type.availability'].search([
('backend_id', '=', binding.backend_id.id),
('date', 'in', cancelled_dates)
])
channel_availability.write({'channel_pushed': False})
# Force an update with the correct availability
channel_availability.push_availability(binding.backend_id)
self._force_update_availability_wubook(binding)
elif binding.state == 'cancelled':
binding.with_context({
'connector_no_export': True,
@@ -336,6 +339,8 @@ class HotelReservationImporter(Component):
reservations -= reservation
else:
new_books.append(broom)
# Review quota if new reservation is a modification not recognized in this method
# because quota is __always__ decreased when creating reservation, even in the overlapped days
return new_books, reservations
@@ -410,6 +415,7 @@ class HotelReservationImporter(Component):
'connector_no_export': True,
'ota_limits': False,
'no_penalty': True}).action_cancel()
self._force_update_availability_wubook(res.channel_bind_ids[0])
if len(new_books) == 0:
processed_rids.append(rcode)
continue

4
hotel_channel_connector_wubook/models/hotel_room_type/exporter.py
View File

@@ -23,7 +23,7 @@ class HotelRoomTypeExporter(Component):
boards.update(
{board.channel_service: {
'dtype': 2 if board.price_type == 'fixed' else 1,
'value': board.amount}}
'value': board.amount * binding.ota_capacity}}
) and board.channel_service
return self.backend_adapter.modify_room(
binding.external_id,
@@ -59,7 +59,7 @@ class HotelRoomTypeExporter(Component):
boards.update(
{board.channel_service: {
'dtype': 2 if board.price_type == 'fixed' else 1,
'value': board.amount}}
'value': board.amount * binding.ota_capacity}}
) and board.channel_service
external_id = self.backend_adapter.create_room(
short_code,