From a708026eaae674829a96a5233ec5e0c0f0df7ee2 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Wed, 21 Dec 2022 12:56:29 +0000
Subject: [PATCH 1/3] [IMP] event_sale: Add price currency

Adding the price currency on the event ticket
so that users will know which currency is used.

Task-3081384

Part-of: odoo/odoo#106980
---
 addons/event_sale/models/event_ticket.py         | 1 +
 addons/event_sale/views/event_ticket_views.xml   | 3 ++-
 addons/test_event_full/tests/test_performance.py | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/event_sale/models/event_ticket.py b/addons/event_sale/models/event_ticket.py
index 415c647ef3e..c6a95a01edc 100644
--- a/addons/event_sale/models/event_ticket.py
+++ b/addons/event_sale/models/event_ticket.py
@@ -20,6 +20,7 @@ class EventTemplateTicket(models.Model):
     product_id = fields.Many2one(
         'product.product', string='Product', required=True,
         domain=[("detailed_type", "=", "event")], default=_default_product_id)
+    currency_id = fields.Many2one(related="product_id.currency_id", string="Currency")
     price = fields.Float(
         string='Price', compute='_compute_price',
         digits='Product Price', readonly=False, store=True)
diff --git a/addons/event_sale/views/event_ticket_views.xml b/addons/event_sale/views/event_ticket_views.xml
index d2882fd4b18..f4d36f3ca5a 100644
--- a/addons/event_sale/views/event_ticket_views.xml
+++ b/addons/event_sale/views/event_ticket_views.xml
@@ -46,7 +46,8 @@
                 <field name="product_id" context="{'default_detailed_type': 'event'}"/>
             </field>
             <field name="description" position="after">
-                <field name="price"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
             </field>
         </field>
     </record>
diff --git a/addons/test_event_full/tests/test_performance.py b/addons/test_event_full/tests/test_performance.py
index b315d3da489..ec865ba2bf0 100644
--- a/addons/test_event_full/tests/test_performance.py
+++ b/addons/test_event_full/tests/test_performance.py
@@ -150,7 +150,7 @@ class TestEventPerformance(EventPerformanceCase):
         has_social = 'social_menu' in self.env['event.event']  # otherwise view may crash in enterprise
 
         # type and website
-        with freeze_time(self.reference_now), self.assertQueryCount(event_user=445):  # tef 400 / com 406
+        with freeze_time(self.reference_now), self.assertQueryCount(event_user=450):  # tef 402 / com 408
             self.env.cr._now = self.reference_now  # force create_date to check schedulers
             # Require for `website_menu` to be visible
             # <div name="event_menu_configuration" groups="base.group_no_one">
@@ -453,7 +453,7 @@ class TestOnlineEventPerformance(EventPerformanceCase, UtilPerf):
         # website customer data
         with freeze_time(self.reference_now):
             self.authenticate('user_eventmanager', 'user_eventmanager')
-            with self.assertQueryCount(default=39):  # tef 38
+            with self.assertQueryCount(default=42):  # tef 41
                 self._test_url_open('/event')
 
     @warmup
@@ -461,7 +461,7 @@ class TestOnlineEventPerformance(EventPerformanceCase, UtilPerf):
         # website customer data
         with freeze_time(self.reference_now):
             self.authenticate(None, None)
-            with self.assertQueryCount(default=28):
+            with self.assertQueryCount(default=38):
                 self._test_url_open('/event')
 
     # @warmup

From f23c463b26ecb4b5ee5aa833d765a15f40ec1906 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Tue, 10 Jan 2023 11:46:03 +0000
Subject: [PATCH 2/3] [IMP] {website_event}_sale: add pricelist picker

Adding a pricelist picker on the website event
front-end to allow the user to display the prices
depending on the selected pricelist.

Adding a picker to change the ticket pricelist
on the ticket registration page.

Task-3081384

Part-of: odoo/odoo#106980
---
 .../views/event_templates_list.xml            |  2 +-
 addons/website_event_sale/__manifest__.py     |  4 +++
 .../js/website_event_sale_ticket_details.js   | 16 +++++++++++
 .../scss/website_event_sale_templates.scss    | 16 +++++++++++
 .../views/website_event_templates.xml         | 27 ++++++++++++++++---
 .../views/website_sale_templates.xml          | 10 +++++++
 6 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 addons/website_event_sale/static/src/js/website_event_sale_ticket_details.js
 create mode 100644 addons/website_event_sale/static/src/scss/website_event_sale_templates.scss

diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml
index f6ca3f09870..41c73d9c12c 100644
--- a/addons/website_event/views/event_templates_list.xml
+++ b/addons/website_event/views/event_templates_list.xml
@@ -48,7 +48,7 @@
     <nav class="navbar navbar-light border-top shadow-sm d-print-none">
         <div class="container">
             <div class="d-flex flex-column flex-sm-row justify-content-between w-100">
-                <span class="navbar-brand h4 my-0 me-auto">Events</span>
+                <span class="navbar-brand h4 my-0 me-auto pe-sm-4">Events</span>
                 <ul class="o_wevent_index_topbar_filters nav">
                     <t t-foreach="categories" t-as="category">
                         <li t-if="category.is_published and category.tag_ids and any(tag.color for tag in category.tag_ids)" class="nav-item dropdown me-2 my-1">
diff --git a/addons/website_event_sale/__manifest__.py b/addons/website_event_sale/__manifest__.py
index d15aee65192..f2e645a1d84 100644
--- a/addons/website_event_sale/__manifest__.py
+++ b/addons/website_event_sale/__manifest__.py
@@ -22,6 +22,10 @@ Sell event tickets through eCommerce app.
         'web.assets_tests': [
             'website_event_sale/static/tests/**/*',
         ],
+        'web.assets_frontend': [
+            'website_event_sale/static/src/scss/*.scss',
+            'website_event_sale/static/src/js/*.js',
+        ],
     },
     'license': 'LGPL-3',
 }
diff --git a/addons/website_event_sale/static/src/js/website_event_sale_ticket_details.js b/addons/website_event_sale/static/src/js/website_event_sale_ticket_details.js
new file mode 100644
index 00000000000..6ba04594aea
--- /dev/null
+++ b/addons/website_event_sale/static/src/js/website_event_sale_ticket_details.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+
+import publicWidget from 'web.public.widget';
+
+publicWidget.registry.ticketDetailsWidget.include({
+    /**
+     * Overriding the method to toggle the tickets registration
+     * pricelist dropdown visibility on ticket details click
+     */
+    _onTicketDetailsClick: function(ev) {
+        this._super(...arguments);
+        if (this.foldedByDefault){
+            $(ev.currentTarget).siblings('#o_wevent_tickets_pricelist').toggleClass('collapse');
+        }
+    }
+});
diff --git a/addons/website_event_sale/static/src/scss/website_event_sale_templates.scss b/addons/website_event_sale/static/src/scss/website_event_sale_templates.scss
new file mode 100644
index 00000000000..109db7ebc2b
--- /dev/null
+++ b/addons/website_event_sale/static/src/scss/website_event_sale_templates.scss
@@ -0,0 +1,16 @@
+#o_wevent_tickets .o_pricelist_dropdown {
+    .dropdown-toggle {
+        color: $gray-600; // text-muted
+        font-style: italic;
+    }
+    .dropdown-toggle:focus {
+        outline: none;
+        box-shadow: none;
+    }
+    .dropdown-toggle:hover {
+        text-decoration: underline;
+    }
+    .dropdown-item {
+        font-size: small;
+    }
+}
diff --git a/addons/website_event_sale/views/website_event_templates.xml b/addons/website_event_sale/views/website_event_templates.xml
index d59a4c219e5..6289119180a 100644
--- a/addons/website_event_sale/views/website_event_templates.xml
+++ b/addons/website_event_sale/views/website_event_templates.xml
@@ -2,6 +2,16 @@
 <odoo>
 
 <template id="registration_template" inherit_id="website_event.registration_template">
+    <!-- Change pricelist -->
+    <xpath expr="//div[hasclass('o_wevent_price_range')]" position="after">
+        <div id="o_wevent_tickets_pricelist" class="collapse show">
+            <t t-set="website_sale_pricelists" t-value="website.get_pricelist_available(show_visible=True)" />
+            <t t-set="hasPricelistDropdown" t-value="website_sale_pricelists and len(website_sale_pricelists)&gt;1"/>
+            <t t-call="website_sale.pricelist_list">
+                <t t-set="_classes" t-valuef="d-none d-lg-inline p-0 ms-2 my-1"/>
+            </t>
+        </div>
+    </xpath>
     <!-- Add price information on tickets (multi tickets, aka in collapse) -->
     <xpath expr="//div[hasclass('o_wevent_registration_multi_select')]" position="inside">
         <t t-if="ticket.price">
@@ -20,13 +30,16 @@
         <span t-else="" class="fw-bold text-uppercase">Free</span>
     </xpath>
     <xpath expr="//div[hasclass('o_wevent_price_range')]" position="inside">
