diff --git a/__manifest__.py b/__manifest__.py index e69d2ba..129bd86 100755 --- a/__manifest__.py +++ b/__manifest__.py @@ -50,9 +50,8 @@ 'views/individual_booking_event.xml', 'views/booking_event_registration.xml', 'views/booking_website_registration.xml', + 'views/individual_booking_website_registration.xml', 'views/booking_registration.xml', - #'views/booking_event_templates_list.xml', - #'views/booking_event_templates_page_registration.xml', 'views/booking_location.xml', 'views/booking_room.xml', 'views/booking_questionnaire.xml', diff --git a/controllers/booking.py b/controllers/booking.py index 70651ca..abf8286 100755 --- a/controllers/booking.py +++ b/controllers/booking.py @@ -417,5 +417,11 @@ class booking(WebsiteEventController,AuthSignupHome): individual_booking=request.env['event.event'].sudo().search([('name','=','Retraite individuelle')]) if individual_booking: - return request.redirect('/booking/registration/options?event_id='+str(int(individual_booking.id))) + data={} + data['event']=individual_booking + + return request.render("kalachakra.individual_booking_p1",data) + #individual_booking=request.env['event.event'].sudo().search([('name','=','Retraite individuelle')]) + #if individual_booking: + # return request.redirect('/booking/registration/options?event_id='+str(int(individual_booking.id))) diff --git a/models/event.py b/models/event.py index a68bed9..303b3a2 100755 --- a/models/event.py +++ b/models/event.py @@ -301,6 +301,7 @@ class KalachakraEvent(models.Model): individual_super_member_month_price=fields.Monetary('1 month price',currency_field='currency_id') individual_booking_html_introduction=fields.Html('Introduction text') + individual_booking_html_introduction2=fields.Html('Introduction text2') @api.onchange('booking_event') diff --git a/views/booking_event.xml b/views/booking_event.xml index 6f6a3a7..1d58078 100755 --- a/views/booking_event.xml +++ b/views/booking_event.xml @@ -163,7 +163,8 @@ - + + diff --git a/views/booking_website_registration.xml b/views/booking_website_registration.xml index 14765c8..6fac5bd 100755 --- a/views/booking_website_registration.xml +++ b/views/booking_website_registration.xml @@ -57,7 +57,7 @@
- +
diff --git a/views/individual_booking_website_registration.xml b/views/individual_booking_website_registration.xml new file mode 100755 index 0000000..5e31a11 --- /dev/null +++ b/views/individual_booking_website_registration.xml @@ -0,0 +1,13 @@ + + + \ No newline at end of file