+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ ( to )
+
+
+
+
+
+
+
+
+
+ FREE TICKET
+
+
+
-
-
-
-
+
-
- ![]()
-
-
-
-
-
-
-
- June 4th - 6th , 2014
-
+
+
+
+
+ registration.editor.form
+ registration.editor
+
+
+
+
+
+
+ Event Registrations
+ ir.actions.act_window
+ registration.editor
+ form
+ form
+ new
+ {'default_sale_order_id': context.get('default_sale_order_id')}
+
+
+
+
diff --git a/addons/payment_transfer/models/payment_acquirer.py b/addons/payment_transfer/models/payment_acquirer.py
index 63883b3df30..8b8dc7a9649 100644
--- a/addons/payment_transfer/models/payment_acquirer.py
+++ b/addons/payment_transfer/models/payment_acquirer.py
@@ -83,4 +83,4 @@ class TransferPaymentTransaction(osv.Model):
def _transfer_form_validate(self, cr, uid, tx, data, context=None):
_logger.info('Validated transfer payment for tx %s: set as pending' % (tx.reference))
- return tx.write({'state': 'pending'})
+ return tx.write({'state': 'done'})
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index da343c9fa3b..134371a3caf 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -4,9 +4,10 @@ import time
import werkzeug.urls
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
+from collections import OrderedDict
from openerp import http
-from openerp import tools
+from openerp import tools, SUPERUSER_ID
from openerp.addons.website.models.website import slug
from openerp.http import request
from openerp.tools.translate import _
@@ -195,6 +196,7 @@ class website_event(http.Controller):
'name': event_name,
'date_begin': date_begin.strftime('%Y-%m-%d'),
'date_end': (date_begin + timedelta(days=(1))).strftime('%Y-%m-%d'),
+ 'seats_available': 1000,
}
event_id = Event.create(request.cr, request.uid, vals, context=context)
event = Event.browse(request.cr, request.uid, event_id, context=context)
@@ -225,3 +227,48 @@ class website_event(http.Controller):
"event": event,
"url": event.website_url})
return request.website.render("website_event.country_events_list", result)
+
+ def _process_tickets_details(self, data):
+ nb_register = int(data.get('nb_register-0', 0))
+ if nb_register:
+ return [{'id': 0, 'name': 'Subscription', 'quantity': nb_register, 'price': 0}]
+ return []
+
+ @http.route(['/event//registration/new'], type='json', auth="public", methods=['POST'], website=True)
+ def registration_new(self, event, **post):
+ tickets = self._process_tickets_details(post)
+ if not tickets:
+ return request.redirect("/event/%s" % slug(event))
+ return request.website._render("website_event.registration_attendee_details", {'tickets': tickets, 'event': event})
+
+ def _process_registration_details(self, details):
+ ''' Process data posted from the attendee details form. '''
+ registrations = {}
+ for key, value in details.iteritems():
+ counter, field_name = key.split('-', 1)
+ registrations.setdefault(counter, dict())[field_name] = value
+ return registrations.values()
+
+ @http.route(['/event//registration/confirm'], type='http', auth="public", methods=['POST'], website=True)
+ def registration_confirm(self, event, **post):
+ cr, uid, context = request.cr, request.uid, request.context
+ Registration = request.registry['event.registration']
+ registrations = self._process_registration_details(post)
+
+ registration_ids = []
+ user = request.registry.get('res.users').browse(cr, uid, uid, context=context)
+ for registration in registrations:
+ registration_ids.append(
+ Registration.create(cr, SUPERUSER_ID, {
+ 'name': registration.get('name', user.name),
+ 'phone': registration.get('phone', user.phone),
+ 'email': registration.get('email', user.email),
+ 'partner_id': user.partner_id.id,
+ 'event_id': event.id,
+ }, context=context))
+
+ attendees = Registration.browse(cr, uid, registration_ids, context=context)
+ return request.website.render("website_event.registration_complete", {
+ 'attendees': attendees,
+ 'event': event,
+ })
diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py
index 37b6d113aee..c633aae4cc2 100644
--- a/addons/website_event/models/event.py
+++ b/addons/website_event/models/event.py
@@ -4,6 +4,7 @@ from openerp import models, fields, api, _
# from openerp.osv import osv, fields
from openerp import SUPERUSER_ID
+from openerp.models import NewId
# from openerp.tools.translate import _
import re
@@ -31,11 +32,13 @@ class event(models.Model):
@api.one
@api.depends('name')
def _website_url(self):
- self.website_url = "/event/" + slug(self)
+ if isinstance(self.id, NewId):
+ self.website_url = ''
+ else:
+ self.website_url = "/event/" + slug(self)
- @api.one
def _default_hashtag(self):
- self.twitter_hashtag = re.sub("[- \\.\\(\\)\\@\\#\\&]+", "", self.env.user.company_id.name).lower()
+ return re.sub("[- \\.\\(\\)\\@\\#\\&]+", "", self.env.user.company_id.name).lower()
show_menu = fields.Boolean('Has Dedicated Menu', compute='_get_show_menu', inverse='_set_show_menu')
menu_id = fields.Many2one('website.menu', 'Event Menu')
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
new file mode 100644
index 00000000000..f6a4328def4
--- /dev/null
+++ b/addons/website_event/static/src/js/website_event.js
@@ -0,0 +1,23 @@
+$(document).ready(function () {
+
+ // Catch registration form event, because of JS for attendee details
+ $('#registration_form .a-submit')
+ .off('click')
+ .removeClass('a-submit')
+ .click(function (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ var $form = $(ev.currentTarget).closest('form');
+ var post = {};
+ $("select").each(function() {
+ post[$(this)[0].name] = $(this).val();
+ });
+ openerp.jsonRpc($form.attr('action'), 'call', post).then(function (modal) {
+ var $modal = $(modal);
+ $modal.appendTo($form).modal()
+ $modal.on('click', '.js_goto_event', function () {
+ $modal.modal('hide');
+ });
+ });
+ });
+});
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 5654a8eccb5..b0c8fbf64f7 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -5,6 +5,7 @@
+
@@ -289,6 +290,9 @@
+
+ ![]()
+
+
+
- ( to )
-
diff --git a/addons/event_sale/wizard/__init__.py b/addons/event_sale/wizard/__init__.py
new file mode 100644
index 00000000000..f6bf2a429d9
--- /dev/null
+++ b/addons/event_sale/wizard/__init__.py
@@ -0,0 +1 @@
+import event_edit_registration
diff --git a/addons/event_sale/wizard/event_edit_registration.py b/addons/event_sale/wizard/event_edit_registration.py
new file mode 100644
index 00000000000..dfc43b0c4a2
--- /dev/null
+++ b/addons/event_sale/wizard/event_edit_registration.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from openerp import models, fields, api
+
+
+class SaleOrderEventRegistration(models.TransientModel):
+ _name = "registration.editor"
+
+ sale_order_id = fields.Many2one('sale.order', 'Sale Order', required=True)
+ event_registration_ids = fields.One2many('registration.editor.line', 'editor_id', string='Registrations to Edit')
+
+ @api.model
+ def default_get(self, fields):
+ res = super(SaleOrderEventRegistration, self).default_get(fields)
+ if not res.get('sale_order_id'):
+ sale_order_id = res.get('sale_order_id', self._context.get('active_id'))
+ res['sale_order_id'] = sale_order_id
+ sale_order = self.env['sale.order'].browse(res.get('sale_order_id'))
+ registrations = self.env['event.registration'].search([('origin', '=', sale_order.name)])
+
+ attendee_list = []
+ for so_line in [l for l in sale_order.order_line if l.event_id]:
+ existing_registrations = [r for r in registrations if r.event_id == so_line.event_id]
+ for reg in existing_registrations:
+ attendee_list.append({
+ 'event_id': reg.event_id.id,
+ 'event_ticket_id': reg.event_ticket_id.id,
+ 'registration_id': reg.id,
+ 'name': reg.name,
+ 'email': reg.email,
+ 'phone': reg.phone,
+ })
+ for count in range(int(so_line.product_uom_qty) - len(existing_registrations)):
+ attendee_list.append({
+ 'event_id': so_line.event_id.id,
+ 'event_ticket_id': so_line.event_ticket_id.id,
+ })
+ res['event_registration_ids'] = attendee_list
+ return res
+
+ @api.multi
+ def action_make_registration(self):
+ Registration = self.env['event.registration']
+ for wizard in self:
+ for wiz_registration in wizard.event_registration_ids:
+ if wiz_registration.registration_id:
+ wiz_registration.registration_id.write(wiz_registration.get_registration_data()[0])
+ else:
+ Registration.create(wiz_registration.get_registration_data()[0])
+ return {'type': 'ir.actions.act_window_close'}
+
+
+class RegistrationEditorLine(models.TransientModel):
+ """Event Registration"""
+ _name = "registration.editor.line"
+
+ editor_id = fields.Many2one('registration.editor')
+ event_id = fields.Many2one('event.event', string='Event', required=True)
+ registration_id = fields.Many2one('event.registration', 'Original Registration')
+ event_ticket_id = fields.Many2one('event.event.ticket', string='Event Ticket')
+ email = fields.Char(string='Email')
+ phone = fields.Char(string='Phone')
+ name = fields.Char(string='Name', select=True)
+
+ @api.one
+ def get_registration_data(self):
+ return {
+ 'event_id': self.event_id.id,
+ 'event_ticket_id': self.event_ticket_id.id,
+ 'partner_id': self.editor_id.sale_order_id.partner_id.id,
+ 'name': self.name or self.editor_id.sale_order_id.partner_id.name,
+ 'phone': self.phone or self.editor_id.sale_order_id.partner_id.phone,
+ 'email': self.email or self.editor_id.sale_order_id.partner_id.email,
+ 'origin': self.editor_id.sale_order_id.name,
+ }
diff --git a/addons/event_sale/wizard/event_edit_registration.xml b/addons/event_sale/wizard/event_edit_registration.xml
new file mode 100644
index 00000000000..f9b572c2176
--- /dev/null
+++ b/addons/event_sale/wizard/event_edit_registration.xml
@@ -0,0 +1,43 @@
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
- Status
-
+
Status
+
+
-
@@ -367,6 +371,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -398,6 +541,7 @@
+
diff --git a/addons/website_event_sale/__openerp__.py b/addons/website_event_sale/__openerp__.py
index e0ab12e0f78..d259d0f6a99 100644
--- a/addons/website_event_sale/__openerp__.py
+++ b/addons/website_event_sale/__openerp__.py
@@ -2,7 +2,7 @@
{
'name': "Online Event's Tickets",
- 'category': 'Hidden',
+ 'category': 'Website',
'summary': "Sell Your Event's Tickets",
'website': 'https://www.odoo.com/page/events',
'version': '1.0',
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 063e60c7df6..c84d9df1dc3 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -28,39 +28,51 @@ from openerp.tools.translate import _
class website_event(website_event):
- @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True)
- def cart_update(self, event_id, **post):
- cr, uid, context = request.cr, request.uid, request.context
- ticket_obj = request.registry.get('event.event.ticket')
-
- sale = False
- for key, value in post.items():
- quantity = int(value or "0")
- if not quantity:
+ def _process_tickets_details(self, data):
+ ticket_post = {}
+ for key, value in data.iteritems():
+ if not key.startswith('nb_register') or not '-' in key:
continue
- sale = True
- ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
- ticket = ticket_obj.browse(cr, SUPERUSER_ID, ticket_id, context=context)
- order = request.website.sale_get_order(force_create=1)
- order.with_context(event_ticket_id=ticket.id)._cart_update(product_id=ticket.product_id.id, add_qty=quantity)
+ items = key.split('-')
+ if len(items) < 2:
+ continue
+ ticket_post[int(items[1])] = int(value)
+ tickets = request.registry['event.event.ticket'].browse(request.cr, request.uid, ticket_post.keys(), request.context)
+ return [{'id': ticket.id, 'name': ticket.name, 'quantity': ticket_post[ticket.id], 'price': ticket.price} for ticket in tickets if ticket_post[ticket.id]]
+
+ @http.route(['/event//registration/confirm'], type='http', auth="public", methods=['POST'], website=True)
+ def registration_confirm(self, event, **post):
+ cr, uid, context = request.cr, request.uid, request.context
+ order = request.website.sale_get_order(force_create=1)
+
+ registrations = self._process_registration_details(post)
+ registration_ctx = dict(context, registration_force_draft=True)
+ for registration in registrations:
+ ticket = request.registry['event.event.ticket'].browse(cr, SUPERUSER_ID, int(registration['ticket_id']), context=context)
+ order.with_context(event_ticket_id=ticket.id)._cart_update(product_id=ticket.product_id.id, add_qty=1)
+
+ request.registry['event.registration'].create(cr, SUPERUSER_ID, {
+ 'name': registration.get('name'),
+ 'phone': registration.get('phone'),
+ 'email': registration.get('email'),
+ 'event_ticket_id': int(registration['ticket_id']),
+ 'partner_id': order.partner_id.id,
+ 'event_id': event.id,
+ 'origin': order.name,
+ }, context=registration_ctx)
- if not sale:
- return request.redirect("/event/%s" % event_id)
return request.redirect("/shop/checkout")
def _add_event(self, event_name="New Event", context={}, **kwargs):
try:
dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event')
- context['default_event_ticket_ids'] = [[0,0,{
+ context['default_event_ticket_ids'] = [[0, 0, {
'name': _('Subscription'),
'product_id': res_id,
- 'deadline' : False,
+ 'deadline': False,
'seats_max': 1000,
'price': 0,
}]]
except ValueError:
pass
return super(website_event, self)._add_event(event_name, context, **kwargs)
-
-
-
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index 0a20686cd35..d9751f2a2d2 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -13,24 +13,40 @@
},
{
waitNot: 'a[href*="/event"]:contains("Conference on Business Apps")',
- title: "select 2 Standard tickets",
+ title: "select 1 Standard ticket",
element: 'select:eq(0)',
+ sampleText: '1',
+ },
+ {
+ title: "select 2 VIP tickets",
+ waitFor: 'select:eq(0) option:contains(1):selected',
+ element: 'select:eq(1)',
sampleText: '2',
},
- {
- title: "select 3 VIP tickets",
- waitFor: 'select:eq(0) option:contains(2):selected',
- element: 'select:eq(1)',
- sampleText: '3',
- },
{
title: "Order Now",
- waitFor: 'select:eq(1) option:contains(3):selected',
+ waitFor: 'select:eq(1) option:contains(2):selected',
element: '.btn-primary:contains("Order Now")',
},
+ {
+ title: "Add the details of attendees",
+ waitFor: 'form[id="attendee_registration"] .btn:contains("Continue")',
+ autoComplete: function (tour) {
+ $("input[name='1-name']").val("Att1");
+ $("input[name='1-phone']").val("111 111");
+ $("input[name='1-email']").val("att1@example.com");
+ $("input[name='1-name']").val("Att2");
+ $("input[name='1-phone']").val("222 222");
+ $("input[name='1-email']").val("att2@example.com");
+ },
+ },
+ {
+ title: "click in modal on 'Continue' button",
+ element: '.modal button:contains("Continue")',
+ },
{
title: "Check the cart",
- element: '#top_menu .my_cart_quantity:contains(5)'
+ element: '#top_menu .my_cart_quantity:contains(3)'
},
{
title: "Check if the cart have 2 order lines and add one VIP ticket",
@@ -39,7 +55,7 @@
},
{
title: "Process Checkout",
- waitFor: '#top_menu .my_cart_quantity:contains(6)',
+ waitFor: '#top_menu .my_cart_quantity:contains(4)',
element: '.btn-primary:contains("Process Checkout")'
},
{
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index cf68e99146d..7a763815d78 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -25,57 +25,61 @@
-
-
-
+
+
+