[WIP] Wizard Node Reservation

Create reservation from central node reviewed
This commit is contained in:
Pablo
2018-11-02 17:15:46 +01:00
parent cdc11164cf
commit f8ce78bb22
4 changed files with 337 additions and 76 deletions

View File

@@ -8,7 +8,7 @@ import urllib.error
import odoorpc.odoo
from datetime import timedelta
from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
from odoo.exceptions import ValidationError, UserError
from odoo.tools import (
DEFAULT_SERVER_DATE_FORMAT)
@@ -16,6 +16,7 @@ _logger = logging.getLogger(__name__)
class HotelNodeReservationWizard(models.TransientModel):
# TODO Rename to node.engine.reservation.wizard
_name = "hotel.node.reservation.wizard"
_description = "Hotel Node Reservation Wizard"
@@ -33,15 +34,28 @@ class HotelNodeReservationWizard(models.TransientModel):
today = fields.Date.context_today(self.with_context())
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)
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',
string="Room Types")
price_total = fields.Float(string='Total Price', compute='_compute_price_total')
string="Room Types", default=_default_room_type_wizard_ids)
price_total = fields.Float(string='Total Price', compute='_compute_price_total', store=True)
@api.constrains('room_type_wizard_ids')
@api.constrains('room_type_wizard_ids.room_qty')
def _check_room_type_wizard_ids(self):
"""
:raise: ValidationError
@@ -75,26 +89,19 @@ class HotelNodeReservationWizard(models.TransientModel):
_logger.info('_onchange_dates(self): %s', self)
# TODO check hotel timezone
self.checkin = self._get_default_checkin() if not self.checkin \
self.checkin = self._default_checkin() if not self.checkin \
else fields.Date.from_string(self.checkin)
self.checkout = self._get_default_checkout() if not self.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):
self.checkout = (fields.Date.from_string(self.checkin) + timedelta(days=1)).strftime(
DEFAULT_SERVER_DATE_FORMAT)
cmds = self.node_id.room_type_ids.mapped(lambda room_type_id: (0, False, {
'room_type_id': room_type_id.id,
'checkin': self.checkin,
'checkout': self.checkout,
'nights': (fields.Date.from_string(self.checkout) - fields.Date.from_string(self.checkin)).days,
# 'room_type_availability': room_type_availability[room_type_id.id],
# 'price_unit': room_type_price_unit[room_type_id.id],
'node_reservation_wizard_id': self.id,
}))
self.room_type_wizard_ids = cmds
# 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
def create_node_reservation(self):
@@ -112,22 +119,22 @@ class HotelNodeReservationWizard(models.TransientModel):
room_lines = []
for rec in self.room_type_wizard_ids:
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,
}
# 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], ¿?
# 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()
room_lines.append((0, False, {
'room_type_id': rec.room_type_id.remote_room_type_id,
'checkin': rec.checkin,
'checkout': rec.checkout,
'reservation_line_ids': reservation_line_ids['reservation_line_ids'],
# 'reservation_line_ids': reservation_line_ids['reservation_line_ids'],
}))
vals.update({'room_lines': room_lines})
@@ -139,28 +146,44 @@ class HotelNodeReservationWizard(models.TransientModel):
self._context.get('uid'), folio_id)
noderpc.logout()
# return self._open_wizard_action_search()
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err)
@api.multi
def _open_wizard_action_search(self):
self.ensure_one()
return {
'type': 'ir.actions.act_window',
'res_model': self._name,
'res_id': self.id,
'view_type': 'form',
'view_mode': 'form',
'target': 'new',
}
class NodeRoomTypeWizard(models.TransientModel):
_name = "node.room.type.wizard"
_description = "Node Room Type Wizard"
node_reservation_wizard_id = fields.Many2one('hotel.node.reservation.wizard')
node_id = fields.Many2one(related='node_reservation_wizard_id.node_id')
room_type_id = fields.Many2one('hotel.node.room.type', 'Rooms Type')
room_type_name = fields.Char('Name', related='room_type_id.name')
room_type_availability = fields.Integer('Availability', compute="_compute_restrictions", readonly=True)
room_type_availability = fields.Integer('Availability', compute="_compute_restrictions", readonly=True, store=True)
room_qty = fields.Integer('Quantity', default=0)
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.")
checkin = fields.Date('Check In', required=True)
checkout = fields.Date('Check Out', required=True)
nights = fields.Integer('Nights', compute="_compute_nights", readonly=True)
min_stay = fields.Integer('Min. Days', compute="_compute_restrictions", readonly=True)
nights = fields.Integer('Nights', compute="_compute_nights", 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)
price_total = fields.Float(string='Total Price', compute='_compute_price_total', readonly=True, store=True)
@@ -173,7 +196,7 @@ class NodeRoomTypeWizard(models.TransientModel):
for rec in self:
if (rec.room_type_availability < rec.room_qty) or (rec.room_qty > 0 and rec.nights < rec.min_stay):
msg = _("At least one room type has not availability or does not meet restrictions.") + " " + \
_("Please, review room type %s between %s and %s.") % (rec.room_type_name, rec.checkin, rec.checkout)
_("Please, review room type %s between %s and %s.") % (rec.room_type_id.name, rec.checkin, rec.checkout)
_logger.warning(msg)
raise ValidationError(msg)
total_qty += rec.room_qty
@@ -183,7 +206,6 @@ class NodeRoomTypeWizard(models.TransientModel):
for rec in self:
_logger.info('_compute_price_total for room type %s', rec.room_type_id)
rec.price_total = (rec.room_qty * rec.price_unit) * (1.0 - rec.discount * 0.01)
# TODO rec.price unit trigger _compute_restriction ¿? store = True?
@api.depends('checkin', 'checkout')
def _compute_nights(self):
@@ -193,37 +215,49 @@ class NodeRoomTypeWizard(models.TransientModel):
@api.depends('checkin', 'checkout')
def _compute_restrictions(self):
for rec in self:
try:
# TODO Load your credentials (session) ... should be faster?
noderpc = odoorpc.ODOO(rec.node_id.odoo_host, rec.node_id.odoo_protocol, rec.node_id.odoo_port)
noderpc.login(rec.node_id.odoo_db, rec.node_id.odoo_user, rec.node_id.odoo_password)
if rec.checkin and rec.checkout:
try:
node_id = rec.node_reservation_wizard_id.node_id
# TODO Load your credentials (session) ... should be faster?
noderpc = odoorpc.ODOO(node_id.odoo_host, node_id.odoo_protocol, node_id.odoo_port)
noderpc.login(node_id.odoo_db, node_id.odoo_user, node_id.odoo_password)
_logger.warning('_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.checkout,
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(
# rec.checkin,
# rec.checkout,
# rec.room_type_id.remote_room_type_id)
cmds = []
for x in range(rec.nights):
cmds.append((0, False, {
'node_room_type_line_wizard_id': rec.id,
'date': (fields.Date.from_string(rec.checkin) + timedelta(days=x)).strftime(
DEFAULT_SERVER_DATE_FORMAT),
'price': 0.0,
}))
rec.room_type_line_ids = cmds
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)
rec.min_stay = noderpc.env['hotel.room.type'].get_room_type_restrictions(
rec.checkin,
rec.checkout,
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)
_logger.warning('_compute_restrictions [price_unit] for room type %s', rec.room_type_id)
rec.price_unit = noderpc.env['hotel.room.type'].get_room_type_price_unit(
rec.checkin,
rec.checkout,
rec.room_type_id.remote_room_type_id)
_logger.warning('_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.checkin,
rec.checkout,
rec.room_type_id.remote_room_type_id)
noderpc.logout()
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err)
noderpc.logout()
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err)
@api.onchange('room_qty')
def _onchange_room_qty(self):
if self.room_type_availability < self.room_qty:
msg = _("Please, review room type %s between %s and %s.") % (self.room_type_name, self.checkin, self.checkout)
msg = _("Please, review room type %s between %s and %s.") % (self.room_type_id.name, self.checkin, self.checkout)
return {
'warning': {
'title': 'Warning: Invalid room quantity',
@@ -233,7 +267,7 @@ class NodeRoomTypeWizard(models.TransientModel):
@api.onchange('checkin', 'checkout')
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)
self.checkin = self._default_checkin() \
if not self.checkin else fields.Date.from_string(self.checkin)
@@ -244,3 +278,157 @@ class NodeRoomTypeWizard(models.TransientModel):
self.checkout = (fields.Date.from_string(self.checkin) + timedelta(days=1)).strftime(
DEFAULT_SERVER_DATE_FORMAT)
class NodeRoomTypeLineWizard(models.TransientModel):
_name = "node.room.type.line.wizard"
_description = "Node Room Type Detail per Day Wizard"
node_room_type_line_wizard_id = fields.Many2one('node.room.type.wizard',
ondelete='cascade', required=True)
date = fields.Date('Date')
price = fields.Float('Price')
class NodeSearchWizard(models.TransientModel):
_name = "node.search.wizard"
_description = "Node Search Wizard"
@api.model
def _default_node_id(self):
return self._context.get('node_id') or None
node_id = fields.Many2one('project.project', 'Hotel', default=_default_node_id)
folio = fields.Char('Folio Number')
partner_id = fields.Many2one('res.partner', string="Customer")
email = fields.Char('E-mail', related='partner_id.email')
checkin = fields.Date('Check In')
checkout = fields.Date('Check Out')
@api.multi
def search_node_reservation(self):
self.ensure_one()
try:
noderpc = odoorpc.ODOO(self.node_id.odoo_host, self.node_id.odoo_protocol, self.node_id.odoo_port)
noderpc.login(self.node_id.odoo_db, self.node_id.odoo_user, self.node_id.odoo_password)
domain = []
if self.folio:
domain.append(('name', '=', 'F/' + self.folio))
if self.partner_id:
domain.append(('email', '=', self.email))
if self.checkin:
domain.append(('checkin', '=', self.checkin))
folio_id = noderpc.env['hotel.folio'].search(domain)
if not folio_id:
raise UserError(_("No reservations found."))
noderpc.logout()
# TODO Need to manage more than one folio
return self._open_wizard_action_edit(folio_id.pop())
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err)
@api.multi
def _open_wizard_action_edit(self, folio_id):
self.ensure_one()
return {
'name': _('Hotel Reservation Wizard Edit'),
'type': 'ir.actions.act_window',
'res_model': 'node.folio.wizard',
'view_id': self.env.ref('hotel_node_master.hotel_node_reservation_wizard_view_edit_form', False).id,
'view_type': 'form',
'view_mode': 'form',
'target': 'new',
'context': {'folio_id': folio_id},
}
class NodeFolioWizard(models.TransientModel):
_name = 'node.folio.wizard'
@api.model
def _default_node_id(self):
return self._context.get('node_id') or None
@api.model
def _default_folio_id(self):
return self._context.get('folio_id') or None
node_id = fields.Many2one('project.project', 'Hotel', required=True, default=_default_node_id)
folio_id = fields.Integer(required=True, default=_default_folio_id)
folio_name = fields.Char('Folio Number', readonly=True)
partner_id = fields.Many2one('res.partner', string="Customer", required=True)
internal_comment = fields.Text(string='Internal Folio Notes')
# For being used directly in the Folio views
email = fields.Char('E-mail', related='partner_id.email')
room_lines_wizard_ids = fields.One2many('node.reservation.wizard', 'node_folio_wizard_id')
price_total = fields.Float(string='Total Price')
@api.onchange('node_id')
def _onchange_node_id(self):
self.ensure_one()
_logger.info('_onchange_node_id(self): %s', self)
noderpc = odoorpc.ODOO(self.node_id.odoo_host, self.node_id.odoo_protocol, self.node_id.odoo_port)
noderpc.login(self.node_id.odoo_db, self.node_id.odoo_user, self.node_id.odoo_password)
folio = noderpc.env['hotel.folio'].browse(self.folio_id)
self.folio_name = folio.name
self.partner_id = self.env['res.partner'].search([('email', '=', folio.partner_id.email)])
self.internal_comment = folio.internal_comment
self.price_total = folio.amount_total
cmds = []
for reservation in folio.room_lines:
cmds.append((0, False, {
'node_folio_wizard_id': self.id,
'room_type_id': self.env['hotel.node.room.type'].search([
('node_id', '=', self.node_id.id),
('remote_room_type_id', '=', reservation.room_type_id.id),
]).id,
'adults': reservation.adults,
'children': reservation.children,
'checkin': reservation.checkin,
'checkout': reservation.checkout,
'nights': reservation.nights,
'state': reservation.state,
'price_total': reservation.price_total,
}))
self.room_lines_wizard_ids = cmds
@api.multi
def update_node_reservation(self):
self.ensure_one()
try:
raise UserError(_("Function under development."))
except (odoorpc.error.RPCError, odoorpc.error.InternalError, urllib.error.URLError) as err:
raise ValidationError(err)
class NodeReservationWizard(models.TransientModel):
_name = 'node.reservation.wizard'
node_folio_wizard_id = fields.Many2one('node.folio.wizard')
room_type_id = fields.Many2one('hotel.node.room.type', 'Rooms Type')
room_type_name = fields.Char('Name', related='room_type_id.name')
checkin = fields.Date('Check In', required=True)
checkout = fields.Date('Check Out', required=True)
nights = fields.Integer('Nights', compute="_compute_nights", readonly=True)
adults = fields.Integer('Adults', size=64, default=1)
children = fields.Integer('Children', size=64)
state = fields.Selection([('draft', 'Pre-reservation'), ('confirm', 'Pending Entry'),
('booking', 'On Board'), ('done', 'Out'),
('cancelled', 'Cancelled')], 'State')
price_total = fields.Float(string='Total Price', readonly=True)
@api.depends('checkin', 'checkout')
def _compute_nights(self):
for rec in self:
rec.nights = (fields.Date.from_string(rec.checkout) - fields.Date.from_string(rec.checkin)).days

View File

@@ -13,7 +13,7 @@
</h1>
</div>
<group attrs="{'invisible':[('node_id','=',False)]}">
<group>
<group name="dates">
<field name="checkin" required="1" widget="date" />
<field name="checkout" required="1" widget="date" />
</group>
@@ -24,17 +24,18 @@
<field name="room_type_wizard_ids" nolabel="1">
<tree editable="bottom" create="false" delete="false"
decoration-muted="room_type_availability == 0">
<field name="node_reservation_wizard_id" invisible="1"/>
<field name="room_type_id" string="Room Type" readonly="1" force_save="1"/>
<field name="room_type_availability" readonly="1" force_save="1"/>
<field name="room_type_availability" readonly="1"/>
<field name="room_qty"/>
<field name="room_type_line_ids" invisible="1"/>
<field name="checkin" widget="date"/>
<field name="checkout" widget="date"/>
<field name="nights"/>
<field name="min_stay" />
<field name="price_unit" widget="monetary"/>
<!--<field name="currency_id" invisible="1"/>-->
<field name="min_stay" readonly="1"/>
<field name="price_unit" widget="monetary" readonly="1" force_save="1"/>
<field name="discount"/>
<field name="price_total" widget="monetary"/>
<field name="price_total" widget="monetary" readonly="1" force_save="1"/>
</tree>
</field>
</group>
@@ -54,15 +55,70 @@
</record>
<record id="hotel_node_reservation_wizard_view_search_form" model="ir.ui.view">
<field name="name">hotel.node.reservation.wizard.search</field>
<field name="model">hotel.node.reservation.wizard</field>
<field name="name">hotel.node.reservation.wizard.search</field>
<field name="model">node.search.wizard</field>
<field name="arch" type="xml">
<form string="Reservation Wizard Search" >
<sheet>
<div class="oe_title">
<h1>
<field name="node_id" placeholder="Hotel" required="1" force_save="1"
attrs="{'readonly': [('node_id', '!=', False)]}"/>
</h1>
</div>
<group attrs="{'invisible':[('node_id','=',False)]}">
<group>
<field name="folio"/>
<field name="checkin"/>
</group>
<group>
<field name="partner_id"/>
</group>
</group>
<footer attrs="{'invisible':[('node_id','=',False)]}">
<button name="search_node_reservation" string="Search Reservations" type="object"
class="oe_highlight" />
<button name="cancel" string="Cancel" special="cancel"
class="oe_link" />
</footer>
</sheet>
</form>
</field>
</record>
<record id="hotel_node_reservation_wizard_view_edit_form" model="ir.ui.view">
<field name="name">hotel.node.reservation.wizard.edit</field>
<field name="model">node.folio.wizard</field>
<field name="inherit_id" ref="hotel_node_reservation_wizard_view_form" />
<field name="arch" type="xml">
<xpath expr="//group[@name='dates']" position="replace">
<field name="folio_id" invisible="1"/>
<field name="folio_name"/>
</xpath>
<field name="partner_id" position="after">
<field name="email"/>
<field name="internal_comment"/>
</field>
<xpath expr="//group[@name='room_type_wizard_ids']" position="replace">
<group name="rooms_wizard_ids" colspan="2">
<field name="node_id"/>
<group name="room_lines_wizard_ids" colspan="2">
<field name="room_lines_wizard_ids" nolabel="1">
<tree editable="bottom" create="false" delete="false">
<field name="state"/>
<field name="room_type_id" string="Room Type" readonly="1" force_save="1"/>
<field name="adults"/>
<field name="children"/>
<field name="checkin" widget="date"/>
<field name="checkout" widget="date"/>
<field name="nights"/>
<field name="price_total" widget="monetary"/>
</tree>
</field>
</group>
</xpath>
<xpath expr="//button[@name='create_node_reservation']" position="replace">
<button name="update_node_reservation" string="Update Reservations" type="object"
class="oe_highlight"/>
</xpath>
</field>
</record>
@@ -74,4 +130,14 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="hotel_node_reservation_wizard_action_search" model="ir.actions.act_window">
<field name="name">Hotel Reservation Wizard Search</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">node.search.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
</odoo>