-        <t t-if="event.event_ticket_ids[-1].price_reduce > 0">
+        <t t-set="all_prices" t-value="event.event_ticket_ids.mapped('price_reduce')"/>
+        <t t-set="lowest_price" t-value="min(all_prices)"/>
+        <t t-set="highest_price" t-value="max(all_prices)"/>
+        <t t-if="highest_price > 0">
             <span class="text-dark">
                 From
-                <span t-out="event.event_ticket_ids[0].price_reduce" t-options="{'widget': 'monetary', 'from_currency': event.company_id.sudo().currency_id, 'display_currency': website.pricelist_id.currency_id}"/>
-                <t t-if="event.event_ticket_ids[-1].price_reduce != event.event_ticket_ids[0].price_reduce">
+                <span t-out="lowest_price" t-options="{'widget': 'monetary', 'from_currency': event.company_id.sudo().currency_id, 'display_currency': website.pricelist_id.currency_id}"/>
+                <t t-if="lowest_price != highest_price">
                     to
-                    <span t-out="event.event_ticket_ids[-1].price_reduce" t-options="{'widget': 'monetary', 'from_currency': event.company_id.sudo().currency_id, 'display_currency': website.pricelist_id.currency_id}"/>
+                    <span t-out="highest_price" t-options="{'widget': 'monetary', 'from_currency': event.company_id.sudo().currency_id, 'display_currency': website.pricelist_id.currency_id}"/>
                 </t>
             </span>
         </t>
@@ -65,4 +78,10 @@
     </xpath>
 </template>
 
+<template id="fold_register_details" inherit_id="website_event.fold_register_details" name="Fold ticket details">
+    <xpath expr="//div[@id='o_wevent_tickets_pricelist']" position="attributes">
+        <attribute name="class">collapse</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/addons/website_event_sale/views/website_sale_templates.xml b/addons/website_event_sale/views/website_sale_templates.xml
index 93e76cf604d..37b99e0e8bc 100644
--- a/addons/website_event_sale/views/website_sale_templates.xml
+++ b/addons/website_event_sale/views/website_sale_templates.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <template id="index_topbar" inherit_id="website_event.index_topbar">
+        <xpath expr="//ul[hasclass('o_wevent_index_topbar_filters')]" position="inside">
+            <t t-set="website_sale_pricelists" t-value="website.get_pricelist_available(show_visible=True)" />
+            <t t-set="hasPricelistDropdown" t-value="website_sale_pricelists and len(website_sale_pricelists)&gt;1"/>
+            <t t-call="website_sale.pricelist_list">
+                <t t-set="_classes" t-valuef="d-none d-lg-inline me-2 my-1"/>
+            </t>
+        </xpath>
+    </template>
+
     <!-- If the sale order line concerns an event, we want the "product" link to point to the event itself and not to the product on the ecommerce -->
     <template id="cart_line_product_link_inherit_website_event_sale" inherit_id="website_sale.cart_line_product_link" name="Event Shopping Cart Line Product Link">
         <xpath expr="//a" position="attributes">

From ba5da3a1ecb13960848b428a801294e7ddb4a242 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Mon, 9 Jan 2023 08:59:55 +0000
Subject: [PATCH 3/3] [IMP] website_event: Reduce daterange width

Purpose
=======
Reduce the daterange widget width in the add
event website modal to avoid unecessary white
gaps.

Task-3081384

Part-of: odoo/odoo#106980
---
 addons/website_event/views/event_event_add.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_event/views/event_event_add.xml b/addons/website_event/views/event_event_add.xml
index b11e2f56a86..3bfbf8f6630 100644
--- a/addons/website_event/views/event_event_add.xml
+++ b/addons/website_event/views/event_event_add.xml
@@ -12,10 +12,10 @@
                 <field name="name" placeholder="e.g. &quot;Conference for Architects&quot;" string="Event Name"/>
                 <field name="address_id" context="{'show_address': 1}" options='{"always_reload": True}'/>
                 <label for="date_begin" string="Start &#8594; End"/>
-                <div class="o_row w-100">
-                    <field name="date_begin" widget="daterange" nolabel="1" options="{'related_end_date': 'date_end'}"/>
+                <div class="d-flex flex-column flex-sm-row align-items-baseline w-100">
+                    <field name="date_begin" style="width: 17ch" widget="daterange" nolabel="1" options="{'related_end_date': 'date_end'}"/>
                     <i class="fa fa-long-arrow-right mx-2" aria-label="Arrow icon" title="Arrow"/>
-                    <field name="date_end" widget="daterange" nolabel="1" options="{'related_start_date': 'date_begin'}"/>
+                    <field name="date_end" style="width: 17ch" widget="daterange" nolabel="1" options="{'related_start_date': 'date_begin'}"/>
                 </div>
             </group>
         </form>