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 'hotel_calendar' of https://github.com/hootel/hootel into 11.0

Browse Source
This commit is contained in:
Dario Lodeiros
2018-11-07 18:53:02 +01:00
parent 2ea07ec33f 667e5c6b63
commit ccfb72d617
61 changed files with 1590 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hotel_calendar/models/bus_hotel_calendar.py
View File

@@ -110,7 +110,7 @@ class BusHotelCalendar(models.TransientModel):
return {
'type': 'availability',
'availability': {
vals['room_id']: {
vals['room_type_id']: {
date_dt.strftime("%d/%m/%Y"): [
vals['avail'],
vals['no_ota'],

6
hotel_calendar/models/inherited_hotel_room_type_availability.py
View File

@@ -8,7 +8,7 @@ class HotelRoomTypeAvailability(models.Model):
@api.model
def create(self, vals):
res = super(HotelVirtualRoomAvailability, self).create(vals)
res = super(HotelRoomTypeAvailability, self).create(vals)
self.env['bus.hotel.calendar'].send_availability_notification({
'date': res.date,
'avail': res.avail,
@@ -20,7 +20,7 @@ class HotelRoomTypeAvailability(models.Model):
@api.multi
def write(self, vals):
ret_vals = super(HotelVirtualRoomAvailability, self).write(vals)
ret_vals = super(HotelRoomTypeAvailability, self).write(vals)
bus_hotel_calendar_obj = self.env['bus.hotel.calendar']
for record in self:
bus_hotel_calendar_obj.send_availability_notification({
@@ -44,7 +44,7 @@ class HotelRoomTypeAvailability(models.Model):
'no_ota': False,
'id': record.id,
})
res = super(HotelVirtualRoomAvailability, self).unlink()
res = super(HotelRoomTypeAvailability, self).unlink()
bus_hotel_calendar_obj = self.env['bus.hotel.calendar']
for uval in unlink_vals:
bus_hotel_calendar_obj.send_availability_notification(uval)

12
hotel_calendar/models/inherited_ir_default.py
View File

@@ -25,10 +25,10 @@ class IrDefault(models.Model):
fixed_price = pitem.fixed_price
room_type = room_type_obj.search([
('product_id.product_tmpl_id', '=', product_tmpl_id),
('date_start', '>=', fields.Date.today())
], limit=1)
room_pr_cached_obj.create({
'room_type_id': room_type.id,
'date': date_start,
'price': fixed_price,
})
if room_type:
room_pr_cached_obj.create({
'room_id': room_type.id,
'date': date_start,
'price': fixed_price,
})

34
hotel_calendar/views/res_config_views.xml
View File

@@ -8,24 +8,22 @@
<field name="priority" eval="80"/>
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
<div class="app_settings_block o_not_app" data-string="Hotel" string="Hotel" data-key="hotel" groups="hotel.group_hotel_manager">
<h2>Calendar colors</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<field name="color_pre_reservation" required="True" widget="color"/><field name="color_letter_pre_reservation" required="True" widget="color" />
<field name="color_reservation" required="True" widget="color"/><field name="color_letter_reservation" required="True" widget="color" />
<field name="color_reservation_pay" required="True" widget="color"/><field name="color_letter_reservation_pay" required="True" widget="color" />
<field name="color_stay" required="True" widget="color"/><field name="color_letter_stay" required="True" widget="color" />
<field name="color_stay_pay" required="True" widget="color"/><field name="color_letter_stay_pay" required="True" widget="color" />
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<field name="color_checkout" required="True" widget="color"/><field name="color_letter_checkout" required="True" widget="color" />
<field name="color_dontsell" required="True" widget="color"/><field name="color_letter_dontsell" required="True" widget="color" />
<field name="color_staff" required="True" widget="color"/><field name="color_letter_staff" required="True" widget="color" />
<field name="color_to_assign" required="True" widget="color"/><field name="color_letter_to_assign" required="True" widget="color" />
<field name="color_payment_pending" required="True" widget="color"/><field name="color_letter_payment_pending" required="True" widget="color" />
</div>
<xpath expr="//div[@data-key='hotel']" position="inside">
<h2>Calendar colors</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<field name="color_pre_reservation" required="True" widget="color"/><field name="color_letter_pre_reservation" required="True" widget="color" />
<field name="color_reservation" required="True" widget="color"/><field name="color_letter_reservation" required="True" widget="color" />
<field name="color_reservation_pay" required="True" widget="color"/><field name="color_letter_reservation_pay" required="True" widget="color" />
<field name="color_stay" required="True" widget="color"/><field name="color_letter_stay" required="True" widget="color" />
<field name="color_stay_pay" required="True" widget="color"/><field name="color_letter_stay_pay" required="True" widget="color" />
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<field name="color_checkout" required="True" widget="color"/><field name="color_letter_checkout" required="True" widget="color" />
<field name="color_dontsell" required="True" widget="color"/><field name="color_letter_dontsell" required="True" widget="color" />
<field name="color_staff" required="True" widget="color"/><field name="color_letter_staff" required="True" widget="color" />
<field name="color_to_assign" required="True" widget="color"/><field name="color_letter_to_assign" required="True" widget="color" />
<field name="color_payment_pending" required="True" widget="color"/><field name="color_letter_payment_pending" required="True" widget="color" />
</div>
</div>
</xpath>