From 90adef7e53758903d4faed123394aad2a22e107b Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Sun, 15 Jan 2023 20:30:47 +0100
Subject: [PATCH] corrections

---
 models/event.py                      | 88 ++++++++++++----------------
 views/booking_event_registration.xml |  1 +
 views/event.xml                      |  2 +
 views/website_event_registration.xml |  2 +
 4 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/models/event.py b/models/event.py
index 1187d12..76e1d09 100755
--- a/models/event.py
+++ b/models/event.py
@@ -71,6 +71,7 @@ class KalachakraEvent(models.Model):
     find_out_more_link=fields.Char('Find out more link')
     city=fields.Char('city', related="address_id.city")
     no_online_payment=fields.Boolean('no online payment')
+    no_onthespot_payment=fields.Boolean('no on the spot payment')
 
     @api.depends('seats_unconfirmed', 'seats_reserved', 'seats_used')
     def _compute_seats_expected(self):
@@ -145,21 +146,12 @@ class KalachakraEvent(models.Model):
                 child_event.cover_properties=self.cover_properties
                 child_event.tag_ids=self.tag_ids
                 child_event.description=self.description
-                #child_event.is_published=self.is_published
                 child_event.participation_product_id=self.participation_product_id
                 child_event.participation_standard_price=self.participation_standard_price
                 child_event.participation_member_price=self.participation_member_price
                 child_event.participation_super_member_price=self.participation_super_member_price
 
-                #child_event.event_mail_ids=self.event_mail_ids
-
-            
-
-
-
-
-
-
+           
     def _compute_generated_events(self):
         for rec in self:
             rec.generated_events=False
@@ -193,73 +185,67 @@ class KalachakraEvent(models.Model):
 
 
     def generate_events(self):
-        for rec in self:
-            if rec.duration>1 :raise Warning('action cancelled: the duration f the event is more than 1 days !')
+        
+            if self.duration>1 :raise Warning('action cancelled: the duration f the event is more than 1 days !')
             
-            if rec.end_generation_date<datetime.now() :raise Warning('action cancelled: the end generation date must be in the future !')
-            delta=rec.end_generation_date-rec.date_begin
+            if self.end_generation_date<datetime.now() :raise Warning('action cancelled: the end generation date must be in the future !')
+            delta=self.end_generation_date-self.date_begin
             if delta.days>200:raise Warning('action cancelled: the duration f the event is more than 6 months !')
 
-            if rec.frequency=='daily':d=1
+            if self.frequency=='daily':d=1
                                 
-            if rec.frequency=='weekly':d=7
+            if self.frequency=='weekly':d=7
             
-            start_date_event=rec.date_begin+timedelta(days=d)
-            end_date_event=rec.date_end+timedelta(days=d)
-
-            while start_date_event<=rec.end_generation_date:
+            start_date_event=self.date_begin+timedelta(days=d)
+            end_date_event=self.date_end+timedelta(days=d)
+            i=1
+            while start_date_event<=self.end_generation_date:
                
                 if not start_date_event.weekday() in (5,6):
                     #avant de dupliquer l'événement on regarde si celui-ci n'a pas déjà été crée !
                     evt=self.env['event.event'].search([('date_begin','=',start_date_event),('parent_event_id','=', int(self.id))])
                     if evt: raise Warning('action cancelled: event already generated with this  date :'+ str(start_date_event))
-
-                    dup=self._create_event(rec,start_date_event,end_date_event)
+                    
+                    dup=self._create_event(start_date_event,end_date_event)
                     
                     dup.add_event_to_google_agenda()
 
                 end_date_event=end_date_event+timedelta(days=d)
                 start_date_event=start_date_event+timedelta(days=d)
-        
+            i=i+1
             
 
 
 
 
-    def _create_event(self,rec,start_date_event,end_date_event):
+    def _create_event(self,start_date_event,end_date_event):
         vals={}
-        vals['name']=rec.name
+        vals['name']=self.name
         vals['date_begin']=start_date_event
         vals['date_end']=end_date_event
-        vals['description']=rec.description
-        vals['tag_ids']=rec.tag_ids
-        vals['event_mail_ids']=rec.event_mail_ids
-        vals['event_logo']=rec.event_logo
+        vals['description']=self.description
+        vals['tag_ids']=self.tag_ids
+        vals['event_mail_ids']=self.event_mail_ids
+        vals['event_logo']=self.event_logo
         vals['is_published']=True
