From 68dbacac1eec7b8196ffc108f533667c31b08cbb Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Tue, 19 May 2015 17:09:12 +0200 Subject: [PATCH] [IMP] event, event_sale, website_event, website_event_sale : clear registration badge handeling Now, - event contains the HTML badge fields and the report (and report templates) to print badges - event_sale add the ticket type on badges - website_event allow the edition of badge throught website editor. When the editor will be available in backend, event will be allow to edit badge report, so the action should be moved from website_Event to event module. --- addons/event/__openerp__.py | 6 +- addons/event/email_template.xml | 16 +++ addons/event/event.py | 33 ++++++ addons/event/event_report.xml | 28 ----- addons/event/event_tip_data.xml | 2 +- addons/event/event_view.xml | 13 ++- addons/event/report/event_event_reports.xml | 39 +++++++ addons/event/report/event_event_templates.xml | 104 ++++++++++++++++++ .../event/views/report_registrationbadge.xml | 39 ------- addons/event_sale/__openerp__.py | 2 +- addons/event_sale/models/event.py | 4 - .../report/event_event_templates.xml | 20 ++++ .../views/report_registrationbadge.xml | 62 ----------- addons/website/static/src/css/website.css | 3 + addons/website/static/src/css/website.sass | 4 + addons/website_event/models/event.py | 10 ++ .../views/website_event_backend.xml | 9 ++ 17 files changed, 250 insertions(+), 144 deletions(-) delete mode 100644 addons/event/event_report.xml create mode 100644 addons/event/report/event_event_reports.xml create mode 100644 addons/event/report/event_event_templates.xml delete mode 100644 addons/event/views/report_registrationbadge.xml create mode 100644 addons/event_sale/report/event_event_templates.xml delete mode 100644 addons/event_sale/views/report_registrationbadge.xml diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 9de11b3bd61..d4e14c420b5 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -25,13 +25,13 @@ Key Features 'wizard/event_confirm_view.xml', 'event_view.xml', 'report/report_event_registration_view.xml', + 'report/event_event_templates.xml', + 'report/event_event_reports.xml', 'event_data.xml', 'event_tip_data.xml', 'res_config_view.xml', - 'email_template.xml', 'views/event.xml', - 'event_report.xml', - 'views/report_registrationbadge.xml', + 'email_template.xml', ], 'demo': [ 'event_demo.xml', diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml index 26a9341b756..c31102294d6 100644 --- a/addons/event/email_template.xml +++ b/addons/event/email_template.xml @@ -2,6 +2,22 @@ + + Event: Registration Badge + + ${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe} + ${object.email|safe} + Your badge for ${object.event_id.name} + + + badge_of_${(object.event_id.name or '').replace('/','_')} + Hello ${object.name},

+

We confirm that your subscription to the event ${object.event_id.name} has been recorded. +Please, Find your Event Badge attached with this mail.

+

Thank you for your participation!

+

Best regards

]]> + + Event subscription diff --git a/addons/event/event.py b/addons/event/event.py index 4eba6e7f16d..f9915ff38fc 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -168,6 +168,12 @@ class event_event(models.Model): description = fields.Html( string='Description', oldname='note', translate=True, readonly=False, states={'done': [('readonly', True)]}) + # badge fields + badge_front = fields.Html(string='Badge Front') + badge_back = fields.Html(string='Badge Back') + badge_innerleft = fields.Html(string='Badge Innner Left') + badge_innerright = fields.Html(string='Badge Inner Right') + event_logo = fields.Html(string='Event Logo') @api.multi @api.depends('name', 'date_begin', 'date_end') @@ -363,3 +369,30 @@ class event_registration(models.Model): if attendee.partner_id: attendee._message_add_suggested_recipient(recipients, partner=attendee.partner_id, reason=_('Customer')) return recipients + + @api.multi + def action_send_badge_email(self): + """ Open a window to compose an email, with the template - 'event_badge' + message loaded by default + """ + self.ensure_one() + template = self.env.ref('event.event_registration_mail_template_badge') + compose_form = self.env.ref('mail.email_compose_message_wizard_form') + ctx = dict( + default_model='event.registration', + default_res_id=self.id, + default_use_template=bool(template), + default_template_id=template.id, + default_composition_mode='comment', + ) + return { + 'name': _('Compose Email'), + 'type': 'ir.actions.act_window', + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'mail.compose.message', + 'views': [(compose_form.id, 'form')], + 'view_id': compose_form.id, + 'target': 'new', + 'context': ctx, + } diff --git a/addons/event/event_report.xml b/addons/event/event_report.xml deleted file mode 100644 index 9a2ee6e2e42..00000000000 --- a/addons/event/event_report.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - European A4 low margin - - A4 - 0 - 0 - Portrait - 5 - 5 - 5 - 5 - - 0 - 80 - - - - - - diff --git a/addons/event/event_tip_data.xml b/addons/event/event_tip_data.xml index f7c6a66064c..9d34113523b 100644 --- a/addons/event/event_tip_data.xml +++ b/addons/event/event_tip_data.xml @@ -7,7 +7,7 @@ event.event form .oe_form_buttons_view:visible,div.oe_right.oe_button_box > button - div.oe_right.oe_button_box:visible > button:nth-child(1) + div.oe_right.oe_button_box:visible > button.oe_event_attendee_button bottom diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index d4a9c760347..6ec68c6b479 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -37,7 +37,7 @@ event.type form - + @@ -70,10 +70,10 @@

- @@ -302,6 +302,7 @@
+ +