From aebe199d80c5c7411c3db44386c7b9f3cc5b712d Mon Sep 17 00:00:00 2001 From: Patrick Hoste Date: Fri, 28 Feb 2020 13:14:23 +0000 Subject: [PATCH 1/3] [IMP] (website_)event(_track): change event form view display PURPOSE Change the event form view to improve its usability and make it clearer. SPECIFICATIONS - Change some stats buttons icons - Change order of the fields and put the range date field in second place since it's a mandatory field. LINKS Task ID : 2198660 PR : #46659 --- addons/event/data/event_data.xml | 1 - addons/event/models/event_event.py | 23 ++------ addons/event/tests/common.py | 1 - addons/event/tests/test_event_internals.py | 9 ---- addons/event/views/event_views.xml | 52 +++++-------------- .../views/event_views.xml | 2 +- addons/website_event/controllers/main.py | 6 +-- .../website_event/views/event_templates.xml | 47 +++++++---------- addons/website_event/views/event_views.xml | 7 +-- .../views/event_views.xml | 4 +- .../website_event_track/views/event_views.xml | 17 +++--- 11 files changed, 48 insertions(+), 121 deletions(-) diff --git a/addons/event/data/event_data.xml b/addons/event/data/event_data.xml index 0c430e37799..d274d70e8df 100644 --- a/addons/event/data/event_data.xml +++ b/addons/event/data/event_data.xml @@ -17,7 +17,6 @@ Online - diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index a091da8ff6b..0a0dcbf63ab 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -44,8 +44,6 @@ class EventType(models.Model): help="Events and registrations will automatically be confirmed " "upon creation, easing the flow for simple events.") # location - is_online = fields.Boolean( - 'Online Event', help='Online events like webinars do not require a specific location and are hosted online.') use_timezone = fields.Boolean('Use Default Timezone') default_timezone = fields.Selection( _tz_get, string='Timezone', default=lambda self: self.env.user.tz or 'UTC') @@ -162,8 +160,9 @@ class EventEvent(models.Model): compute_sudo=True, readonly=True, compute='_compute_seats') # Registration fields auto_confirm = fields.Boolean( - string='Autoconfirm Registrations', - compute='_compute_from_event_type', copy=True, readonly=False, store=True) + string='Autoconfirmation', + compute='_compute_from_event_type', copy=True, readonly=False, store=True, + help = 'Autoconfirm Registrations. Registrations will automatically be confirmed upon creation.') registration_ids = fields.One2many('event.registration', 'event_id', string='Attendees') event_registrations_open = fields.Boolean('Registration open', compute='_compute_event_registrations_open') event_ticket_ids = fields.One2many( @@ -181,13 +180,9 @@ class EventEvent(models.Model): is_one_day = fields.Boolean(compute='_compute_field_is_one_day') start_sale_date = fields.Date('Start sale date', compute='_compute_start_sale_date') # Location and communication - is_online = fields.Boolean( - string='Online Event', compute='_compute_from_event_type', - copy=True, readonly=False, store=True) address_id = fields.Many2one( - 'res.partner', string='Venue', compute='_compute_address_id', - copy=True, readonly=False, store=True, tracking=True, - domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") + 'res.partner', string='Venue', default=lambda self: self.env.company.partner_id.id, + tracking=True, domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") country_id = fields.Many2one( 'res.country', 'Country', related='address_id.country_id', copy=True, readonly=False, store=True) @@ -302,14 +297,6 @@ class EventEvent(models.Model): start_dates = [ticket.start_sale_date for ticket in event.event_ticket_ids if ticket.start_sale_date] event.start_sale_date = min(start_dates) if start_dates else False - @api.depends('is_online') - def _compute_address_id(self): - for event in self: - if event.is_online: - event.address_id = False - elif not event.address_id: - event.address_id = self.env.company.partner_id.id - @api.depends('event_type_id') def _compute_date_tz(self): for event in self: diff --git a/addons/event/tests/common.py b/addons/event/tests/common.py index 62509636ed9..dab3e3339a1 100644 --- a/addons/event/tests/common.py +++ b/addons/event/tests/common.py @@ -51,7 +51,6 @@ class TestEventCommon(common.SavepointCase): cls.event_type_complex = cls.env['event.type'].create({ 'name': 'Update Type', 'auto_confirm': True, - 'is_online': False, 'has_seats_limitation': True, 'seats_max': 30, 'use_timezone': True, diff --git a/addons/event/tests/test_event_internals.py b/addons/event/tests/test_event_internals.py index 1a381f3f37b..4659149e1e1 100644 --- a/addons/event/tests/test_event_internals.py +++ b/addons/event/tests/test_event_internals.py @@ -59,7 +59,6 @@ class TestEventData(TestEventCommon): 'date_end': FieldsDatetime.to_string(datetime.today() + timedelta(days=15)), }) - self.assertFalse(event.is_online) self.assertEqual(event.address_id, self.env.user.company_id.partner_id) # seats: coming from event type configuration self.assertEqual(event.seats_availability, 'limited') @@ -69,11 +68,6 @@ class TestEventData(TestEventCommon): self.assertEqual(event.seats_used, 0) self.assertEqual(event.seats_expected, 0) - # set is_online: should reset the address_id field - event.update({'is_online': True}) - self.assertTrue(event.is_online) - self.assertFalse(event.address_id) - # create registration in order to check the seats computation self.assertTrue(event.auto_confirm) for x in range(5): @@ -117,12 +111,10 @@ class TestEventData(TestEventCommon): 'name': 'Event Update Type', 'date_begin': FieldsDatetime.to_string(datetime.today() + timedelta(days=1)), 'date_end': FieldsDatetime.to_string(datetime.today() + timedelta(days=15)), - 'is_online': True, }) self.assertEqual(event.date_tz, self.env.user.tz) self.assertEqual(event.seats_availability, 'unlimited') self.assertFalse(event.auto_confirm) - self.assertTrue(event.is_online) self.assertEqual(event.event_mail_ids, self.env['event.mail']) event_type.write({ @@ -136,7 +128,6 @@ class TestEventData(TestEventCommon): self.assertEqual(event.seats_availability, 'limited') self.assertEqual(event.seats_max, event_type.seats_max) self.assertTrue(event.auto_confirm) - self.assertFalse(event.is_online) self.assertEqual(event.event_mail_ids.interval_nbr, 1) self.assertEqual(event.event_mail_ids.interval_unit, 'days') self.assertEqual(event.event_mail_ids.interval_type, 'before_event') diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index bfb1815c8ff..a83cfe5dad5 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -15,20 +15,6 @@

