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

[IMP] Add fields in booking engine (#84)

Browse Source 
* [IMP] Add fields in folio wizard

* pre-commit

* [IMP] Compute service line qty automatically

* [IMP] many2many widget segmentation fiel bookin engine

Co-authored-by: Darío Lodeiros <dario@commitsun.com>
This commit is contained in:
Sara
2021-04-26 11:24:39 +02:00
committed by GitHub
parent 3ac507130f
commit de786a375b
5 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pms/models/pms_service.py
View File

@@ -271,7 +271,12 @@ class PmsService(models.Model):
name += "\n" + product.description_sale
service.name = name
@api.depends("reservation_id.checkin", "reservation_id.checkout", "product_id")
@api.depends(
"reservation_id.checkin",
"reservation_id.checkout",
"product_id",
"reservation_id.adults",
)
def _compute_service_line_ids(self):
for service in self:
if service.product_id:
@@ -288,15 +293,22 @@ class PmsService(models.Model):
if consumed_on == "after":
i += 1
idate = reservation.checkin + timedelta(days=i)
old_line = service._search_old_lines(idate)
if idate in [
line.date for line in service.service_line_ids
]:
# REVIEW: If the date is already
# cached (otherwise double the date)
pass
old_line = service.service_line_ids.filtered(
lambda r: r.date == idate
)
price_unit = service._get_price_unit_line(idate)
if old_line and old_line.auto_qty:
lines.append(
(
1,
old_line.id,
{
"day_qty": day_qty,
"auto_qty": True,
},
)
)
elif not old_line:
price_unit = service._get_price_unit_line(idate)
lines.append(
(
0,
@@ -304,12 +316,11 @@ class PmsService(models.Model):
{
"date": idate,
"day_qty": day_qty,
"auto_qty": True,
"price_unit": price_unit,
},
)
)
else:
lines.append((4, old_line.id))
move_day = 0
if consumed_on == "after":
move_day = 1
@@ -332,7 +343,6 @@ class PmsService(models.Model):
)
service.service_line_ids = lines
else:
# TODO: Review (business logic refact) no per_day logic service
if not service.service_line_ids:
price_unit = service._get_price_unit_line()
service.service_line_ids = [
@@ -347,8 +357,6 @@ class PmsService(models.Model):
)
]
else:
# TODO: Service without reservation(room) but with folio¿?
# example: tourist tour in group
if not service.service_line_ids:
price_unit = service._get_price_unit_line()
service.service_line_ids = [
@@ -365,13 +373,6 @@ class PmsService(models.Model):
else:
service.service_line_ids = False
def _search_old_lines(self, date):
self.ensure_one()
if isinstance(self._origin.id, int):
old_line = self._origin.service_line_ids.filtered(lambda r: r.date == date)
return old_line
return False
# Default methods
def name_get(self):

17
pms/models/pms_service_line.py
View File

@@ -110,6 +110,13 @@ class PmsServiceLine(models.Model):
readonly=True,
store=True,
)
auto_qty = fields.Boolean(
string="Qty automated setted",
help="Show if the day qty was calculated automatically",
compute="_compute_auto_qty",
readonly=False,
store=True,
)
@api.depends("day_qty", "discount", "price_unit", "tax_ids")
def _compute_day_amount_service(self):
@@ -213,6 +220,16 @@ class PmsServiceLine(models.Model):
# else:
# reservation.reservation_line_ids.update({"cancel_discount": 0})
@api.depends("day_qty")
def _compute_auto_qty(self):
"""
Set auto_qty = False if the service is no linked to room or
if the day_qty was set manually
(See autogeneration of service lines in
_compute_service_line_ids -pms.service-)
"""
self.auto_qty = False
# Constraints and onchanges
@api.constrains("day_qty")
def no_free_resources(self):

28
pms/wizards/wizard_folio.py
View File

