Merge branch '1887-add-shares-in-envelops' into 'dev_cooperatic'

add payments & shares in envelops

See merge request !123

envelops/models.py

@@ -43,13 +43,32 @@ class CagetteEnvelops(models.Model):
 
         try:
             # Get invoice
-            cond = [['partner_id', '=', data['partner_id']]]
+
+            # Get specific invoice if id is given
+            if 'invoice_id' in data:
+                cond = [['id', '=', data['invoice_id']], ["number", "!=", False]]
+            else:
+                cond = [['partner_id', '=', data['partner_id']], ["number", "!=", False]]
+
             fields = ['id', 'name', 'number', 'partner_id', 'residual_signed']
             invoice_res = self.o_api.search_read('account.invoice', cond, fields)
 
             # Check if invoice exists
             if len(invoice_res) > 0:
-                invoice = invoice_res[0]
+                invoice = None
+                # Get first invoice for which amount being paid <= amount left to pay in invoice 
+                for invoice_item in invoice_res:
+                    if int(float(data['amount']) * 100) <= int(float(invoice_item['residual_signed']) * 100):
+                        invoice = invoice_ite
+
+                if invoice is None:
+                    res['error'] = 'The amount is too high for the invoices found for this partner.'
+                    try:
+                        # Got an error while logging...
+                        coop_logger.error(res['error'] + ' : %s', str(data))
+                    except Exception as e:
+                        print(str(e))
+                    return res
             else:
                 res['error'] = 'No invoice found for this partner, can\'t create payment.'
                 coop_logger.error(res['error'] + ' : %s', str(data))
@@ -79,6 +98,7 @@ class CagetteEnvelops(models.Model):
             except Exception as e:
                 res['error'] = repr(e)
                 coop_logger.error(res['error'] + ' : %s', str(args))
+
             # Exception rises when odoo method returns nothing
             marshal_none_error = 'cannot marshal None unless allow_none is enabled'
             try:
@@ -102,7 +122,6 @@ class CagetteEnvelops(models.Model):
             coop_logger.error(res['error'] + ' : %s', str(data))
 
         if not ('error' in res):
-
             res['done'] = True
             res['payment_id'] = payment_id
 

envelops/static/css/envelops.css

@@ -2,6 +2,12 @@
   margin-top: 15px;
 }
 
+#admin_connexion_button {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+}
+
 .envelop_section {
   margin-bottom: 10px;
 }
@@ -10,16 +16,21 @@
   display: none;
   cursor: pointer;
   margin-bottom: 15px;
+  width: 25%;
 }
 
 #cash_envelops, #ch_envelops, #archive_cash_envelops, #archive_ch_envelops {
   margin-top: 30px;
 }
 
-.update_envelop_button, .delete_envelop_button, .envelop_comment {
+.delete_envelop_button, .envelop_comment {
   margin: 0 0 15px 15px;
 }
 
+.update_envelop_button, .add_to_envelop_button {
+  margin: 0 0 15px 10px;
+}
+
 .envelop_content_list {
   margin: 20px 0 15px 0;
 }
@@ -53,18 +64,18 @@
   flex: 50% 1 0;
 }
 
