From 846fce4eff72a9e22506f4a58f980aa438f1eef5 Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Fri, 24 Jun 2022 09:59:02 +0200
Subject: [PATCH] adhesion soutien

---
 controllers/kalachakra.py            | 10 ++++++++++
 models/event.py                      |  1 +
 static/js/kalachakra.js              |  6 ++++++
 views/event.xml                      |  2 +-
 views/event_templates_list.xml       |  7 ++++++-
 views/website_event_registration.xml | 12 ++++++------
 views/website_participation.xml      | 24 ++++++++++++++++++++++++
 7 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py
index 3fe9356..ff6a2f7 100644
--- a/controllers/kalachakra.py
+++ b/controllers/kalachakra.py
@@ -345,7 +345,17 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
             
             #membership product
             data['products']=p
+        
+        if type=='super_membership':
+            request.session['kalachakra_transaction']='super_membership'
+            data['kalachakra_transaction']='super_membership'
+            data['title']='Become a super member'
+            p=request.env['product.product'].sudo().search([('super_membership_product','=',True)],limit=1)
+            if not p: raise UserError(_('No membership product, please add one'))
+            data['amount']=p.list_price
             
+            #super membership product
+            data['products']=p
             
         
         userid=request.env.context.get('uid')
diff --git a/models/event.py b/models/event.py
index 99717c7..e6cc2a7 100644
--- a/models/event.py
+++ b/models/event.py
@@ -53,6 +53,7 @@ class KalachakraEvent(models.Model):
     recurring_event=fields.Boolean('Recurring event')
     recurring_event_newsletter_id=fields.Many2one('mailing.list',string='Recurring event Newsletter')
     online_event=fields.Boolean('Online event')
+    onthespot_event=fields.Boolean('Online event')
     online_link=fields.Char('link')
     online_id=fields.Char('id')
     online_password=fields.Char('password')
diff --git a/static/js/kalachakra.js b/static/js/kalachakra.js
index 3f7e4f0..49fd295 100644
--- a/static/js/kalachakra.js
+++ b/static/js/kalachakra.js
@@ -31,6 +31,12 @@ odoo.define('kalachakra.main', function (require) {
         $( "#form" ).submit();
     });
 
+    $( "#make_donation_btn" ).click(function() {
+        
+        $('#form').attr('action', '/kalachakra/participation?type=donation');
+        $( "#form" ).submit();
+    });
+
 
     $( "#pay_on_the_spot_btn" ).click(function() {
 
diff --git a/views/event.xml b/views/event.xml
index 85d87b5..d494f8a 100644
--- a/views/event.xml
+++ b/views/event.xml
@@ -82,7 +82,7 @@
                 
                 <field name="online_link" attrs="{'required': [('online_event','=', True)]}"/>
                 <field name="online_id"/>
-                <field name="online_password" attrs="{'required': [('online_event','=', True)]}"/>
+                <field name="online_password"/>
                 
                 </group>
                 </page>
diff --git a/views/event_templates_list.xml b/views/event_templates_list.xml
index 381c443..0d15f45 100644
--- a/views/event_templates_list.xml
+++ b/views/event_templates_list.xml
@@ -49,7 +49,12 @@
 
 
 <template id="kalachakra.events_list" inherit_id="website_event.events_list">
-    
+    <xpath expr="//h5[1]" position="replace">
+    <h5 t-attf-class="card-title mt-2 mb-0  #{(not event.website_published) and 'text-danger'}">
+                                <span t-field="event.name" itemprop="name"/>
+                            </h5>
+
+    </xpath>
     <xpath expr="//time[@itemprop='startDate']" position="after">
 
     <t t-if="event.booking_event">
diff --git a/views/website_event_registration.xml b/views/website_event_registration.xml
index a8c1ac0..8fb1903 100644
--- a/views/website_event_registration.xml
+++ b/views/website_event_registration.xml
@@ -18,10 +18,10 @@
         <b><h7 style="display: inline">Registering to : </h7><h7 style="display: inline" t-esc="event.name"></h7></b>
         <br></br>
         <t t-if="event.duration==0">
-        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy hh:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "hh:mm"}'/> </h7>
+        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "HH:mm"}'/> </h7>
         </t>
         <t t-if="event.duration>0">
