[IMP] event_sale: add multi slots events

Author: amdi-odoo

addons/event_sale/data/mail_templates.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="event_ticket_id_change_exception" name="Message: Alert on event ticket id change">
+<template id="event_registration_change_exception" name="Message: Alert on event registration data change">
     <div>
         <p>
             <span>Registration modification for attendee:</span>
@@ -13,7 +13,7 @@
             <ul>
                 <li>
                     <a href="#" data-oe-model="event.registration" t-att-data-oe-id="registration.id"><t t-out="registration.name"/></a>:
-                    <span>Ticket changed from <strong><t t-out="old_ticket_name"/></strong> to <strong><t t-out="new_ticket_name"/></strong></span>
+                    <span><t t-out="record_type"/> changed from <strong><t t-out="old_name"/></strong> to <strong><t t-out="new_name"/></strong></span>
                 </li>
             </ul>
         </div>

addons/event_sale/models/event_registration.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
 from odoo.tools import float_is_zero
 
 
@@ -101,10 +101,15 @@ def write(self, vals):
             )
             vals.update(so_line_vals)
 
+        updated_fields_to_notify = []
+        if vals.get('event_slot_id'):
+            updated_fields_to_notify.append(('event.slot', 'event_slot_id'))
         if vals.get('event_ticket_id'):
+            updated_fields_to_notify.append(('event.event.ticket', 'event_ticket_id'))
+        for model, field in updated_fields_to_notify:
             self.filtered(
-                lambda registration: registration.event_ticket_id and registration.event_ticket_id.id != vals['event_ticket_id']
-            )._sale_order_ticket_type_change_notify(self.env['event.event.ticket'].browse(vals['event_ticket_id']))
+                lambda registration: registration[field] and registration[field].id != vals[field]
+            )._sale_order_registration_data_change_notify(field, self.env[model].browse(vals[field]))
 
         return super(EventRegistration, self).write(vals)
 
@@ -114,25 +119,27 @@ def _synchronize_so_line_values(self, so_line):
                 # Avoid registering public users but respect the portal workflows
                 'partner_id': False if self.env.user._is_public() and self.env.user.partner_id == so_line.order_id.partner_id else so_line.order_id.partner_id.id,
                 'event_id': so_line.event_id.id,
+                'event_slot_id': so_line.event_slot_id.id,
                 'event_ticket_id': so_line.event_ticket_id.id,
                 'sale_order_id': so_line.order_id.id,
                 'sale_order_line_id': so_line.id,
             }
         return {}
 
-    def _sale_order_ticket_type_change_notify(self, new_event_ticket):
+    def _sale_order_registration_data_change_notify(self, new_record_field, new_record):
         fallback_user_id = self.env.user.id if not self.env.user._is_public() else self.env.ref("base.user_admin").id
         for registration in self:
             render_context = {
                 'registration': registration,
-                'old_ticket_name': registration.event_ticket_id.name,
-                'new_ticket_name': new_event_ticket.name
+                'record_type': _('Ticket') if new_record_field == 'event_ticket_id' else _('Slot'),
+                'old_name': registration[new_record_field].name,
+                'new_name': new_record.name
             }
             user_id = registration.event_id.user_id.id or registration.sale_order_id.user_id.id or fallback_user_id
             registration.sale_order_id._activity_schedule_with_view(
                 'mail.mail_activity_data_warning',
                 user_id=user_id,
-                views_or_xmlid='event_sale.event_ticket_id_change_exception',
+                views_or_xmlid='event_sale.event_registration_change_exception',
                 render_context=render_context)
 
     def _get_registration_summary(self):

addons/event_sale/models/sale_order_line.py

@@ -11,18 +11,29 @@ class SaleOrderLine(models.Model):
         'event.event', string='Event',
         compute="_compute_event_id", store=True, readonly=False, precompute=True, index='btree_not_null',
         help="Choose an event and it will automatically create a registration for this event.")
+    event_slot_id = fields.Many2one(
+        'event.slot', string='Slot',
+        compute="_compute_event_slot_id", store=True, readonly=False, precompute=True,
+        help="Choose an event slot and it will automatically create a registration for this event slot.")
     event_ticket_id = fields.Many2one(
         'event.event.ticket', string='Ticket Type',
         compute="_compute_event_ticket_id", store=True, readonly=False, precompute=True,
         help="Choose an event ticket and it will automatically create a registration for this event ticket.")
+    is_multi_slots = fields.Boolean(related="event_id.is_multi_slots")
     registration_ids = fields.One2many('event.registration', 'sale_order_line_id', string="Registrations")
 
