diff --git a/__manifest__.py b/__manifest__.py index b059c7f..82a315f 100755 --- a/__manifest__.py +++ b/__manifest__.py @@ -47,6 +47,7 @@ 'views/booking_product.xml', 'views/booking_event.xml', + 'views/individual_booking_event.xml', 'views/booking_event_registration.xml', 'views/booking_website_registration.xml', 'views/booking_registration.xml', diff --git a/models/booking_event_registration.py b/models/booking_event_registration.py index c652ab0..74a9e7e 100755 --- a/models/booking_event_registration.py +++ b/models/booking_event_registration.py @@ -100,6 +100,9 @@ class EventRegistration(models.Model): to_be_paid_amount=fields.Monetary('to be paid amount',compute='_compute_to_be_paid_amount',currency_field='currency_id') payment_adjustement=fields.Monetary('payment adjustement',currency_field='currency_id') individual_room=fields.Boolean('Individual room',compute='compute_individual_room') + start_day_individual_booking=fields.Date('Start day individual booking') + end_day_individual_booking=fields.Date('End day individual booking') + def compute_individual_room(self): for rec in self: diff --git a/models/event.py b/models/event.py index 375b1f2..9e3ad66 100755 --- a/models/event.py +++ b/models/event.py @@ -279,6 +279,24 @@ class KalachakraEvent(models.Model): booking_super_member_price=fields.Monetary('Super member price',currency_field='currency_id') booking_down_payment=fields.Monetary('Down payment',default=50,currency_field='currency_id') booking_product_id=fields.Many2one('product.product',string='booking product',domain="[('booking_product','=','True')]") + + individual_day_price=fields.Monetary('Day price',currency_field='currency_id') + individual_member_day_price=fields.Monetary('Member day price',currency_field='currency_id') + individual_super_member_day_price=fields.Monetary('Super member Day price',currency_field='currency_id') + + individual_week_price=fields.Monetary('Week price',currency_field='currency_id') + individual_member_week_price=fields.Monetary('Member week price',currency_field='currency_id') + individual_super_member_week_price=fields.Monetary('Super member Week price',currency_field='currency_id') + + individual_2weeks_price=fields.Monetary('2 weeks price',currency_field='currency_id') + individual_member_2weeks_price=fields.Monetary('Member 2 weeks price',currency_field='currency_id') + individual_super_member_2weeks_price=fields.Monetary('Super member 2 Weeks price',currency_field='currency_id') + + individual_3weeks_price=fields.Monetary('3 weeks price',currency_field='currency_id') + individual_member_3weeks_price=fields.Monetary('Member 3 weeks price',currency_field='currency_id') + individual_super_member_3weeks_price=fields.Monetary('Super member 3 Weeks price',currency_field='currency_id') + + @api.onchange('booking_event') def onchange_bookin_event(self): diff --git a/static/js/booking.js b/static/js/booking.js index 571c5d5..e6c4d52 100755 --- a/static/js/booking.js +++ b/static/js/booking.js @@ -2,6 +2,9 @@ odoo.define('booking.main', function (require) { $(document).ready(function() { + + $('#datetimepickerstart_day').datetimepicker({format: 'DD/MM/YYYY'}); + $('#datetimepickerend_day').datetimepicker({format: 'DD/MM/YYYY'}); $('#medical_info').hide() diff --git a/views/booking_event.xml b/views/booking_event.xml index 7c86da7..69a369c 100755 --- a/views/booking_event.xml +++ b/views/booking_event.xml @@ -90,7 +90,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -125,6 +125,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/booking_website_registration.xml b/views/booking_website_registration.xml index 31ca46f..2f49746 100755 --- a/views/booking_website_registration.xml +++ b/views/booking_website_registration.xml @@ -49,6 +49,34 @@

+ + +
+ Les inscriptions sont acceptées sous réserve.

Nous vous conseillons, préalablement de contacter par +mail le staff du centre à info@centre-kalachakra.net pour vérifier la disponibilité et valider votre projet +de séjour en solitaire. +
+
Participations amounts :
+ + + + + + + + + + + + + + + + + + + +
Not memberMemberSuper member
1 day
1 week
2 weeks
3 weeks
Total Price :
@@ -70,6 +98,45 @@

+ +
Dates souhaitées :
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+ +
Please select your booking options :


diff --git a/views/individual_booking_event.xml b/views/individual_booking_event.xml new file mode 100755 index 0000000..7d34b85 --- /dev/null +++ b/views/individual_booking_event.xml @@ -0,0 +1,24 @@ + + + Individual booking events + event.event + tree,form,pivot + {'default_individual_booking_event': True, 'individual_booking_event_view': True} + [('individual_booking_event', '=', True)] + + + + + + + + + + + + +