Location

-
-
- -
-
-
-
@@ -148,7 +134,6 @@ - @@ -215,26 +200,10 @@
- - - - - - - - - - - + + +
- - - @@ -278,10 +255,8 @@ - - - - + + @@ -436,7 +411,6 @@ - diff --git a/addons/mass_mailing_event_track/views/event_views.xml b/addons/mass_mailing_event_track/views/event_views.xml index 231d9606920..2e18a8bbe0f 100644 --- a/addons/mass_mailing_event_track/views/event_views.xml +++ b/addons/mass_mailing_event_track/views/event_views.xml @@ -3,7 +3,7 @@ event.event.view.form.inherit.mass.mailing.track event.event - + diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 5e6ffb16751..ffb2e8b26bc 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -100,11 +100,9 @@ class WebsiteEventController(http.Controller): current_type = EventType.browse(int(searches['type'])) domain_search["type"] = [("event_type_id", "=", int(searches["type"]))] - if searches["country"] != 'all' and searches["country"] != 'online': + if searches["country"] != 'all': current_country = request.env['res.country'].browse(int(searches['country'])) domain_search["country"] = ['|', ("country_id", "=", int(searches["country"])), ("country_id", "=", False)] - elif searches["country"] == 'online': - domain_search["country"] = [("country_id", "=", False)] def dom_without(without): domain = [] @@ -140,8 +138,6 @@ class WebsiteEventController(http.Controller): order = 'date_begin' if searches.get('date', 'all') == 'old': order = 'date_begin desc' - if searches["country"] != 'all': # if we are looking for a specific country - order = 'is_online, ' + order # show physical events first order = 'is_published desc, ' + order events = Event.search(dom_without("none"), limit=step, offset=pager['offset'], order=order) diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 3671ec46010..f4c7f6c0a6a 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -213,7 +213,6 @@
-
Online
-
- +
@@ -466,31 +464,24 @@
- -
-
Location
-

-
-
- - Get the direction -
- - -
-
Online Event
-
- +
+
Location
+