-    @api.constrains('event_id', 'event_ticket_id', 'product_id')
+    @api.constrains('event_id', 'event_slot_id', 'event_ticket_id', 'product_id')
     def _check_event_registration_ticket(self):
         for so_line in self:
-            if so_line.product_id.service_tracking == "event" and (not so_line.event_id or not so_line.event_ticket_id):
-                raise ValidationError(
-                    _("The sale order line with the product %(product_name)s needs an event and a ticket.", product_name=so_line.product_id.name))
+            if so_line.product_id.service_tracking == "event" and (
+                not so_line.event_id or
+                not so_line.event_ticket_id or
+                (so_line.is_multi_slots and not so_line.event_slot_id)
+            ):
+                raise ValidationError(_(
+                    "The sale order line with the product %(product_name)s needs an event,"
+                    " a ticket and a slot in case the event has multiple time slots.",
+                    product_name=so_line.product_id.name))
 
     @api.depends('state', 'event_id')
     def _compute_product_uom_readonly(self):
@@ -58,6 +69,14 @@ def _compute_event_id(self):
             if line.product_id not in line.event_id.event_ticket_ids.product_id:
                 line.event_id = False
 
+    @api.depends('event_id')
+    def _compute_event_slot_id(self):
+        event_lines = self.filtered('event_id')
+        (self - event_lines).event_slot_id = False
+        for line in event_lines:
+            if line.event_id != line.event_slot_id.event_id:
+                line.event_slot_id = False
+
     @api.depends('event_id')
     def _compute_event_ticket_id(self):
         event_lines = self.filtered('event_id')
@@ -85,7 +104,9 @@ def _get_sale_order_line_multiline_description_sale(self):
                 We need this override to be defined here in sales order line (and not in product) because here is the only place where the event_ticket_id is referenced.
         """
         if self.event_ticket_id:
-            return self.event_ticket_id._get_ticket_multiline_description() + self._get_sale_order_line_multiline_description_variants()
+            return ('%s\n' % self.event_slot_id.name if self.event_slot_id else '') + \
+                self.event_ticket_id._get_ticket_multiline_description() + \
+                self._get_sale_order_line_multiline_description_variants()
         else:
             return super()._get_sale_order_line_multiline_description_sale()
 

addons/event_sale/report/event_sale_report.py

@@ -17,6 +17,7 @@ class EventSaleReport(models.Model):
     event_id = fields.Many2one('event.event', string='Event', readonly=True)
     event_date_begin = fields.Date(string='Event Start Date', readonly=True)
     event_date_end = fields.Date(string='Event End Date', readonly=True)
+    event_slot_id = fields.Many2one('event.slot', string='Event Slot', readonly=True)
     event_ticket_id = fields.Many2one('event.event.ticket', string='Event Ticket', readonly=True)
     event_ticket_price = fields.Float(string='Ticket price', readonly=True)
     event_registration_create_date = fields.Date(string='Registration Date', readonly=True)
@@ -73,6 +74,7 @@ def _select_clause(self, *select):
     event_registration.id AS event_registration_id,
     event_registration.company_id AS company_id,
     event_registration.event_id AS event_id,
+    event_registration.event_slot_id AS event_slot_id,
     event_registration.event_ticket_id AS event_ticket_id,
     event_registration.create_date AS event_registration_create_date,
     event_registration.name AS event_registration_name,
@@ -115,6 +117,7 @@ def _from_clause(self, *join_):
         return """
 FROM event_registration
 LEFT JOIN event_event ON event_event.id = event_registration.event_id
+LEFT JOIN event_slot ON event_slot.id = event_registration.event_slot_id
 LEFT JOIN event_event_ticket ON event_event_ticket.id = event_registration.event_ticket_id
 LEFT JOIN sale_order ON sale_order.id = event_registration.sale_order_id
 LEFT JOIN sale_order_line ON sale_order_line.id = event_registration.sale_order_line_id

addons/event_sale/report/event_sale_report_views.xml

@@ -28,6 +28,7 @@
                             <field name="event_registration_id"/>
                             <field name="event_registration_name"/>
                             <field name="event_registration_create_date"/>
+                            <field name="event_slot_id"/>
                             <field name="event_ticket_id"/>
                             <field name="event_registration_state"/>
                         </group>
@@ -69,6 +70,7 @@
         <field name="arch" type="xml">
             <list string="Revenues" edit="false" create="false">
                 <field name="event_id"/>
+                <field name="event_slot_id"/>
                 <field name="event_ticket_id"/>
                 <field name="product_id" optional="hide"/>
                 <field name="event_ticket_price"/>
