diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index 4d9a1002d94..12689659c87 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -57,7 +57,7 @@ Key Features
'event/static/src/js/tours/**/*',
],
'web.report_assets_common': [
- '/event/static/src/scss/event_foldable_badge_report.scss',
+ '/event/static/src/scss/event_badge_report.scss',
'/event/static/src/scss/event_full_page_ticket_report.scss',
'/event/static/src/scss/event_full_page_ticket_responsive_html_report.scss',
],
diff --git a/addons/event/controllers/main.py b/addons/event/controllers/main.py
index 93d8d6438d9..72211d0d191 100644
--- a/addons/event/controllers/main.py
+++ b/addons/event/controllers/main.py
@@ -65,7 +65,7 @@ class EventController(Controller):
return request.make_response(html)
pdf = request.env['ir.actions.report'].sudo()._render_qweb_pdf(
- 'event.action_report_event_registration_foldable_badge' if badge_mode else
+ 'event.action_report_event_registration_badge' if badge_mode else
'event.action_report_event_registration_full_page_ticket',
event_registrations_sudo.ids,
)[0]
diff --git a/addons/event/data/mail_template_data.xml b/addons/event/data/mail_template_data.xml
index 4fd4458ea59..5a8cbb2d781 100644
--- a/addons/event/data/mail_template_data.xml
+++ b/addons/event/data/mail_template_data.xml
@@ -97,6 +97,7 @@
+ OpenWood Collection Online Reveal
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
(Europe/Brussels)
@@ -228,7 +229,7 @@
|
-
+
{{ object.event_id.lang or object.partner_id.lang }}
@@ -340,6 +341,7 @@
+ OpenWood Collection Online Reveal
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
(Europe/Brussels)
diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py
index 7ac8da308b6..c6b565f3bd5 100644
--- a/addons/event/models/event_event.py
+++ b/addons/event/models/event_event.py
@@ -224,6 +224,14 @@ class EventEvent(models.Model):
lang = fields.Selection(_lang_get, string='Language',
help="All the communication emails sent to attendees will be translated in this language.")
# ticket reports
+ badge_format = fields.Selection(
+ string='Badge Dimension',
+ selection=[
+ ('A4_french_fold', 'A4 foldable'),
+ ('A6', 'A6'),
+ ('four_per_sheet', '4 per sheet')
+ ], default='A6', required=True)
+ badge_image = fields.Image('Badge Background', max_width=1024, max_height=1024)
ticket_instructions = fields.Html('Ticket Instructions', translate=True,
compute='_compute_ticket_instructions', store=True, readonly=False,
help="This information will be printed on your tickets.")
diff --git a/addons/event/models/event_ticket.py b/addons/event/models/event_ticket.py
index 9a6a6ca40ef..aa80c732079 100644
--- a/addons/event/models/event_ticket.py
+++ b/addons/event/models/event_ticket.py
@@ -80,6 +80,8 @@ class EventTicket(models.Model):
seats_used = fields.Integer(string='Used Seats', compute='_compute_seats', store=False)
is_sold_out = fields.Boolean(
'Sold Out', compute='_compute_is_sold_out', help='Whether seats are not available for this ticket.')
+ # reports
+ color = fields.Char('Color', default="#875A7B")
@api.depends('end_sale_datetime', 'event_id.date_tz')
def _compute_is_expired(self):
diff --git a/addons/event/report/event_event_reports.xml b/addons/event/report/event_event_reports.xml
index 3970b91f394..35a92018485 100644
--- a/addons/event/report/event_event_reports.xml
+++ b/addons/event/report/event_event_reports.xml
@@ -1,8 +1,8 @@
-
- Custom Paperformat for the Event Foldable Badge report
+
+ Custom Paperformat for the Event Badge report
A4
@@ -31,9 +31,8 @@
96
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
- ()
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
- 1
- 
-
-
- 2
- 
-
-
-
-
- 3
- 
-
-
- 4
- 
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
-
-
+
+
+
+
@@ -218,6 +215,32 @@
+
+
+
+
+
+
+
+
+
+ John Doe
+
+ My Placeholder Company
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
diff --git a/addons/event/static/src/img/how_to_fold_1.png b/addons/event/static/src/img/how_to_fold_1.png
deleted file mode 100644
index 61ef66f7ced..00000000000
Binary files a/addons/event/static/src/img/how_to_fold_1.png and /dev/null differ
diff --git a/addons/event/static/src/img/how_to_fold_2.png b/addons/event/static/src/img/how_to_fold_2.png
deleted file mode 100644
index 4dd0fe15b58..00000000000
Binary files a/addons/event/static/src/img/how_to_fold_2.png and /dev/null differ
diff --git a/addons/event/static/src/img/how_to_fold_3.png b/addons/event/static/src/img/how_to_fold_3.png
deleted file mode 100644
index 93c20445a79..00000000000
Binary files a/addons/event/static/src/img/how_to_fold_3.png and /dev/null differ
diff --git a/addons/event/static/src/img/how_to_fold_4.png b/addons/event/static/src/img/how_to_fold_4.png
deleted file mode 100644
index d434e4f6a3c..00000000000
Binary files a/addons/event/static/src/img/how_to_fold_4.png and /dev/null differ
diff --git a/addons/event/static/src/scss/event_badge_report.scss b/addons/event/static/src/scss/event_badge_report.scss
new file mode 100644
index 00000000000..7871092a072
--- /dev/null
+++ b/addons/event/static/src/scss/event_badge_report.scss
@@ -0,0 +1,57 @@
+/* EVENT BADGE : CARD USED IN ALL FORMATS */
+
+.o_event_badge_report_page_break {
+ page-break-after:always;
+}
+
+.o_event_badge_height {
+ height: 148mm;
+}
+
+.o_event_badge_ticket_wrapper {
+ background-color: white;
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: cover;
+ border: solid 1px #939393;
+ margin: 16px 8px;
+ padding: 10px 0px 0px;
+ font-size: 1.2rem;
+ box-shadow: -3px 3px 9px 0px rgba(0,0,0,0.51);
+ height: 138mm;
+
+ .o_event_badge_font_faded {
+ color: #939393;
+ }
+
+ .o_event_badge_logo {
+ max-height: 116px;
+ max-width: 174px;
+ }
+}
+
+/* EVENT BADGE : A4 FOLDABLE (A4_french_fold) */
+
+.o_event_foldable_badge_container {
+
+ .o_event_foldable_badge_bottom_row {
+ margin-top: 1mm;
+ .o_event_foldable_badge_bottom_quarter {
+ height: 148mm;
+ -moz-transform: rotate(180deg);
+ -webkit-transform: rotate(180deg);
+ -ms-transform: rotate(180deg);
+ transform: rotate(180deg);
+ }
+ }
+
+ .o_event_foldable_badge_back {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ -moz-transform: translate(-50%, -50%);
+ -webkit-transform: translate(-50%, -50%);
+ -ms-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ }
+}
diff --git a/addons/event/static/src/scss/event_foldable_badge_report.scss b/addons/event/static/src/scss/event_foldable_badge_report.scss
deleted file mode 100644
index 9b0709c4eea..00000000000
--- a/addons/event/static/src/scss/event_foldable_badge_report.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-.o_event_foldable_badge_container {
- .o_event_foldable_badge_top {
- height: 148mm;
-
- &.o_event_foldable_badge_ticket {
- border-left: 1px dashed black;
- }
- }
-
- .o_event_foldable_badge_font_small {
- font-size: .8rem;
- }
-
- .o_event_foldable_badge_bottom.o_event_foldable_badge_left {
- border-top: 1px dashed black;
- height: 148mm;
-
- p {
- margin: 0px; // to match editor style (.o_field_html p)
- }
- }
-
- .o_event_foldable_badge_bottom.o_event_foldable_badge_right {
- border-left: 1px dashed black;
- border-top:1px dashed black;
- height: 148mm;
- background: white;
- }
-
- .o_event_foldable_badge_ticket {
- .o_event_foldable_badge_ticket_wrapper {
- background-color: white;
- border: solid 1px #939393;
- margin: 0px 8px;
- padding: 10px 3px;
- font-size: 1.2rem;
- box-shadow: -3px 3px 9px 0px rgba(0,0,0,0.51);
-
- .o_event_foldable_badge_ticket_wrapper_top {
- min-height: 80mm;
- }
-
- .o_event_foldable_badge_font_faded {
- color: #939393;
- }
-
- .o_event_foldable_badge_barcode {
- min-height: 35mm;
- }
- }
- }
-
- .o_event_foldable_badge_step {
- position: absolute;
- padding: 3px 9px;
- top: 5mm;
- left: 0mm;
- border-radius: 50%;
- background-color: black;
- color: white;
- }
-}
diff --git a/addons/event/views/event_event_views.xml b/addons/event/views/event_event_views.xml
index a11af30f8da..1b26f398ba2 100644
--- a/addons/event/views/event_event_views.xml
+++ b/addons/event/views/event_event_views.xml
@@ -60,6 +60,8 @@
to Confirmed Attendees
+
+
diff --git a/addons/event/views/event_ticket_views.xml b/addons/event/views/event_ticket_views.xml
index f16ea2ef6ef..51d806136ff 100644
--- a/addons/event/views/event_ticket_views.xml
+++ b/addons/event/views/event_ticket_views.xml
@@ -79,6 +79,7 @@
+
|