+
+
+ + Get the direction +
Organizer
diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_views.xml index 28de6336ce3..a47a954627c 100644 --- a/addons/website_event/views/event_views.xml +++ b/addons/website_event/views/event_views.xml @@ -31,17 +31,13 @@ - +
-
From d2e02976e2934274cdc7a37616713ba6166ca1b7 Mon Sep 17 00:00:00 2001 From: Patrick Hoste Date: Fri, 10 Jan 2020 15:08:41 +0000 Subject: [PATCH 2/3] [REF] (website_)event(_sale): change seats_availability field to seats_limited PURPOSE Change seats_availability selection field into a boolean field and rename it to seats_limited for consistency. SPECIFICATION Change all the tests accordingly. Task ID : 2198660 PR : #46659 --- addons/event/data/event_demo.xml | 6 ++-- addons/event/models/event_event.py | 34 ++++++++----------- addons/event/models/event_registration.py | 4 +-- addons/event/models/event_ticket.py | 9 +++-- addons/event/tests/test_event_flow.py | 4 +-- addons/event/tests/test_event_internals.py | 12 +++---- addons/event/tests/test_event_security.py | 2 +- addons/event/views/event_ticket_views.xml | 6 ++-- addons/event/views/event_views.xml | 13 +++---- .../event_sale/tests/test_event_internals.py | 6 ++-- addons/event_sale/views/sale_order_views.xml | 2 +- .../wizard/event_configurator_views.xml | 2 +- addons/website_event/controllers/main.py | 2 +- .../website_event/views/event_templates.xml | 12 +++---- .../website_event_sale/models/sale_order.py | 4 +-- 15 files changed, 53 insertions(+), 65 deletions(-) diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml index 01022610b7e..9817ce15e2d 100644 --- a/addons/event/data/event_demo.xml +++ b/addons/event/data/event_demo.xml @@ -75,7 +75,7 @@ - limited + True 50 US/Pacific @@ -168,7 +168,7 @@ - limited + True 200 @@ -241,7 +241,7 @@ - limited + True 4 US/Pacific diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 0a0dcbf63ab..7acafd5b7a6 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -139,10 +139,8 @@ class EventEvent(models.Model): string='Maximum Attendees Number', compute='_compute_from_event_type', copy=True, readonly=False, store=True, help="For each event you can define a maximum registration of seats(number of attendees), above this numbers the registrations are not accepted.") - seats_availability = fields.Selection( - [('unlimited', 'Unlimited'), ('limited', 'Limited')], - string='Maximum Attendees', required=True, - compute='_compute_seats_availability', copy=True, readonly=False, store=True) + seats_limited = fields.Boolean('Maximum Attendees', required=True, compute='_compute_seats_limited', + copy=True, readonly=False, store=True) seats_reserved = fields.Integer( string='Reserved Seats', store=True, readonly=True, compute='_compute_seats') @@ -227,11 +225,11 @@ class EventEvent(models.Model): seats_expected = event.seats_unconfirmed + event.seats_reserved + event.seats_used event.seats_expected = seats_expected - @api.depends('date_end', 'seats_available', 'seats_availability', 'event_ticket_ids.sale_available') + @api.depends('date_end', 'seats_available', 'seats_limited', 'event_ticket_ids.sale_available') def _compute_event_registrations_open(self): for event in self: event.event_registrations_open = event.date_end and (event.date_end > fields.Datetime.now()) and \ - (event.seats_available or event.seats_availability == 'unlimited') and \ + (event.seats_available or not event.seats_limited) and \ (not event.event_ticket_ids or any(ticket.sale_available for ticket in event.event_ticket_ids)) @api.depends('stage_id', 'kanban_state') @@ -306,7 +304,7 @@ class EventEvent(models.Model): event.date_tz = self.env.user.tz or 'UTC' @api.depends('event_type_id') - def _compute_seats_availability(self): + def _compute_seats_limited(self): """ Make it separate from ``_compute_from_event_type`` because otherwise a value given at create (see create override) would protect all other fields depending on event type id from being computed as compute method will be @@ -314,9 +312,9 @@ class EventEvent(models.Model): to compute protected field from re-computation) """ for event in self: if event.event_type_id.seats_max: - event.seats_availability = 'limited' - if not event.seats_availability: - event.seats_availability = 'unlimited' + event.seats_limited = True + if not event.seats_limited: + event.seats_limited = False @api.depends('event_type_id') def _compute_from_event_type(self): @@ -328,7 +326,6 @@ class EventEvent(models.Model): Updated by this method * seats_max -> triggers _compute_seats (all seats computation) * auto_confirm - * is_online -> triggers _compute_address_id (address_id computation) * event_mail_ids * event_ticket_ids -> triggers _compute_start_sale_date (start_sale_date computation) """ @@ -336,8 +333,6 @@ class EventEvent(models.Model): if not event.event_type_id: if not event.seats_max: event.seats_max = 0 - if not event.is_online: - event.is_online = False if not event.event_ticket_ids: event.event_ticket_ids = False continue @@ -348,8 +343,6 @@ class EventEvent(models.Model): if event.event_type_id.auto_confirm: event.auto_confirm = event.event_type_id.auto_confirm - event.is_online = event.event_type_id.is_online - # compute mailing information (force only if activated and mailing defined) if event.event_type_id.use_mail_schedule and event.event_type_id.event_type_mail_ids: event.event_mail_ids = [(5, 0, 0)] + [ @@ -371,9 +364,9 @@ class EventEvent(models.Model): if event.event_type_id.tag_ids: event.tag_ids = event.event_type_id.tag_ids - @api.constrains('seats_max', 'seats_available', 'seats_availability') + @api.constrains('seats_max', 'seats_available', 'seats_limited') def _check_seats_limit(self): - if any(event.seats_availability == 'limited' and event.seats_max and event.seats_available < 0 for event in self): + if any(event.seats_limited and event.seats_max and event.seats_available < 0 for event in self): raise ValidationError(_('No more available seats.')) @api.constrains('date_begin', 'date_end') @@ -399,7 +392,7 @@ class EventEvent(models.Model): @api.model def create(self, vals): - # Temporary fix for ``seats_availability`` and ``date_tz`` required fields (see ``_compute_from_event_type`` + # Temporary fix for ``seats_limited`` and ``date_tz`` required fields (see ``_compute_from_event_type`` vals.update(self._sync_required_computed(vals)) res = super(EventEvent, self).create(vals) @@ -420,9 +413,10 @@ class EventEvent(models.Model): return super(EventEvent, self).copy(default) def _sync_required_computed(self, values): + # TODO: See if the change to seats_limited affects this ? """ Call compute fields in cache to find missing values for required fields - (seats_availability and date_tz) in case they are not given in values """ - missing_fields = list(set(['seats_availability', 'date_tz']).difference(set(values.keys()))) + (seats_limited and date_tz) in case they are not given in values """ + missing_fields = list(set(['seats_limited', 'date_tz']).difference(set(values.keys()))) if missing_fields and values: cache_event = self.new(values) cache_event._compute_from_event_type() diff --git a/addons/event/models/event_registration.py b/addons/event/models/event_registration.py index a70931038b6..c5366c8acc9 100644 --- a/addons/event/models/event_registration.py +++ b/addons/event/models/event_registration.py @@ -92,7 +92,7 @@ class EventRegistration(models.Model): @api.constrains('event_id', 'state') def _check_seats_limit(self): for registration in self: - if registration.event_id.seats_availability == 'limited' and registration.event_id.seats_max and registration.event_id.seats_available < (1 if registration.state == 'draft' else 0): + if registration.event_id.seats_limited and registration.event_id.seats_max and registration.event_id.seats_available < (1 if registration.state == 'draft' else 0): raise ValidationError(_('No more seats available for this event.')) @api.constrains('event_ticket_id', 'state') @@ -151,7 +151,7 @@ class EventRegistration(models.Model): def _check_auto_confirmation(self): if any(not registration.event_id.auto_confirm or - (not registration.event_id.seats_available and registration.event_id.seats_availability == 'limited') for registration in self): + (not registration.event_id.seats_available and registration.event_id.seats_limited) for registration in self): return False return True diff --git a/addons/event/models/event_ticket.py b/addons/event/models/event_ticket.py index 8ae2c985fee..37572bc86eb 100644 --- a/addons/event/models/event_ticket.py +++ b/addons/event/models/event_ticket.py @@ -19,18 +19,17 @@ class EventTemplateTicket(models.Model): event_type_id = fields.Many2one( 'event.type', string='Event Category', ondelete='cascade', required=True) # seats - seats_availability = fields.Selection([ - ('limited', 'Limited'), ('unlimited', 'Unlimited')], string='Seats Limit', - readonly=True, store=True, compute='_compute_seats_availability') + seats_limited = fields.Boolean(string='Seats Limit', readonly=True, store=True, + compute='_compute_seats_limited') seats_max = fields.Integer( string='Maximum Seats', help="Define the number of available tickets. If you have too many registrations you will " "not be able to sell tickets anymore. Set 0 to ignore this rule set as unlimited.") @api.depends('seats_max') - def _compute_seats_availability(self): + def _compute_seats_limited(self): for ticket in self: - ticket.seats_availability = 'limited' if ticket.seats_max else 'unlimited' + ticket.seats_limited = ticket.seats_max @api.model def _get_event_ticket_fields_whitelist(self): diff --git a/addons/event/tests/test_event_flow.py b/addons/event/tests/test_event_flow.py index ff114bb4196..a1bd3ffcd35 100644 --- a/addons/event/tests/test_event_flow.py +++ b/addons/event/tests/test_event_flow.py @@ -82,7 +82,7 @@ class TestEventFlow(TestEventCommon): 'date_begin': datetime.datetime.now() + relativedelta(days=-1), 'date_end': datetime.datetime.now() + relativedelta(days=1), 'seats_max': 2, - 'seats_availability': 'limited', + 'seats_limited': True, }) self.assertTrue(test_event.auto_confirm) @@ -124,7 +124,7 @@ class TestEventFlow(TestEventCommon): 'name': 'TestEvent', 'date_begin': datetime.datetime.now() + relativedelta(days=-1), 'date_end': datetime.datetime.now() + relativedelta(days=1), - 'seats_availability': 'limited', + 'seats_limited': True, 'seats_max': 10, }) self.assertFalse(test_event.auto_confirm) diff --git a/addons/event/tests/test_event_internals.py b/addons/event/tests/test_event_internals.py index 4659149e1e1..9fa9b9476d5 100644 --- a/addons/event/tests/test_event_internals.py +++ b/addons/event/tests/test_event_internals.py @@ -61,7 +61,7 @@ class TestEventData(TestEventCommon): self.assertEqual(event.address_id, self.env.user.company_id.partner_id) # seats: coming from event type configuration - self.assertEqual(event.seats_availability, 'limited') + self.assertTrue(event.seats_limited) self.assertEqual(event.seats_available, event.event_type_id.seats_max) self.assertEqual(event.seats_unconfirmed, 0) self.assertEqual(event.seats_reserved, 0) @@ -113,7 +113,7 @@ class TestEventData(TestEventCommon): 'date_end': FieldsDatetime.to_string(datetime.today() + timedelta(days=15)), }) self.assertEqual(event.date_tz, self.env.user.tz) - self.assertEqual(event.seats_availability, 'unlimited') + self.assertFalse(event.seats_limited) self.assertFalse(event.auto_confirm) self.assertEqual(event.event_mail_ids, self.env['event.mail']) @@ -125,7 +125,7 @@ class TestEventData(TestEventCommon): }) event.write({'event_type_id': event_type.id}) self.assertEqual(event.date_tz, 'Europe/Paris') - self.assertEqual(event.seats_availability, 'limited') + self.assertTrue(event.seats_limited) self.assertEqual(event.seats_max, event_type.seats_max) self.assertTrue(event.auto_confirm) self.assertEqual(event.event_mail_ids.interval_nbr, 1) @@ -162,7 +162,7 @@ class TestEventData(TestEventCommon): event.write({ 'date_end': datetime.now() + timedelta(days=3), 'seats_max': 1, - 'seats_availability': 'limited', + 'seats_limited': True, }) self.assertEqual(event.seats_available, 0) self.assertFalse(event.event_registrations_open) @@ -246,11 +246,11 @@ class TestEventTicketData(TestEventCommon): first_ticket = event.event_ticket_ids.filtered(lambda t: t.name == 'First Ticket') second_ticket = event.event_ticket_ids.filtered(lambda t: t.name == 'Second Ticket') - self.assertEqual(first_ticket.seats_availability, 'limited') + self.assertTrue(first_ticket.seats_limited) self.assertTrue(first_ticket.sale_available) self.assertFalse(first_ticket.is_expired) - self.assertEqual(second_ticket.seats_availability, 'unlimited') + self.assertFalse(second_ticket.seats_limited) self.assertTrue(second_ticket.sale_available) self.assertFalse(second_ticket.is_expired) # sale is ended diff --git a/addons/event/tests/test_event_security.py b/addons/event/tests/test_event_security.py index 2ee16f2781b..019458e2fd9 100644 --- a/addons/event/tests/test_event_security.py +++ b/addons/event/tests/test_event_security.py @@ -26,7 +26,7 @@ class TestEventSecurity(TestEventCommon): 'name': 'TestEvent', 'date_begin': datetime.now() + relativedelta(days=-1), 'date_end': datetime.now() + relativedelta(days=1), - 'seats_availability': 'limited', + 'seats_limited': True, 'seats_max': 10, }) diff --git a/addons/event/views/event_ticket_views.xml b/addons/event/views/event_ticket_views.xml index 973c0eb0c1f..b4210f37f0d 100644 --- a/addons/event/views/event_ticket_views.xml +++ b/addons/event/views/event_ticket_views.xml @@ -11,7 +11,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -162,7 +162,7 @@ - + diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index a83cfe5dad5..4173227fb86 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -222,15 +222,10 @@ context="{'show_address': 1}" options='{"always_reload": True}'/> - - - @@ -535,7 +530,7 @@ diff --git a/addons/event_sale/tests/test_event_internals.py b/addons/event_sale/tests/test_event_internals.py index fc6341b51a5..b61b5a29872 100644 --- a/addons/event_sale/tests/test_event_internals.py +++ b/addons/event_sale/tests/test_event_internals.py @@ -43,7 +43,7 @@ class TestEventData(TestEventSaleCommon): # synchronize event event.write({'event_type_id': event_type.id}) self.assertEqual(event.event_ticket_ids.name, event.event_type_id.event_type_ticket_ids.name) - self.assertEqual(event.event_ticket_ids.seats_availability, 'limited') + self.assertTrue(event.event_ticket_ids.seats_limited) self.assertEqual(event.event_ticket_ids.seats_max, 5) self.assertEqual(event.event_ticket_ids.product_id, self.event_product) self.assertEqual(event.event_ticket_ids.price, self.event_product.list_price) @@ -120,10 +120,10 @@ class TestEventTicketData(TestEventSaleCommon): self.assertEqual(second_ticket.price, 8.0) # default availability - self.assertEqual(first_ticket.seats_availability, 'limited') + self.assertTrue(first_ticket.seats_limited) self.assertTrue(first_ticket.sale_available) self.assertFalse(first_ticket.is_expired) - self.assertEqual(second_ticket.seats_availability, 'unlimited') + self.assertFalse(second_ticket.seats_limited) self.assertTrue(second_ticket.sale_available) self.assertFalse(second_ticket.is_expired) diff --git a/addons/event_sale/views/sale_order_views.xml b/addons/event_sale/views/sale_order_views.xml index c050a48dc4a..c05774168e8 100644 --- a/addons/event_sale/views/sale_order_views.xml +++ b/addons/event_sale/views/sale_order_views.xml @@ -27,7 +27,7 @@ domain="[ ('event_id', '=', event_id), ('product_id','=',product_id), - '|', ('seats_availability', '=', 'unlimited'), ('seats_available', '>', 0), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id) + '|', ('seats_limited', '=', False), ('seats_available', '>', 0), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id) ]" attrs="{ 'invisible': ['|', ('event_ok', '=', False), ('event_id', '=', False)], diff --git a/addons/event_sale/wizard/event_configurator_views.xml b/addons/event_sale/wizard/event_configurator_views.xml index e588808deb0..db1399cdb34 100644 --- a/addons/event_sale/wizard/event_configurator_views.xml +++ b/addons/event_sale/wizard/event_configurator_views.xml @@ -20,7 +20,7 @@ domain="[ ('event_id', '=', event_id), ('product_id','=',product_id), - '|', ('seats_availability', '=', 'unlimited'), ('seats_available', '>', 0) + '|', ('seats_limited', '=', False), ('seats_available', '>', 0) ]" attrs="{ 'invisible': [('event_id', '=', False)], diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index ffb2e8b26bc..11e17a4f7a4 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -296,7 +296,7 @@ class WebsiteEventController(http.Controller): def registration_new(self, event, **post): tickets = self._process_tickets_form(event, post) availability_check = True - if event.seats_availability == 'limited': + if event.seats_limited: ordered_seats = 0 for ticket in tickets: ordered_seats += ticket['quantity'] diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index f4c7f6c0a6a..27815e3215c 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -238,7 +238,7 @@
+ t-if="event.seats_limited and not event.seats_available"> Sold Out
@@ -587,8 +587,8 @@ - - + +