-        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy hh:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "dd/MM/yyyy hh:mm"}'/> </h7>
+        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> </h7>
         </t>
         <br></br>
         <h7> Your status : 
@@ -87,7 +87,7 @@
         <b><h7 style="display: inline">Registering to : </h7><h7 style="display: inline" t-esc="event.name"></h7></b>
         <br></br>
         <t t-if="event.duration==0">
-        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy hh:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "hh:mm"}'/> </h7>
+        <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "HH:mm"}'/> </h7>
         </t>
         <t t-if="event.duration>0">
         <h7>From <span t-field="event.date_begin" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> to <span t-field="event.date_end" t-options='{"format": "dd/MM/yyyy HH:mm"}'/> </h7>
@@ -107,7 +107,7 @@
         <h7>You will soon receive a confirmation email.</h7>
         </t>
         <t t-if="already_registered">
-        <h7>You are already registered</h7>
+        <h7><b>You are already registered</b></h7>
             <t t-if="payment_status=='paid'">
             <br></br>
             <h7>You have already paid</h7>
@@ -138,7 +138,7 @@
             <h7> The participation is free.</h7>
             <br></br>
             <br></br>
-            <h7>If you want to make a donation, click here : </h7><button type="submit" class="btn btn-primary" >Make a donation</button>
+            <h7>If you want to make a donation, click here : </h7><button id="make_donation_btn" type="submit" class="btn btn-primary" >Make a donation</button>
           <br></br>
           <br></br>
          
@@ -165,7 +165,7 @@
                                 <br></br>
                                 
                                 <t t-if="partner.member_status=='not member'">
-                                  <h7> If you want to become a member for one year and pay the participation,</h7>
+                                  <h7> If you want to become a member for one year and pay the participation, </h7>
                                   <br></br>
                                   <h7>the amount is : </h7><b><h7 t-esc="membership_and_participation_amount"></h7><h7> €</h7></b>
                                   <br></br>
diff --git a/views/website_participation.xml b/views/website_participation.xml
index 92ca557..a9ca3e3 100644
--- a/views/website_participation.xml
+++ b/views/website_participation.xml
@@ -20,6 +20,13 @@
                  </t>
                 <t t-if="title=='Become a member'">      
                  <h6 class="o_page_header mt16 mb4">Become a member :</h6>
+                 
+                 </t>
+                 <t t-if="title=='Become a super member'">      
+                 <h6 class="o_page_header mt16 mb4">Become a  super member :</h6>
+                 <h6>Free access to lessons in Paris (except visits
+events where membership participation will be applied)<br></br>and
+reduced participation for pensions in the Sarthe.</h6>
                  </t>
 
                 <div id="div_email" class="form-group  col-lg-4">
@@ -131,6 +138,23 @@
                         <t t-if="kalachakra_transaction=='membership'">
                         <input type="number" id="amount_id" name="amount"  readonly="readonly"  class="form-control " t-att-value="amount"/>
                         </t>
+                        <t t-if="kalachakra_transaction=='super_membership'">
+                        
+                            <div class="btn-group btn-group-justified" role="group">
+                            <button type="button" class="list-group-item">40 €</button>
+                            <button type="button" class="list-group-item">60 €</button>
+                            <button type="button" class="list-group-item">80 €</button>
+                            <button type="button" class="list-group-item">100 €</button>
+                            <button type="button" id="btn_autre" class="list-group-item">More</button>
+                            
+                            
+                        </div>
+                        <br></br>
+                        <br></br>
+                        <div class="col-lg-3 col-md-3">
+                        <input type="number" id="amount_id" name="amount"   class="form-control " t-att-value="amount"/>
+                        </div>
+                        </t>
 
         </div>