[WIP] Wizard Node Reservation

This commit is contained in:
Pablo
2018-11-05 09:20:32 +01:00
parent f8ce78bb22
commit 225c55cdc3
2 changed files with 98 additions and 109 deletions

View File

@@ -34,74 +34,46 @@ class HotelNodeReservationWizard(models.TransientModel):
today = fields.Date.context_today(self.with_context()) today = fields.Date.context_today(self.with_context())
return (fields.Date.from_string(today) + timedelta(days=1)).strftime(DEFAULT_SERVER_DATE_FORMAT) return (fields.Date.from_string(today) + timedelta(days=1)).strftime(DEFAULT_SERVER_DATE_FORMAT)
@api.model
def _default_room_type_wizard_ids(self):
node_id = self.env['project.project'].browse(self._context.get('node_id'))
checkin = self._default_checkin()
checkout = self._default_checkout()
room_type_wizard_ids = node_id.room_type_ids.mapped(lambda room_type_id: (0, False, {
'room_type_id': room_type_id.id,
'room_type_availability': 0,
'checkin': checkin,
'checkout': checkout,
}))
return room_type_wizard_ids
node_id = fields.Many2one('project.project', 'Hotel', required=True, default=_default_node_id) node_id = fields.Many2one('project.project', 'Hotel', required=True, default=_default_node_id)
partner_id = fields.Many2one('res.partner', string="Customer", required=True) partner_id = fields.Many2one('res.partner', string="Customer", required=True)
checkin = fields.Date('Check In', required=True, default=_default_checkin)
checkout = fields.Date('Check Out', required=True, default=_default_checkout)
room_type_wizard_ids = fields.One2many('node.room.type.wizard', 'node_reservation_wizard_id', room_type_wizard_ids = fields.One2many('node.room.type.wizard', 'node_reservation_wizard_id',
string="Room Types", default=_default_room_type_wizard_ids) string="Room Types")
price_total = fields.Float(string='Total Price', compute='_compute_price_total', store=True) price_total = fields.Float(string='Total Price', compute='_compute_price_total', store=True)
@api.constrains('room_type_wizard_ids.room_qty') # FIXED @constrains parameter 'room_type_wizard_ids.room_qty' is not a field name
def _check_room_type_wizard_ids(self): @api.constrains('room_type_wizard_ids')
""" def _check_room_type_wizard_total_qty(self):
:raise: ValidationError for rec in self:
""" total_qty = 0
total_qty = 0 for rec_room_type in rec.room_type_wizard_ids:
for rec in self.room_type_wizard_ids: total_qty += rec_room_type.room_qty
total_qty += rec.room_qty
if total_qty == 0: if total_qty == 0:
msg = _("It is not possible to create the reservation.") + " " + \ msg = _("It is not possible to create the reservation.") + " " + \
_("Maybe you forgot adding the quantity to at least one type of room?.") _("Maybe you forgot adding the quantity to at least one type of room?.")
raise ValidationError(msg) raise ValidationError(msg)
@api.depends('room_type_wizard_ids.price_total') @api.depends('room_type_wizard_ids.price_total')
def _compute_price_total(self): def _compute_price_total(self):
_logger.info('_compute_price_total for wizard %s', self.id) for rec in self:
self.price_total = 0.0 _logger.info('_compute_price_total for wizard %s', rec.id)
for rec in self.room_type_wizard_ids: rec.price_total = 0.0
self.price_total += rec.price_total for rec_room_type in rec.room_type_wizard_ids:
rec.price_total += rec_room_type.price_total
@api.onchange('node_id') @api.onchange('node_id')
def _onchange_node_id(self): def _onchange_node_id(self):
self.ensure_one()
if self.node_id: if self.node_id:
_logger.info('_onchange_node_id(self): %s', self) _logger.info('_onchange_node_id(self): %s', self)
# TODO Save your credentials (session) # TODO Save your credentials (session)
_logger.info('_compute_room_types for node %s', self.node_id)
@api.onchange('checkin', 'checkout') cmds = self.node_id.room_type_ids.mapped(lambda room_type_id: (0, False, {
def _onchange_dates(self): 'node_id': self.node_id.id,
self.ensure_one() 'room_type_id': room_type_id.id,
_logger.info('_onchange_dates(self): %s', self) 'checkin': self._default_checkin(),
'checkout': self._default_checkout(),
# TODO check hotel timezone }))
self.checkin = self._default_checkin() if not self.checkin \ self.room_type_wizard_ids = cmds
else fields.Date.from_string(self.checkin)
self.checkout = self._default_checkout() if not self.checkout \
else fields.Date.from_string(self.checkout)
if fields.Date.from_string(self.checkin) >= fields.Date.from_string(self.checkout):
self.checkout = (fields.Date.from_string(self.checkin) + timedelta(days=1)).strftime(
DEFAULT_SERVER_DATE_FORMAT)
# update room_type_wizard_ids
for rec in self.room_type_wizard_ids:
if self.checkin != rec.checkin:
_logger.warning('_onchange_dates need new data for room_type: %s', rec.room_type_id)
@api.multi @api.multi
def create_node_reservation(self): def create_node_reservation(self):
@@ -119,22 +91,18 @@ class HotelNodeReservationWizard(models.TransientModel):
room_lines = [] room_lines = []
for rec in self.room_type_wizard_ids: for rec in self.room_type_wizard_ids:
for x in range(rec.room_qty): for x in range(rec.room_qty):
# vals_reservation_lines = {
# 'partner_id': remote_partner_id,
# 'room_type_id': rec.room_type_id.remote_room_type_id,
# }
# add discount
# reservation_line_ids = noderpc.env['hotel.reservation'].prepare_reservation_lines(
# rec.checkin,
# (fields.Date.from_string(rec.checkout) - fields.Date.from_string(rec.checkin)).days,
# vals_reservation_lines
# ) # [[5, 0, 0], ¿?
wdb.set_trace() wdb.set_trace()
# prepare hotel reservation lines with details by day
reservation_line_cmds = rec.room_type_line_ids.mapped(lambda reservation_line: (0, False, {
'date': reservation_line.date,
'price': reservation_line.price,
}))
# add discount
room_lines.append((0, False, { room_lines.append((0, False, {
'room_type_id': rec.room_type_id.remote_room_type_id, 'room_type_id': rec.room_type_id.remote_room_type_id,
'checkin': rec.checkin, 'checkin': rec.checkin,
'checkout': rec.checkout, 'checkout': rec.checkout,
# 'reservation_line_ids': reservation_line_ids['reservation_line_ids'], 'reservation_line_ids': reservation_line_cmds,
})) }))
vals.update({'room_lines': room_lines}) vals.update({'room_lines': room_lines})
@@ -147,7 +115,7 @@ class HotelNodeReservationWizard(models.TransientModel):
noderpc.logout() noderpc.logout()
# return self._open_wizard_action_search() # TODO return a wizard and preview the resevation
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err: except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err) raise ValidationError(err)
@@ -169,29 +137,41 @@ class NodeRoomTypeWizard(models.TransientModel):
_name = "node.room.type.wizard" _name = "node.room.type.wizard"
_description = "Node Room Type Wizard" _description = "Node Room Type Wizard"
node_reservation_wizard_id = fields.Many2one('hotel.node.reservation.wizard') @api.model
def _default_node_id(self):
return self._context.get('node_id') or None
@api.model
def _default_checkin(self):
today = fields.Date.context_today(self.with_context())
return fields.Date.from_string(today).strftime(DEFAULT_SERVER_DATE_FORMAT)
@api.model
def _default_checkout(self):
today = fields.Date.context_today(self.with_context())
return (fields.Date.from_string(today) + timedelta(days=1)).strftime(DEFAULT_SERVER_DATE_FORMAT)
node_reservation_wizard_id = fields.Many2one('hotel.node.reservation.wizard',
ondelete = 'cascade', required = True)
node_id = fields.Many2one('project.project', 'Hotel', default=_default_node_id, required=True)
room_type_id = fields.Many2one('hotel.node.room.type', 'Rooms Type') room_type_id = fields.Many2one('hotel.node.room.type', 'Rooms Type')
room_type_availability = fields.Integer('Availability', compute="_compute_restrictions", readonly=True, store=True) room_type_availability = fields.Integer('Availability', compute="_compute_restrictions", readonly=True, store=True)
room_qty = fields.Integer('Quantity', default=0) room_qty = fields.Integer('Quantity', default=0)
room_type_line_ids = fields.One2many('node.room.type.line.wizard', 'node_room_type_line_wizard_id', room_type_line_ids = fields.One2many('node.room.type.line.wizard', 'node_room_type_line_wizard_id',
compute="_compute_restrictions", string="Room type detail per day.") string="Room type detail per day")
checkin = fields.Date('Check In', required=True) checkin = fields.Date('Check In', default=_default_checkin, required=True)
checkout = fields.Date('Check Out', required=True) checkout = fields.Date('Check Out', default=_default_checkout, required=True)
nights = fields.Integer('Nights', compute="_compute_nights", readonly=True, store=True) nights = fields.Integer('Nights', compute='_compute_nights', readonly=True)
min_stay = fields.Integer('Min. Days', compute="_compute_restrictions", readonly=True, store=True) min_stay = fields.Integer('Min. Days', compute="_compute_restrictions", readonly=True, store=True)
# price_unit indicates Room Price x Nights price_unit = fields.Float(string='Room Price', compute="_compute_restrictions", readonly=True, store=True)
price_unit = fields.Float(string='Room Price', compute="_compute_restrictions", store=True)
discount = fields.Float(string='Discount (%)', default=0.0) discount = fields.Float(string='Discount (%)', default=0.0)
price_total = fields.Float(string='Total Price', compute='_compute_price_total', readonly=True, store=True) price_total = fields.Float(string='Total Price', compute='_compute_price_total', readonly=True, store=True)
@api.constrains('room_qty') @api.constrains('room_qty')
def _check_room_qty(self): def _check_room_qty(self):
"""
:raise: ValidationError
"""
total_qty = 0 total_qty = 0
for rec in self: for rec in self:
if (rec.room_type_availability < rec.room_qty) or (rec.room_qty > 0 and rec.nights < rec.min_stay): if (rec.room_type_availability < rec.room_qty) or (rec.room_qty > 0 and rec.nights < rec.min_stay):
@@ -217,38 +197,38 @@ class NodeRoomTypeWizard(models.TransientModel):
for rec in self: for rec in self:
if rec.checkin and rec.checkout: if rec.checkin and rec.checkout:
try: try:
node_id = rec.node_reservation_wizard_id.node_id
# TODO Load your credentials (session) ... should be faster? # TODO Load your credentials (session) ... should be faster?
noderpc = odoorpc.ODOO(node_id.odoo_host, node_id.odoo_protocol, node_id.odoo_port) noderpc = odoorpc.ODOO(rec.node_id.odoo_host, rec.node_id.odoo_protocol, rec.node_id.odoo_port)
noderpc.login(node_id.odoo_db, node_id.odoo_user, node_id.odoo_password) noderpc.login(rec.node_id.odoo_db, rec.node_id.odoo_user, rec.node_id.odoo_password)
_logger.info('_compute_restrictions [availability] for room type %s', rec.room_type_id)
rec.room_type_availability = noderpc.env['hotel.room.type'].get_room_type_availability( rec.room_type_availability = noderpc.env['hotel.room.type'].get_room_type_availability(
rec.checkin, rec.checkin,
rec.checkout, rec.checkout,
rec.room_type_id.remote_room_type_id) rec.room_type_id.remote_room_type_id)
_logger.warning('_compute_restrictions [availability: %s] for room type %s', rec.room_type_availability, rec.room_type_id)
# rec.room_type_line_ids = noderpc.env['hotel.room.type'].get_room_type_price_unit( _logger.info('_compute_restrictions [price_unit] for room type %s', rec.room_type_id)
# rec.checkin, rec.room_type_line_ids = noderpc.env['hotel.room.type'].get_room_type_price_unit(
# rec.checkout, rec.checkin,
# rec.room_type_id.remote_room_type_id) rec.checkout,
cmds = [] rec.room_type_id.remote_room_type_id)
for x in range(rec.nights): # cmds = []
cmds.append((0, False, { # for x in range(rec.nights):
'node_room_type_line_wizard_id': rec.id, # cmds.append((0, False, {
'date': (fields.Date.from_string(rec.checkin) + timedelta(days=x)).strftime( # 'date': (fields.Date.from_string(rec.checkin) + timedelta(days=x)).strftime(
DEFAULT_SERVER_DATE_FORMAT), # DEFAULT_SERVER_DATE_FORMAT),
'price': 0.0, # 'price': 25.0,
})) # }))
rec.room_type_line_ids = cmds # from pprint import pprint
# pprint(cmds)
# rec.room_type_line_ids = cmds
rec.price_unit = sum(rec.room_type_line_ids.mapped('price')) rec.price_unit = sum(rec.room_type_line_ids.mapped('price'))
_logger.warning('_compute_restrictions [price_unit: %s] for room type %s', rec.price_unit, rec.room_type_id)
_logger.info('_compute_restrictions [min days] for room type %s', rec.room_type_id)
rec.min_stay = noderpc.env['hotel.room.type'].get_room_type_restrictions( rec.min_stay = noderpc.env['hotel.room.type'].get_room_type_restrictions(
rec.checkin, rec.checkin,
rec.checkout, rec.checkout,
rec.room_type_id.remote_room_type_id) rec.room_type_id.remote_room_type_id)
_logger.warning('_compute_restrictions [min days: %s] for room type %s', rec.min_stay, rec.room_type_id)
noderpc.logout() noderpc.logout()
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err: except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
@@ -267,12 +247,11 @@ class NodeRoomTypeWizard(models.TransientModel):
@api.onchange('checkin', 'checkout') @api.onchange('checkin', 'checkout')
def _onchange_dates(self): def _onchange_dates(self):
_logger.info('+++ _onchange_dates for room type %s +++', self.room_type_id) _logger.info('_onchange_dates for room type: %s', self.room_type_id)
if not self.checkin:
self.checkin = self._default_checkin() \ self.checkin = self._default_checkin()
if not self.checkin else fields.Date.from_string(self.checkin) if not self.checkout:
self.checkout = self._default_checkout() \ self.checkout = self._default_checkout()
if not self.checkout else fields.Date.from_string(self.checkout)
if fields.Date.from_string(self.checkin) >= fields.Date.from_string(self.checkout): if fields.Date.from_string(self.checkin) >= fields.Date.from_string(self.checkout):
self.checkout = (fields.Date.from_string(self.checkin) + timedelta(days=1)).strftime( self.checkout = (fields.Date.from_string(self.checkin) + timedelta(days=1)).strftime(
@@ -298,6 +277,7 @@ class NodeSearchWizard(models.TransientModel):
return self._context.get('node_id') or None return self._context.get('node_id') or None
node_id = fields.Many2one('project.project', 'Hotel', default=_default_node_id) node_id = fields.Many2one('project.project', 'Hotel', default=_default_node_id)
node_folio_wizard_id = fields.Many2one('node.folio.wizard')
folio = fields.Char('Folio Number') folio = fields.Char('Folio Number')
partner_id = fields.Many2one('res.partner', string="Customer") partner_id = fields.Many2one('res.partner', string="Customer")
email = fields.Char('E-mail', related='partner_id.email') email = fields.Char('E-mail', related='partner_id.email')

View File

@@ -13,22 +13,24 @@
</h1> </h1>
</div> </div>
<group attrs="{'invisible':[('node_id','=',False)]}"> <group attrs="{'invisible':[('node_id','=',False)]}">
<group name="dates"> <!--<group name="dates">-->
<field name="checkin" required="1" widget="date" /> <!--<field name="checkin" required="1" widget="date" />-->
<field name="checkout" required="1" widget="date" /> <!--<field name="checkout" required="1" widget="date" />-->
</group> <!--</group>-->
<group> <group>
<field name="partner_id"/> <field name="partner_id"/>
</group> </group>
<group name="room_type_wizard_ids" colspan="2"> <group name="room_type_wizard_ids" colspan="2">
<field name="room_type_wizard_ids" nolabel="1"> <field name="room_type_wizard_ids" nolabel="1"
context="{'default_node_reservation_wizard_id': active_id}">
<tree editable="bottom" create="false" delete="false" <tree editable="bottom" create="false" delete="false"
decoration-muted="room_type_availability == 0"> decoration-muted="room_type_availability == 0">
<field name="node_reservation_wizard_id" invisible="1"/> <field name="node_reservation_wizard_id" invisible="1"/>
<field name="node_id" invisible="1"/>
<field name="room_type_id" string="Room Type" readonly="1" force_save="1"/> <field name="room_type_id" string="Room Type" readonly="1" force_save="1"/>
<field name="room_type_availability" readonly="1"/> <field name="room_type_availability" readonly="1"/>
<field name="room_qty"/> <field name="room_qty"/>
<field name="room_type_line_ids" invisible="1"/> <field name="room_type_line_ids"/>
<field name="checkin" widget="date"/> <field name="checkin" widget="date"/>
<field name="checkout" widget="date"/> <field name="checkout" widget="date"/>
<field name="nights"/> <field name="nights"/>
@@ -75,6 +77,15 @@
<field name="partner_id"/> <field name="partner_id"/>
</group> </group>
</group> </group>
<group>
<group>
<field name="folio"/>
<field name="checkin"/>
</group>
<group>
<field name="partner_id"/>
</group>
</group>
<footer attrs="{'invisible':[('node_id','=',False)]}"> <footer attrs="{'invisible':[('node_id','=',False)]}">
<button name="search_node_reservation" string="Search Reservations" type="object" <button name="search_node_reservation" string="Search Reservations" type="object"
class="oe_highlight" /> class="oe_highlight" />
@@ -91,11 +102,9 @@
<field name="model">node.folio.wizard</field> <field name="model">node.folio.wizard</field>
<field name="inherit_id" ref="hotel_node_reservation_wizard_view_form" /> <field name="inherit_id" ref="hotel_node_reservation_wizard_view_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[@name='dates']" position="replace"> <field name="partner_id" position="after">
<field name="folio_id" invisible="1"/> <field name="folio_id" invisible="1"/>
<field name="folio_name"/> <field name="folio_name"/>
</xpath>
<field name="partner_id" position="after">
<field name="email"/> <field name="email"/>
<field name="internal_comment"/> <field name="internal_comment"/>
</field> </field>