diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py
index 69df912..5689f75 100644
--- a/controllers/kalachakra.py
+++ b/controllers/kalachakra.py
@@ -319,8 +319,10 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
request.session['partner_id']=int(partner.id)
data['partner']=partner
data['registred']=True
+ country=request.env['res.country'].sudo().search([])
+ data['countries']=country
-
+ # si pas connecté
else:
data['registred']=False
title_male=request.env['res.partner.title'].sudo().search([('name','=','Monsieur')])
@@ -367,6 +369,18 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
user=request.env['res.users'].search([('id','=',int(userid))])
partner=request.env['res.partner'].sudo().search([('id','=',int(user.partner_id))])
request.session['partner_id']=int(partner.id)
+ #mise à jour des informations du contact lié à l'utilisateur
+ vals={}
+ vals['name']=post.get('name')
+ vals['firstname']=post.get('firstname')
+ vals['title']=int(post.get('title_id'))
+ vals['street']=post.get('street')
+ vals['street2']=post.get('street2')
+ vals['zip']=post.get('zip')
+ vals['country_id']=int(post.get('country_id'))
+ vals['phone']=post.get('phone')
+ partner.sudo().write(vals)
+
else:
#si pas connecté on cherche le contact indiqué par l'email
@@ -384,9 +398,22 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
vals['country_id']=int(post.get('country_id'))
vals['phone']=post.get('phone')
partner=request.env['res.partner'].sudo().create(vals)
- #si le contact existe, on vérifie qu'il n'est pas déjà adhérent
+ #si le contact existe :
+ #on met à jour ses informations
else:
- if partner.member_status in ('member','super member'):
+ vals={}
+
+ vals['name']=post.get('name')
+ vals['firstname']=post.get('firstname')
+ vals['title']=int(post.get('title_id'))
+ vals['street']=post.get('street')
+ vals['street2']=post.get('street2')
+ vals['zip']=post.get('zip')
+ vals['country_id']=int(post.get('country_id'))
+ vals['phone']=post.get('phone')
+ partner.sudo().write(vals)
+ #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']==post.get('email')
return http.request.render('kalachakra.already_member',data)
diff --git a/static/js/kalachakra.js b/static/js/kalachakra.js
index 6d47ba2..20891ef 100644
--- a/static/js/kalachakra.js
+++ b/static/js/kalachakra.js
@@ -7,6 +7,18 @@ odoo.define('kalachakra.main', function (require) {
});
+ $( ".list-group-item" ).click(function() {
+ var txtamount = $( this ).text();
+ l=txtamount.length
+ amount=txtamount.substr(0,l-2)
+ if (jQuery(this).attr("id")=="btn_autre")
+ {
+ $("#amount_id").focus();
+ }
+ $("#amount_id").val(amount)
+ });
+
+
$( "#pay_now_btn" ).click(function() {
$('#form').attr('action', '/kalachakra/participation?type=participation');
diff --git a/views/website_participation.xml b/views/website_participation.xml
index bf48b8e..92ca557 100644
--- a/views/website_participation.xml
+++ b/views/website_participation.xml
@@ -33,7 +33,7 @@
-