-.line_partner_name_container {
+.update_envelop_line .line_partner_name_container {
   display: flex;
   justify-content: flex-start;
   align-items: center;
 }
 
-.line_partner_name {
+.update_envelop_line .line_partner_name {
   text-align: left;
   padding: 0 5px;
 }
 
-.line_partner_input_container {
+.update_envelop_line .line_partner_input_container {
   display: flex;
   align-items: center;
 }
@@ -80,6 +91,59 @@
   margin-bottom: 20px;
 }
 
+/* Add payments to envelop modal */
+
+.search_member_area {
+  margin: 20px 0;
+}
+
+.search_member_results_area {
+  margin: 20px 0;
+}
+
+.add_to_envelop_lines_area {
+  margin: 20px 0;
+}
+
+.add_to_envelop_lines {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin: 10px 0;
+}
+
+.add_to_envelop_line {
+  display: flex;
+  justify-content: center;
+  margin: 10px 0;
+}
+
+.add_to_envelop_line .partner_name_container {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.add_to_envelop_line .partner_input_container {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-left: 10px;
+  width: 300px;
+}
+
+.line_partner_amount_error {
+  display: none;
+  color: #d9534f;
+  font-style: italic;
+}
+
+.confirm_add_payment_details {
+  font-weight: bold;
+  margin: 0 3px;
+}
+
 /* Accordion style */
 /* Style the buttons that are used to open and close the accordion panel */
 .accordion {

envelops/views.py

@@ -40,6 +40,9 @@ def archive_envelop(request):
                     'type' : envelop['type']
                 }
 
+                if 'invoice_id' in envelop['envelop_content'][partner_id]:
+                    data['invoice_id'] = int(envelop['envelop_content'][partner_id]['invoice_id'])
+
                 res = m.save_payment(data)
             except Exception as e:
                 res = {
@@ -75,7 +78,7 @@ def archive_envelop(request):
                     coop_logger.error("Cannot attach payment error message to member : %s",  str(e))
 
     try:
-        # archive envelop from couchdb
+        # archive envelop in couchdb
         res_envelop = m.archive_envelop(envelop)
     except Exception as e:
         res_envelop = "error"

members/models.py

@@ -26,6 +26,9 @@ class CagetteMember(models.Model):
                         'display_ftop_points', 'display_std_points',
                         'is_exempted', 'cooperative_state', 'date_alert_stop']
 
+    m_shoft_default_fields = ['name', 'barcode_base', 'total_partner_owned_share',
+                      'amount_subscription']
+
     def __init__(self, id):
         """Init with odoo id."""
         self.id = int(id)
@@ -718,7 +721,7 @@ class CagetteMember(models.Model):
         return m_list
 
     @staticmethod
-    def search(k_type, key, shift_id=None):
+    def search(k_type, key, shift_id=None, search_type="full"):
         """Search member according 3 types of key."""
         api = OdooAPI()
         if k_type == 'id':
@@ -733,44 +736,49 @@ class CagetteMember(models.Model):
         cond.append(['is_member', '=', True])
         cond.append(['is_associated_people', '=', True])
         # cond.append(['cooperative_state', '!=', 'unsubscribed'])
-        fields = CagetteMember.m_default_fields
-        if not shift_id is None:
-            CagetteMember.m_default_fields.append('tmpl_reg_line_ids')
-        res = api.search_read('res.partner', cond, fields)
-        members = []
-        if len(res) > 0:
-            for m in res:
-                keep_it = False
-                if not shift_id is None and len(shift_id) > 0:
-                    # Only member registred to shift_id will be returned
-                    if len(m['tmpl_reg_line_ids']) > 0:
-                        cond = [['id', '=', m['tmpl_reg_line_ids'][0]]]
-                        fields = ['shift_template_id']
-                        shift_templ_res = api.search_read('shift.template.registration.line', cond, fields)
-                        if (len(shift_templ_res) > 0
-                            and
-                            int(shift_templ_res[0]['shift_template_id'][0]) == int(shift_id)):
-                            keep_it = True
-                else:
-                    keep_it = True
-                if keep_it is True:
-                    try:
-                        img_code = base64.b64decode(m['image_medium'])
-                        extension = imghdr.what('', img_code)
-                        m['image_extension'] = extension
-                    except Exception as e:
-                        coop_logger.info("Img error : %s", e)
-                    m['state'] = m['cooperative_state']
-                    m['cooperative_state'] = \
-                        CagetteMember.get_state_fr(m['cooperative_state'])
-                    # member = CagetteMember(m['id'], m['email'])
-                    # m['next_shifts'] = member.get_next_shift()
-                    if not m['parent_name'] is False:
-                        m['name'] += ' (en binôme avec ' + m['parent_name'] + ')'
-                        del m['parent_name']
-                    members.append(m)
-
-        return CagetteMember.add_next_shifts_to_members(members)
+        if search_type == "full":
+            fields = CagetteMember.m_default_fields
+            if not shift_id is None:
+                CagetteMember.m_default_fields.append('tmpl_reg_line_ids')
+            res = api.search_read('res.partner', cond, fields)
+            members = []
+            if len(res) > 0:
+                for m in res:
+                    keep_it = False
+                    if not shift_id is None and len(shift_id) > 0:
+                        # Only member registred to shift_id will be returned
+                        if len(m['tmpl_reg_line_ids']) > 0:
+                            cond = [['id', '=', m['tmpl_reg_line_ids'][0]]]
+                            fields = ['shift_template_id']
+                            shift_templ_res = api.search_read('shift.template.registration.line', cond, fields)
+                            if (len(shift_templ_res) > 0
+                                and
+                                int(shift_templ_res[0]['shift_template_id'][0]) == int(shift_id)):
+                                keep_it = True
+                    else:
+                        keep_it = True
+                    if keep_it is True:
+                        try:
+                            img_code = base64.b64decode(m['image_medium'])
+                            extension = imghdr.what('', img_code)
+                            m['image_extension'] = extension
+                        except Exception as e:
+                            coop_logger.info("Img error : %s", e)
+                        m['state'] = m['cooperative_state']
+                        m['cooperative_state'] = \
+                            CagetteMember.get_state_fr(m['cooperative_state'])
+                        # member = CagetteMember(m['id'], m['email'])
+                        # m['next_shifts'] = member.get_next_shift()
+                        if not m['parent_name'] is False:
+                            m['name'] += ' (en binôme avec ' + m['parent_name'] + ')'
+                            del m['parent_name']
+                        members.append(m)
+
+            return CagetteMember.add_next_shifts_to_members(members)
+        else:
+            fields = CagetteMember.m_shoft_default_fields
+            res = api.search_read('res.partner', cond, fields)
+            return res
 
     @staticmethod
     def remove_data_from_CouchDB(request):

members/urls.py

@@ -35,6 +35,7 @@ urlpatterns = [
     url(r'^menu/$', views.menu),
     url(r'^verify_final_state$', views.verify_final_state),
     url(r'^update_couchdb_barcodes$', views.update_couchdb_barcodes),
+    url(r'^add_shares_to_member$', views.add_shares_to_member),
     #  Borne accueil
     url(r'^search/([^\/.]+)/?([0-9]*)', views.search),
     url(r'^save_photo/([0-9]+)$', views.save_photo, name='save_photo'),

members/views.py

@@ -8,7 +8,7 @@ from members.models import CagetteMembers
 from members.models import CagetteServices
 from outils.forms import GenericExportMonthForm
 
-
+import datetime
 
 default_fields = ['name',
                   'image_medium']
@@ -237,6 +237,8 @@ def update_couchdb_barcodes(request):
 
 def search(request, needle, shift_id):
     """Search member has been requested."""
+    search_type = request.GET.get('search_type', '')
+
     try:
         key = int(needle)
         k_type = 'barcode_base'
@@ -247,7 +249,7 @@ def search(request, needle, shift_id):
         key = needle
         k_type = 'name'
 
-    res = CagetteMember.search(k_type, key, shift_id)
+    res = CagetteMember.search(k_type, key, shift_id, search_type)
     return JsonResponse({'res': res})
 
 
@@ -391,6 +393,21 @@ def panel_get_purchases(request):
             response = HttpResponse(message)
     return response
 
+def add_shares_to_member(request):
+    res = {}
+    try:
+        data = json.loads(request.body.decode())
+        partner_id = int(data["partner_id"])
+        amount = int(data["amount"])
+        
+    except Exception as e:
+        res['error'] = "Wrong params"
+        return JsonResponse(res, safe=False, status=400)
+
+    m = CagetteMember(partner_id)
+    today = datetime.date.today().strftime("%Y-%m-%d")
+    res = m.create_capital_subscription_invoice(amount, today)
+    return JsonResponse(res, safe=False)
 
 # # #  BDM # # #
 def save_partner_info(request):

outils/scripts/scripts_settings_example.py

 SECRET_KEY = 'Mettre_plein_de_caracteres_aleatoires_iezezezeezezci'
 
 ODOO = {
-    'url': 'http://127.0.0.1:8069'
+    'url': 'http://127.0.0.1:8069',
     'user': 'api',
     'passwd': 'xxxxxxxxxxxx',
     'db': 'bd_test',

outils/static/js/all_common.js

@@ -175,8 +175,8 @@ String.prototype.pad = function(String, len) {
 
 
 var btns = $('<div/>').addClass('btns');
-var btn_ok = $('<button/>').addClass('btn--success');
-var btn_nok = $('<button/>').addClass('btn--danger')
+var btn_ok = $('<button/>').addClass('btn--success btn-modal-ok');
+var btn_nok = $('<button/>').addClass('btn--danger btn-modal-nok')
     .attr('id', 'modal_closebtn_bottom')
     .text('Fermer');
 

templates/envelops/index.html

@@ -9,9 +9,11 @@
 {% endblock %}
 
 {% block content %}
-{%if must_identify %}
-  {% include "common/conn_admin.html" %}
-{%endif%}
+<div id="admin_connexion_button">
+  {%if must_identify %}
+    {% include "common/conn_admin.html" %}
+  {%endif%}
+</div>
 <div id="envelop_cashing_error" class="alert--danger clearfix custom_alert" onClick="toggle_error_alert()">
     <div style="width: 90%" class="fl txtleft" id="error_alert_txt"></div>
     <div style="width: 10%" class="fr txtright"><i class="fas fa-times"></i></div>
@@ -80,13 +82,74 @@
       <div class="deleted_line_through"></div>
     </div>
   </div>
+
+  <div id="modal_add_to_envelop">
+    <div class="modal_add_to_envelop_content">
+      <h3>Ajouter un paiement ou des parts sociales</h3>
+      <h4><i class="envelop_name"></i></h4>
+      <hr>
+      <div class="search_member_area">
+        <h4>Rechercher un membre</h4>
+        <form class="search_member_form" action="javascript:;" method="post">
+          <input type="text" class="search_member_input" value="" placeholder="Nom ou numéro du coop..." required>
+          <button type="submit" class="btn--primary" class="search_member_button">Recherche</button>
+        </form>
+      </div>
+      <div class="search_member_results_area" style="display:none;">
+        <div class="search_results_text">
+          <p><i>Choisissez parmi les membres trouvés :</i></p>
+        </div>
+        <div class="search_member_results"></div>
+      </div>
+      <div class="add_to_envelop_lines_area" style="display:none;">
+        <div class="add_to_envelop_lines">
+        </div>
+        <div class="validation_buttons">
+          <button class="btn--primary add_payment_button">Ajouter le paiement à l'enveloppe</button>
+          <button class="btn--primary add_shares_button">Ajouter des parts sociales </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="add_to_envelop_line_template">
+    <div class="add_to_envelop_line">
+      <div class="partner_name_container">
+        <span class="line_partner_name"></span>
+      </div>
+      <div class="partner_input_container">
+        <input type="text" class="line_partner_amount" placeholder="Montant">
+        <div class="line_partner_amount_error">Le montant doit être un nombre entier.</div>
+      </div>
+    </div>
+  </div>
+
+  <div id="modal_confirm_add_payment">
+    <p>
+      Vous vous apprêtez à ajouter un paiement de <span class="confirm_add_payment_details amount"></span>€
+      du membre <span class="confirm_add_payment_details member"></span>
+      à l'enveloppe <span class="confirm_add_payment_details envelop"></span>.
+    </p>
+    <p><i>
+      <i class="fas fa-exclamation-triangle"></i> Avertissement si ce.tte membre a plusieurs factures d'ouvertes.<br/>
+      Au moment de l'encaissement de l'enveloppe, ce paiement sera lié à la plus vieille facture ouverte de ce membre.
+    </i></p>
+  </div>
+
+  <div id="modal_confirm_add_shares">
+    <p>
+      Vous vous apprêtez à ajouter pour <span class="confirm_add_payment_details amount"></span>€ de parts sociales
+      au membre <span class="confirm_add_payment_details member"></span>.
+    </p>
+    <p>
+      Le paiement sera ajouté à l'enveloppe <span class="confirm_add_payment_details envelop"></span>.
+    </p>
+  </div>
 </div>
 
 <script src="{% static "js/pouchdb.min.js" %}"></script>
 <script type="text/javascript">
-        {%if must_identify %}
-        var must_identify = true
-        {%endif%}
+        var must_identify = '{{must_identify}}';
         var couchdb_dbname = '{{db}}';
         var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
         var dbc = new PouchDB(couchdb_dbname);