[FIX] website_event: add to cart to website_sale

bzr revid: chm@openerp.com-20130828093416-o00apdeprqqgrx52

addons/website_event/controllers/main.py

@@ -4,6 +4,7 @@ from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
+from openerp.addons import website_sale
 
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
@@ -103,16 +104,22 @@ class website_event(http.Controller):
         event = request.registry['event.event'].browse(request.cr, request.uid, event_id, {'show_address': 1})
         values = website.get_rendering_context({
             'event_id': event,
+            'range': range
         })
         return website.render("website_event.detail", values)
 
     @http.route(['/event/<int:event_id>/add_cart'], type='http', auth="public")
     def add_cart(self, event_id=None, **post):
+        website = request.registry['website']
+        user_obj = request.registry['res.users']
         order_line_obj = request.registry.get('sale.order.line')
         ticket_obj = request.registry.get('event.event.ticket')
 
-        order = request.registry['website'].get_rendering_context()['order']
-        partner_id = request.registry.get('res.users').browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
+        order = website.get_rendering_context()['order']
+        if not order:
+            order = website_sale.controllers.main.get_order()
+
+        partner_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
 
         context = {}
 

addons/website_sale/controllers/main.py

@@ -26,6 +26,7 @@ def get_order(order_id=None):
         order_value.update(order_obj.onchange_partner_id(request.cr, SUPERUSER_ID, [], request.uid, context={})['value'])
         order_id = order_obj.create(request.cr, SUPERUSER_ID, order_value)
         order = order_obj.browse(request.cr, SUPERUSER_ID, order_id)
+        request.httprequest.session['ecommerce_order_id'] = order.id
 
     context = {
         'pricelist': order.pricelist_id.id,
@@ -155,7 +156,6 @@ class Ecommerce(http.Controller):
         order = get_current_order()
         if not order:
             order = get_order()
-            request.httprequest.session['ecommerce_order_id'] = order.id
 
         context = {'pricelist': self.get_pricelist()}