|
|
@ -989,6 +989,13 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing): |
|
|
|
country=request.env['res.country'].sudo().search([]) |
|
|
|
data['countries']=country |
|
|
|
data['country_id']=int(partner.country_id) |
|
|
|
|
|
|
|
# if type in ('membership','super_membership'): |
|
|
|
|
|
|
|
# if partner.member_status in ('member','super member') and request.session['kalachakra_transaction']=='membership': |
|
|
|
# data={} |
|
|
|
# data['email']=partner.email |
|
|
|
# return http.request.render('kalachakra.already_member',data) |
|
|
|
|
|
|
|
# si pas connecté |
|
|
|
else: |
|
|
@ -1111,10 +1118,10 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing): |
|
|
|
user.sudo().action_reset_password() |
|
|
|
|
|
|
|
#demande d'adhésion : on vérifie qu'il n'est pas déjà adhérent si demande d'adhésion |
|
|
|
if partner.member_status in ('member','super member') and request.session['kalachakra_transaction']=='membership': |
|
|
|
data={} |
|
|
|
data['email']=partner.email |
|
|
|
return http.request.render('kalachakra.already_member',data) |
|
|
|
# if partner.member_status in ('member','super member') and request.session['kalachakra_transaction']=='membership': |
|
|
|
# data={} |
|
|
|
# data['email']=partner.email |
|
|
|
# return http.request.render('kalachakra.already_member',data) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1182,6 +1189,11 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing): |
|
|
|
request.session['donation_id'] = donation_draft.id |
|
|
|
|
|
|
|
#create membership |
|
|
|
#if already member, the start date become |
|
|
|
# the end date of the active membership |
|
|
|
#if partner.member_status in ('member','super member'): |
|
|
|
|
|
|
|
|
|
|
|
if request.session['kalachakra_transaction'] in ['membership']: |
|
|
|
vals={} |
|
|
|
|
|
|
|