Merge branch 'master' of https://gitea.digitalorigin.fr/raynald/kalachakra

merge#

controllers/kalachakra.py

@@ -96,7 +96,7 @@ class Kalachakra_PortalAccount(CustomerPortal):
             domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
 
         # count for pager
-        invoice_count = request.env['account.move'].sudo().search_count(domain)
+        invoice_count = request.env['account.move'].search_count(domain)
         
         # pager
         pager = portal_pager(
@@ -107,7 +107,7 @@ class Kalachakra_PortalAccount(CustomerPortal):
             step=self._items_per_page
         )
         # content according to pager and archive selected
-        invoices = request.env['account.move'].sudo().search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
+        invoices = request.env['account.move'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
         
         request.session['my_invoices_history'] = invoices.ids[:100]
 
@@ -637,7 +637,7 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
     
     @http.route(['/event/registration/contactform'], type='http', auth='user', website=True, sitemap=False,csrf=False)
     #def event_registration_contactform(self,event_id,*args,**kw):
-    def event_registration_contactform(self,event_id,*args,**kw):
+    def event_registration_contactform(self,*args,**kw):
         data={}
         #contact lié à l'utilisateur
         
@@ -646,16 +646,10 @@ 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))])
         data['partner']=partner
-        country=request.env['res.country'].sudo().search([])
-        country_france=request.env['res.country'].sudo().search([('name','=','France')])
-        data['country_france_id']=int(country_france.id)
-        data['countries']=country
-        data['country_id']=int(partner.country_id)
-        data['form_action']='step2'
         #évenement
-        event=request.env['event.event'].sudo().search([('id','=',int(event_id))])
-        request.session['event_id']=int(event_id)
-        data['event']=event
+        # event=request.env['event.event'].sudo().search([('id','=',int(event_id))])
+        # request.session['event_id']=int(event_id)
+        #data['event']=event
         
         return http.request.render('kalachakra.registration_contactform',data)
 
@@ -716,7 +710,7 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
         data['membership_and_participation_amount']=str(int(data['membership_amount'])+int(event.participation_member_price)) +' ('+str(int(data['membership_amount']))+'+'+str(int(event.participation_member_price))+')'
         
         #enregistrement de l'inscription si pas déjà inscrit :
-        res=request.env['event.registration'].sudo().search([('event_id','=',int(request.session['event_id'])),('partner_id','=',int(request.session['partner_id'])),('state','!=','cancel')],limit=1)
+        res=request.env['event.registration'].sudo().search([('event_id','=',int(request.session['event_id'])),('partner_id','=',int(request.session['partner_id']))],limit=1)
         data['already_registered']=True
         data['payment_status']=res.payment_status
 
@@ -764,9 +758,6 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
             bd=post.get('birthday_date').split('/'
             )            
             partner.birthday_date=bd[2]+'-'+bd[1]+'-'+bd[0]
-        
-
-
         return http.request.render('kalachakra.registration_step2',data)
 
     @http.route(['/kalachakra/onthespotpayment'], type='http', auth='public', website=True, sitemap=False,csrf=False)
@@ -1253,4 +1244,4 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
         
         return request.render("kalachakra.thankyou")
         
-        
+