@@ -113,6 +115,7 @@
                     <filter string="Event" name="group_by_event_id" context="{'group_by': 'event_id' }"/>
                     <separator/>
                     <filter string="Product" name="group_by_product_id" context="{'group_by': 'product_id'}"/>
+                    <filter string="Slot" name="group_by_slot_id" context="{'group_by': 'event_slot_id'}"/>
                     <filter string="Ticket" name="group_by_ticket_id" context="{'group_by': 'event_ticket_id'}"/>
                     <separator/>
                     <filter string="Registration Status" name="group_by_registration_state"

addons/event_sale/static/src/js/event_configurator_controller.js

@@ -7,7 +7,7 @@ import { formView } from "@web/views/form/form_view";
  * window when a service product linked to events is selected.
  *
  * This allows keeping an editable list view for sales order and remove the noise of
- * those 2 fields ('event_id' + 'event_ticket_id')
+ * those 3 fields ('event_id' + 'event_slot_id' + 'event_ticket_id')
  */
 
 export class EventConfiguratorController extends formView.Controller {
@@ -26,12 +26,13 @@ export class EventConfiguratorController extends formView.Controller {
      */
     async onRecordSaved(record) {
         await super.onRecordSaved(...arguments);
-        const { event_id, event_ticket_id } = record.data;
+        const { event_id, event_slot_id, event_ticket_id } = record.data;
         return this.action.doAction({
             type: "ir.actions.act_window_close",
             infos: {
                 eventConfiguration: {
                     event_id,
+                    event_slot_id,
                     event_ticket_id,
                 },
             },

addons/event_sale/static/src/js/sale_product_field.js

@@ -34,6 +34,9 @@ patch(SaleOrderLineProductField.prototype, {
         if (this.props.record.data.event_id) {
             actionContext.default_event_id = this.props.record.data.event_id[0];
         }
+        if (this.props.record.data.event_slot_id) {
+            actionContext.default_event_slot_id = this.props.record.data.event_slot_id[0];
+        }
         if (this.props.record.data.event_ticket_id) {
             actionContext.default_event_ticket_id = this.props.record.data.event_ticket_id[0];
         }

addons/event_sale/views/sale_order_views.xml

@@ -25,6 +25,12 @@
                     invisible="service_tracking != 'event'"
                     required="service_tracking == 'event'"
                     options="{'no_open': True, 'no_create': True}"/>
+                <field
+                    name="event_slot_id"
+                    domain="[('event_id','=', event_id)]"
+                    invisible="not is_multi_slots or service_tracking != 'event'"
+                    required="is_multi_slots and service_tracking == 'event'"
+                    options="{'no_open': True, 'no_create': True}"/>
                 <field
                     name="event_ticket_id"
                     domain="[
@@ -46,6 +52,12 @@
                     required="service_tracking == 'event'"
                     options="{'no_open': True, 'no_create': True}"
                     placeholder="All Events"/>
+                <field
+                    name="event_slot_id"
+                    column_invisible="True"
+                    domain="[('event_id','=', event_id)]"
+                    required="is_multi_slots and service_tracking == 'event'"
+                    options="{'no_open': True, 'no_create': True}"/>
                 <field name="event_ticket_id"
                     column_invisible="True"
                     domain="[

addons/event_sale/wizard/event_configurator.py

@@ -11,17 +11,23 @@ class EventEventConfigurator(models.TransientModel):
 
     product_id = fields.Many2one('product.product', string="Product", readonly=True)
     event_id = fields.Many2one('event.event', string="Event")
+    event_slot_id = fields.Many2one('event.slot', string="Slot",
+        compute="_compute_event_slot_id", readonly=False, store=True)
     event_ticket_id = fields.Many2one('event.event.ticket', string="Ticket Type",
         compute="_compute_event_ticket_id", readonly=False, store=True)
+    is_multi_slots = fields.Boolean(related="event_id.is_multi_slots")
     has_available_tickets = fields.Boolean("Has Available Tickets", compute="_compute_has_available_tickets")
 
-    @api.constrains('event_id', 'event_ticket_id')
+    @api.constrains('event_id', 'event_slot_id', 'event_ticket_id')
     def check_event_id(self):
         error_messages = []
         for record in self:
             if record.event_id.id != record.event_ticket_id.event_id.id:
                 error_messages.append(
                     _('Invalid ticket choice "%(ticket_name)s" for event "%(event_name)s".'))
+            if record.event_slot_id and record.event_id.id != record.event_slot_id.event_id.id:
+                error_messages.append(
+                    _('Invalid slot choice "%(slot_name)s" for event "%(event_name)s".'))
         if error_messages:
             raise ValidationError('\n'.join(error_messages))
 
@@ -36,6 +42,16 @@ def _compute_has_available_tickets(self):
         for configurator in self:
             configurator.has_available_tickets = bool(mapped_data.get(configurator.product_id, 0))
 
+    @api.depends("is_multi_slots")
+    def _compute_event_slot_id(self):
+        """ Pre-select the slot of the multi slots event selected if it is the only one """
+        for configurator in self:
+            if not configurator.is_multi_slots:
+                configurator.event_slot_id = False
+            event_slot_ids = self.env['event.slot'].search([
+                ('event_id', '=', configurator.event_id.id)], limit=2)
+            configurator.event_slot_id = event_slot_ids if len(event_slot_ids) == 1 else False
+
     @api.depends('event_id')
     def _compute_event_ticket_id(self):
         """ Pre-select the ticket of the event selected if it is the only one """

addons/event_sale/wizard/event_configurator_views.xml

@@ -25,6 +25,12 @@
                         options="{'no_open': True, 'no_create': True}"
                         placeholder="All Events"
                     />
+                    <field name="event_slot_id"
+                        domain="[('event_id', '=', event_id)]"
+                        invisible="not is_multi_slots"
+                        required="is_multi_slots"
+                        context="{'name_with_seats_availability': True}"
+                        options="{'no_open': True, 'no_create': True}"/>
                     <field
                         name="event_ticket_id"
                         domain="[('event_id', '=', event_id), ('product_id', '=', product_id)]"

addons/event_sale/wizard/event_edit_registration.py

@@ -22,6 +22,7 @@ def default_get(self, fields):
         sale_order = self.env['sale.order'].browse(res.get('sale_order_id'))
         registrations = self.env['event.registration'].search([
             ('sale_order_id', '=', sale_order.id),
+            ('event_slot_id', 'in', sale_order.mapped('order_line.event_slot_id').ids or [False]),
             ('event_ticket_id', 'in', sale_order.mapped('order_line.event_ticket_id').ids),
             ('state', '!=', 'cancel')])
 
@@ -33,6 +34,7 @@ def default_get(self, fields):
             # Add existing registrations
             attendee_list += [[0, 0, {
                 'event_id': reg.event_id.id,
+                'event_slot_id': reg.event_slot_id.id,
                 'event_ticket_id': reg.event_ticket_id.id,
                 'registration_id': reg.id,
                 'name': reg.name,
@@ -43,6 +45,7 @@ def default_get(self, fields):
             # Add new registrations
             attendee_list += [[0, 0, {
                 'event_id': so_line.event_id.id,
+                'event_slot_id': so_line.event_slot_id.id,
                 'event_ticket_id': so_line.event_ticket_id.id,
                 'sale_order_line_id': so_line.id,
                 'name': so_line.order_partner_id.name,
@@ -78,6 +81,7 @@ class RegistrationEditorLine(models.TransientModel):
     event_id = fields.Many2one('event.event', string='Event', required=True)
     company_id = fields.Many2one(related="event_id.company_id")
     registration_id = fields.Many2one('event.registration', 'Original Registration')
+    event_slot_id = fields.Many2one('event.slot', string='Event Slot')
     event_ticket_id = fields.Many2one('event.event.ticket', string='Event Ticket')
     email = fields.Char(string='Email')
     phone = fields.Char(string='Phone')
@@ -94,6 +98,7 @@ def _prepare_registration_data(self, include_event_values=False):
         if include_event_values:
             registration_data.update({
                 'event_id': self.event_id.id,
+                'event_slot_id': self.event_slot_id.id,
                 'event_ticket_id': self.event_ticket_id.id,
                 'sale_order_id': self.editor_id.sale_order_id.id,
                 'sale_order_line_id': self.sale_order_line_id.id,

addons/event_sale/wizard/event_edit_registration.xml

@@ -13,6 +13,7 @@
                             <list string="Registration" editable="top" create="false" delete="false">
                                 <field name="event_id" readonly='1' force_save="1"/>
                                 <field name="registration_id" readonly='1' force_save="1"/>
+                                <field name="event_slot_id" domain="[('event_id', '=', event_id)]" readonly='1' force_save="1"/>
                                 <field name="event_ticket_id" domain="[('event_id', '=', event_id)]" readonly='1' force_save="1"/>
                                 <field name="name"/>
                                 <field name="email"/>