-        vals['free_participation']=rec.free_participation
-        vals['participation_product_id']=int(rec.participation_product_id)
-        vals['participation_standard_price']=rec.participation_standard_price
-        vals['participation_member_price']=rec.participation_member_price
-        vals['participation_super_member_price']=rec.participation_super_member_price
-        vals['subscription_product_id']=int(rec.subscription_product_id)
-        # vals['subscription_standard_price']=rec.subscription_standard_price
-        # vals['subscription_member_price']=rec.subscription_member_price
-        # vals['subscription_super_member_price']=rec.subscription_super_member_price
-        vals['recurring_event']=rec.recurring_event
-        vals['recurring_event_newsletter_id']=int(rec.recurring_event_newsletter_id)
-        vals['online_event']=rec.online_event
-        vals['online_link']=rec.online_link
-        vals['online_id']=rec.online_id
-        vals['no_online_payment']=rec.no_online_payment
-        vals['online_password']=rec.online_password
-        vals['parent_event_id']=int(rec.id)
-        vals['cover_properties']=rec.cover_properties
-        
+        vals['free_participation']=self.free_participation
+        vals['participation_product_id']=int(self.participation_product_id)
+        vals['participation_standard_price']=self.participation_standard_price
+        vals['participation_member_price']=self.participation_member_price
+        vals['participation_super_member_price']=self.participation_super_member_price
+        vals['subscription_product_id']=int(self.subscription_product_id)
+        vals['recurring_event']=self.recurring_event
+        vals['recurring_event_newsletter_id']=int(self.recurring_event_newsletter_id)
+        vals['online_event']=self.online_event
+        vals['online_link']=self.online_link
+        vals['online_id']=self.online_id
+        vals['no_online_payment']=self.no_online_payment
+        vals['online_password']=self.online_password
+        vals['parent_event_id']=int(self.id)
+        vals['cover_properties']=self.cover_properties
         
         ev=self.env['event.event'].create(vals)
-        
-
-
+       
         return ev
 
     def _compute_duration(self):
diff --git a/views/booking_event_registration.xml b/views/booking_event_registration.xml
index 7d690e2..ba7743e 100755
--- a/views/booking_event_registration.xml
+++ b/views/booking_event_registration.xml
@@ -240,6 +240,7 @@
         <field name="inherit_id" ref="event.view_event_registration_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
+            <field name="firstname"  invisible="context.get('booking_view')==False"/>
             <field name="gender"  invisible="context.get('booking_view')==False"/>
             </xpath>
             <xpath expr="//field[@name='event_ticket_id']" position="replace">
diff --git a/views/event.xml b/views/event.xml
index afb6cb5..f1e4a43 100755
--- a/views/event.xml
+++ b/views/event.xml
@@ -53,6 +53,7 @@
                 
                 <field name="online_event" invisible="context.get('booking_event_view')"/>
                 <field name="onthespot_event" invisible="context.get('booking_event_view')"/>
+               
                 <field name="free_participation" invisible="context.get('booking_event_view')"/>
                 <field name="participation_product_id" invisible="context.get('booking_event_view')"/>
                 <field name="recurring_event" invisible="context.get('booking_event_view')"/>
@@ -152,6 +153,7 @@
                         
                     <field name="online_event" attrs="{'invisible':[('booking_event','=',True)]}"/>
                     <field name="no_online_payment" attrs="{'invisible':[('booking_event','=',True)]}"/>
+                    <field name="no_onthespot_payment" invisible="context.get('booking_event_view')"/>
                     <field name="online_only" attrs="{'invisible':[('booking_event','=',True)]}"/>
                     <field name="free_participation" attrs="{'invisible':[('booking_event','=',True)]}"/>
                     <field name="recurring_event" attrs="{'invisible':[('booking_event','=',True)]}"/>
diff --git a/views/website_event_registration.xml b/views/website_event_registration.xml
index 61e75e6..c530e4a 100755
--- a/views/website_event_registration.xml
+++ b/views/website_event_registration.xml
@@ -184,10 +184,12 @@
                                   <br></br>
                                 </t>
                                 <t t-if="not online">
+                                <t t-if="not event.no_onthespot_payment">
                                 <h7>If you want pay on the spot, click here : </h7><button type="submit" id="pay_on_the_spot_btn" class="btn btn-primary" >I will pay the participation on the spot</button>
                                 <br></br>
                                 <br></br>
                                 </t>
+                                </t>
                             </t>
                       </t>
                     <br></br>