From a2fe1cfb33ac4791367ef8dfbd81de91bf0d44b2 Mon Sep 17 00:00:00 2001
From: Patrick Hoste <pko@odoo.com>
Date: Thu, 23 Sep 2021 15:02:56 +0000
Subject: [PATCH] [IMP] (website_)event_booth(_sale): polish ux design

PURPOSE

This commit is a first polish for event booth modules. It includes:
- wording
- add currency on price fields
- removing booths tab on event view

LINKS

Task-2635461
PR: odoo/odoo#77081
---
 addons/event_booth/data/mail_templates.xml             |  8 ++++----
 addons/event_booth/tests/test_event_internals.py       |  9 ++++-----
 addons/event_booth/views/event_booth_views.xml         |  6 +++---
 addons/event_booth/views/event_event_views.xml         | 10 ----------
 addons/event_booth_sale/models/event_booth_category.py |  1 +
 addons/event_booth_sale/models/event_type_booth.py     |  1 +
 addons/event_booth_sale/tests/test_event_internals.py  |  9 ++++-----
 .../views/event_booth_category_views.xml               |  6 ++++--
 addons/event_booth_sale/views/event_booth_views.xml    |  7 +++++--
 .../event_booth_sale/views/event_type_booth_views.xml  |  6 ++++--
 .../wizard/event_booth_configurator_views.xml          |  2 +-
 addons/website_event_booth_sale/models/sale_order.py   |  2 +-
 12 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/addons/event_booth/data/mail_templates.xml b/addons/event_booth/data/mail_templates.xml
index 149ab0e7441..5471d54ce1a 100644
--- a/addons/event_booth/data/mail_templates.xml
+++ b/addons/event_booth/data/mail_templates.xml
@@ -19,19 +19,19 @@
         <ul t-if="booth.partner_id" name="contact_details">
             <t t-set="contact_name" t-value="booth.contact_name"/>
             <li t-if="contact_name">
-                <b>Name</b>: <span t-esc="contact_name"/>
+                <b>Renter Name</b>: <span t-esc="contact_name"/>
             </li>
             <t t-set="contact_email" t-value="booth.contact_email"/>
             <li t-if="contact_email">
-                <b>Email</b>: <span t-esc="contact_email"/>
+                <b>Renter Email</b>: <span t-esc="contact_email"/>
             </li>
             <t t-set="contact_mobile" t-value="booth.contact_mobile"/>
             <li t-if="contact_mobile">
-                <b>Mobile</b>: <span t-esc="contact_mobile"/>
+                <b>Renter Mobile</b>: <span t-esc="contact_mobile"/>
             </li>
             <t t-set="contact_phone" t-value="booth.contact_phone"/>
             <li t-if="contact_phone">
-                <b>Phone</b>: <span t-esc="contact_phone"/>
+                <b>Renter Phone</b>: <span t-esc="contact_phone"/>
             </li>
         </ul>
     </template>
diff --git a/addons/event_booth/tests/test_event_internals.py b/addons/event_booth/tests/test_event_internals.py
index 66fceda2142..70b5d9fedbf 100644
--- a/addons/event_booth/tests/test_event_internals.py
+++ b/addons/event_booth/tests/test_event_internals.py
@@ -78,14 +78,13 @@ class TestEventData(TestEventBoothCommon):
         self.assertEqual(event.event_booth_ids[1].message_partner_ids, self.env['res.partner'])
 
         # change event type to one using booths: include event type booths and keep reserved booths
-        event_form = Form(event)
-        event_form.event_type_id = event_type_wbooths
-        self.assertEqual(event_form.event_booth_count, 3)
+        with Form(event) as event_form:
+            event_form.event_type_id = event_type_wbooths
+        self.assertEqual(event.event_booth_count, 3)
         self.assertEqual(
-            set(r['name'] for r in event_form.event_booth_ids._records),
+            set(r['name'] for r in event.event_booth_ids),
             set(('Custom Standard Booth 2', 'Standard Booth', 'Premium Booth')),
             'Should keep booths with reservation, remove unused ones and add type ones'
         )
-        event_form.save()
         self.assertEqual(event.event_booth_count_available, 2)
         self.assertEqual(event.event_booth_category_ids, self.event_booth_category_1 + self.event_booth_category_2)