@@ -30,6 +30,9 @@ class FolioWizard(models.TransientModel):
string="Property",
default=lambda self: self._default_pms_property_id(),
)
segmentation_ids = fields.Many2many(
"res.partner.category", string="Segmentation", ondelete="restrict"
)
partner_id = fields.Many2one(
"res.partner",
)
@@ -43,6 +46,21 @@ class FolioWizard(models.TransientModel):
store=True,
readonly=False,
)
agency_id = fields.Many2one(
string="Agency",
comodel_name="res.partner",
ondelete="restrict",
domain=[("is_agency", "=", True)],
)
channel_type_id = fields.Many2one(
string="Direct Sale Channel",
readonly=False,
store=True,
comodel_name="pms.sale.channel",
domain=[("channel_type", "=", "direct")],
compute="_compute_channel_type_id",
ondelete="restrict",
)
total_price_folio = fields.Float(
string="Total Price", compute="_compute_total_price_folio"
)
@@ -71,6 +89,12 @@ class FolioWizard(models.TransientModel):
for record in self:
record.pricelist_id = record.partner_id.property_product_pricelist.id
@api.depends("agency_id")
def _compute_channel_type_id(self):
for record in self:
if record.agency_id:
record.channel_type_id = record.agency_id.sale_channel_id.id
@api.depends("availability_results.price_total", "discount")
def _compute_total_price_folio(self):
for record in self:
@@ -144,6 +168,9 @@ class FolioWizard(models.TransientModel):
"pricelist_id": record.pricelist_id.id,
"partner_id": record.partner_id.id,
"pms_property_id": record.pms_property_id.id,
"agency_id": record.agency_id.id,
"channel_type_id": record.channel_type_id.id,
"segmentation_ids": [(6, 0, record.segmentation_ids.ids)],
}
)
else:
@@ -159,6 +186,7 @@ class FolioWizard(models.TransientModel):
"partner_id": record.partner_id.id,
"pricelist_id": record.pricelist_id.id,
"pms_property_id": folio.pms_property_id.id,
"board_service_room_id": line.board_service_room_id.id,
}
)
res.reservation_line_ids.discount = record.discount * 100

12
pms/wizards/wizard_folio.xml
View File

@@ -19,11 +19,18 @@
options="{'related_start_date': 'start_date'}"
/>
<field name="folio_id" invisible="1" />
<field name="agency_id" />
<field name="segmentation_ids" widget="many2many_tags" />
</group>
</div>
<div class="col-5">
<group>
<field name="partner_id" string="Partner" required="1" />
<field
name="partner_id"
string="Partner"
required="1"
options="{'no_create': True,'no_open': True}"
/>
<field
name="pms_property_id"
required="1"
@@ -35,7 +42,9 @@
string="Pricelist"
required="1"
domain="['|', ('pms_property_ids', '=', False), ('pms_property_ids', 'in', pms_property_id)]"
options="{'no_create': True,'no_open': True}"
/>
<field name="channel_type_id" />
</group>
</div>
</div>
@@ -75,6 +84,7 @@
attrs="{'readonly':[('num_rooms_available','&lt;',1)]}"
force_save="1"
/>
<field name="board_service_room_id" />
<field
name="price_per_room"
readonly="1"

15
pms/wizards/wizard_folio_availability.py
View File

@@ -58,8 +58,15 @@ class AvailabilityWizard(models.TransientModel):
related="folio_wizard_id.pms_property_id",
string="Property",
)
board_service_room_id = fields.Many2one(
string="Board Service",
help="Board Service included in the room",
comodel_name="pms.board.service.room.type",
domain="[('pms_room_type_id','=',room_type_id)]",
tracking=True,
)
@api.depends("num_rooms_selected", "checkin", "checkout")
@api.depends("num_rooms_selected", "checkin", "checkout", "board_service_room_id")
def _compute_price_total(self):
for record in self:
record.price_total = 0
@@ -88,6 +95,12 @@ class AvailabilityWizard(models.TransientModel):
)
room_type_total_price_per_room += product.price
if record.board_service_room_id:
nights = (record.checkout - record.checkin).days
room_type_total_price_per_room += (
record.board_service_room_id.amount * nights
)
# udpate the price per room
record.price_per_room = room_type_total_price_per_room