diff --git a/addons/event_booth/views/event_booth_views.xml b/addons/event_booth/views/event_booth_views.xml
index 3e55ceeb092..d8f29a7d0e0 100644
--- a/addons/event_booth/views/event_booth_views.xml
+++ b/addons/event_booth/views/event_booth_views.xml
@@ -23,9 +23,9 @@
                         <group name="renter">
                             <field name="partner_id"/>
                             <field name="contact_name"/>
-                            <field name="contact_email"/>
-                            <field name="contact_phone"/>
-                            <field name="contact_mobile"/>
+                            <field name="contact_email" widget="email"/>
+                            <field name="contact_phone" widget="phone"/>
+                            <field name="contact_mobile" widget="phone"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/addons/event_booth/views/event_event_views.xml b/addons/event_booth/views/event_event_views.xml
index 9116c78fe3d..5a17cc55dcb 100644
--- a/addons/event_booth/views/event_event_views.xml
+++ b/addons/event_booth/views/event_event_views.xml
@@ -21,16 +21,6 @@
                     </div>
                 </button>
             </div>
-            <page name="tickets" position="after">
-                <page string="Booths" groups="base.group_no_one">
-                    <!-- The booths created from 'event_type_id' won't be saved if invisible attr is set. -->
-                    <field name="event_booth_ids"
-                        context="{
-                            'form_view_ref': 'event_booth.event_booth_view_form_simple_from_event',
-                            'tree_view_ref': 'event_booth.event_booth_view_tree_from_event',
-                        }"/>
-                </page>
-            </page>
         </field>
     </record>
 
diff --git a/addons/event_booth_sale/models/event_booth_category.py b/addons/event_booth_sale/models/event_booth_category.py
index 67d0a531070..b4f6df65c8b 100644
--- a/addons/event_booth_sale/models/event_booth_category.py
+++ b/addons/event_booth_sale/models/event_booth_category.py
@@ -18,6 +18,7 @@ class EventBoothCategory(models.Model):
         'product.product', string='Product', required=True,
         domain=[('detailed_type', '=', 'event_booth')], default=_default_product_id)
     price = fields.Float(string='Price', compute='_compute_price', digits='Product Price', readonly=False, store=True)
+    currency_id = fields.Many2one(related='product_id.currency_id')
     price_reduce = fields.Float(
         string='Price Reduce', compute='_compute_price_reduce',
         compute_sudo=True, digits='Product Price')
diff --git a/addons/event_booth_sale/models/event_type_booth.py b/addons/event_booth_sale/models/event_type_booth.py
index c5318e29611..38f6b559d61 100644
--- a/addons/event_booth_sale/models/event_type_booth.py
+++ b/addons/event_booth_sale/models/event_type_booth.py
@@ -9,6 +9,7 @@ class EventTypeBooth(models.Model):
 
     product_id = fields.Many2one(related='booth_category_id.product_id')
     price = fields.Float(related='booth_category_id.price')
+    currency_id = fields.Many2one(related='booth_category_id.currency_id')
 
     @api.model
     def _get_event_booth_fields_whitelist(self):
diff --git a/addons/event_booth_sale/tests/test_event_internals.py b/addons/event_booth_sale/tests/test_event_internals.py
index e745e2eafff..6da8f1c8c47 100644
--- a/addons/event_booth_sale/tests/test_event_internals.py
+++ b/addons/event_booth_sale/tests/test_event_internals.py
@@ -82,14 +82,13 @@ class TestEventData(TestEventBoothSaleCommon):
         ]})
 
         # change event type to one using booths: include event type booths and keep reserved booths
-        event_form = Form(event)
-        event_form.event_type_id = event_type_wbooths
-        self.assertEqual(event_form.event_booth_count, 3)
+        with Form(event) as event_form:
+            event_form.event_type_id = event_type_wbooths
+        self.assertEqual(event.event_booth_count, 3)
         self.assertEqual(
-            set(r['name'] for r in event_form.event_booth_ids._records),
+            set(r['name'] for r in event.event_booth_ids),
             set(('Custom Standard Booth 2', 'Standard Booth', 'Premium Booth')),
             'Should keep booths with reservation, remove unused ones and add type ones'
         )
-        event_form.save()
         self.assertEqual(event.event_booth_count_available, 2)
         self.assertEqual(event.event_booth_category_ids, self.event_booth_category_1 + self.event_booth_category_2)
diff --git a/addons/event_booth_sale/views/event_booth_category_views.xml b/addons/event_booth_sale/views/event_booth_category_views.xml
index 4aa0ce568b5..ea7a1a2d8a7 100644
--- a/addons/event_booth_sale/views/event_booth_category_views.xml
+++ b/addons/event_booth_sale/views/event_booth_category_views.xml
@@ -9,8 +9,9 @@
         <field name="arch" type="xml">
             <group name="main" position="inside">
                 <group string="Booth Details">
+                    <field name="currency_id" invisible="1"/>
                     <field name="product_id" context="{'default_detailed_type': 'event_booth', 'default_type': 'service'}"/>
-                    <field name="price"/>
+                    <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                 </group>
             </group>
         </field>
@@ -23,8 +24,9 @@
         <field name="priority">3</field>
         <field name="arch" type="xml">
             <field name="name" position="after">
+                <field name="currency_id" invisible="1"/>
                 <field name="product_id"/>
-                <field name="price"/>
+                <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
             </field>
         </field>
     </record>
diff --git a/addons/event_booth_sale/views/event_booth_views.xml b/addons/event_booth_sale/views/event_booth_views.xml
index a1f47fcfcf7..ef08a3769e6 100644
--- a/addons/event_booth_sale/views/event_booth_views.xml
+++ b/addons/event_booth_sale/views/event_booth_views.xml
@@ -18,8 +18,10 @@
                 <widget name="web_ribbon" title="Paid" attrs="{'invisible': [('is_paid', '=', False)]}"/>
             </div>
             <field name="booth_category_id" position="after">
+                <field name="currency_id" invisible="1"/>
                 <field name="product_id" attrs="{'invisible': [('booth_category_id', '=', False)]}"/>
-                <field name="price" attrs="{'invisible': [('booth_category_id', '=', False)]}"/>
+                <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"
+                       attrs="{'invisible': [('booth_category_id', '=', False)]}"/>
             </field>
             <group name="renter" position="after">
                 <group name="sales" groups="base.group_no_one"
@@ -44,7 +46,8 @@
         <field name="inherit_id" ref="event_booth.event_booth_view_tree"/>
         <field name="arch" type="xml">
             <field name="booth_category_id" 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/event_booth_sale/views/event_type_booth_views.xml b/addons/event_booth_sale/views/event_type_booth_views.xml
index 00a20ed3fa6..f6dde071a79 100644
--- a/addons/event_booth_sale/views/event_type_booth_views.xml
+++ b/addons/event_booth_sale/views/event_type_booth_views.xml
@@ -7,8 +7,9 @@
         <field name="inherit_id" ref="event_booth.event_type_booth_view_form_from_type"/>
         <field name="arch" type="xml">
             <field name="booth_category_id" position="after">
+                <field name="currency_id" invisible="1"/>
                 <field name="product_id"/>
-                <field name="price"/>
+                <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
             </field>
         </field>
     </record>
@@ -19,8 +20,9 @@
         <field name="inherit_id" ref="event_booth.event_type_booth_view_tree_from_type"/>
         <field name="arch" type="xml">
             <field name="booth_category_id" position="after">
+                <field name="currency_id" invisible="1"/>
                 <field name="product_id"/>
-                <field name="price"/>
+                <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
             </field>
         </field>
     </record>
diff --git a/addons/event_booth_sale/wizard/event_booth_configurator_views.xml b/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
index 0dee2313286..b720a7e4de3 100644
--- a/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
+++ b/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
@@ -35,7 +35,7 @@
     </record>
 
     <record id="event_booth_configurator_action" model="ir.actions.act_window">
-        <field name="name">Configure an event booth</field>
+        <field name="name">Select an event booth</field>
         <field name="res_model">event.booth.configurator</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
diff --git a/addons/website_event_booth_sale/models/sale_order.py b/addons/website_event_booth_sale/models/sale_order.py
index cae42990e31..47d980cb24b 100644
--- a/addons/website_event_booth_sale/models/sale_order.py
+++ b/addons/website_event_booth_sale/models/sale_order.py
@@ -53,6 +53,6 @@ class SaleOrder(models.Model):
         product = self.env['product.product'].browse(product_id)
         if product.type == 'event_booth' and set_qty > 1:
             set_qty = 1
-            values['warning'] = _('Sorry, you can\'t modify quantity to an Event Booth product.')
+            values['warning'] = _('You cannot manually change the quantity of an Event Booth product.')
         values.update(super(SaleOrder, self)._cart_update(product_id, line_id, add_qty, set_qty, **kwargs))
         return values