Merge branch 'dev_cooperatic' into 2253-new-binome

envelops/models.py

@@ -59,7 +59,7 @@ class CagetteEnvelops(models.Model):
                 # 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
+                        invoice = invoice_item
 
                 if invoice is None:
                     res['error'] = 'The amount is too high for the invoices found for this partner.'

members/static/js/admin/bdm_index.js

@@ -4,7 +4,7 @@ $(document).ready(function() {
 
         $(".page_content").show();
 
-        let location = window.location.href;
+        let location = window.location.href.replace(/\/$/, '');
 
         $('.management_type_button').on('click', function() {
             if (this.id == 'manage_makeups_button') {

members/urls.py

@@ -55,7 +55,7 @@ urlpatterns = [
     url(r'^save_partner_info$', views.save_partner_info),
 
     # BDM - members admin
-    url(r'^admin$', admin.admin),
+    url(r'^admin/?$', admin.admin),
     url(r'^admin/manage_makeups$', admin.manage_makeups),
     url(r'^admin/manage_shift_registrations$', admin.manage_shift_registrations),
     url(r'^get_makeups_members$', admin.get_makeups_members),

members_space/static/js/members-space-shifts-exchange.js

@@ -20,7 +20,7 @@ function can_exchange_shifts() {
  * @returns boolean
  */
 function should_select_makeup() {
-    return partner_data.makeups_to_do == 0 && (partner_data.is_associated_people === "False" || (partner_data.is_associated_people === "True" && block_actions_for_attached_people === "False"));
+    return partner_data.makeups_to_do > 0 || (partner_data.makeups_to_do > 0 && partner_data.is_associated_people === "True" &&  block_actions_for_attached_people === "False");
 }
 
 /**
@@ -175,7 +175,7 @@ function init_shifts_list() {
             if (partner_data.associated_partner_id === "False" && partner_data.parent_id === "False") {
                 shift_line_template.find('.affect_associate_registered').hide();
             } else {
-                shift_line_template.find('.affect_associate_registered').attr('id', 'shidt_id_'+shift.id);
+                shift_line_template.find('.affect_associate_registered').attr('id', 'shift_id_'+shift.id);
                 if (shift.associate_registered==="both") {
                     shift_line_template.find('.affect_associate_registered').text("Les deux");
                 } else if (shift.associate_registered==="partner") {
@@ -237,7 +237,7 @@ function init_shifts_list() {
                 modal_template.find("#shift_associate").text(partner_data.associated_partner_name);
 
             } else {
-                modal_template.find("#shift_partner").text(partner_data.associated_partner_name);
+                modal_template.find("#shift_partner").text(partner_data.name);
                 modal_template.find("#shift_associate").text(partner_data.parent_name);
             }
 

shifts/models.py

@@ -178,20 +178,30 @@ class CagetteShift(models.Model):
     def affect_shift(self, data):
         """Affect shift to partner, his associate or both"""
         response = None
-        cond = [['partner_id', '=', int(data['idPartner'])],
-                ['id', '=', int(data['idShiftRegistration'])]]
-        fields = ['id']
-        try:
-            print(cond)
-            shit_to_affect = self.o_api.search_read('shift.registration', cond, fields, 1)
-            print(shit_to_affect)
-            if (len(shit_to_affect) == 1):
-                shift_res = shit_to_affect[0]
-                print(shift_res)
-                fieldsDatas = { "associate_registered":data['affected_partner']}
-                response = self.o_api.update('shift.registration', [shift_res['id']],  fieldsDatas)
-        except Exception as e:
-            coop_logger.error("Reopen shift : %s", str(e))
+        # partner_id can be 'associated_people' one, which is never use as shift partner_id reference
+        # So, let's first retrieved data about the res.partner involved
+        cond = [['id', '=', int(data['idPartner'])]]
+        fields = ['parent_id']
+        partner = self.o_api.search_read('res.partner', cond, fields, 1)
+        if partner:
+            if partner[0]['parent_id']:
+                partner_id = partner[0]['parent_id'][0]
+            else:
+                partner_id = int(data['idPartner'])
+            cond = [['partner_id', '=', partner_id],
+                    ['id', '=', int(data['idShiftRegistration'])]]
+            fields = ['id']
+            try:
+                # make sure there is coherence between shift.registration id and partner_id (to avoid forged request)
+                shit_to_affect = self.o_api.search_read('shift.registration', cond, fields, 1)
+                if (len(shit_to_affect) == 1):
+                    shift_res = shit_to_affect[0]
+                    fieldsDatas = { "associate_registered":data['affected_partner']}
+                    response = self.o_api.update('shift.registration', [shift_res['id']],  fieldsDatas)
+            except Exception as e:
+                coop_logger.error("Model affect shift : %s", str(e))
+        else:
+            coop_logger.error("Model affect shift nobody found : %s", str(cond))
         return response
 
     def cancel_shift(self, idsRegisteur):

shifts/views.py

@@ -239,11 +239,14 @@ def affect_shift(request):
         if Verification.verif_token(request.POST.get('verif_token'), int(request.POST.get('idPartner'))) is True:
             cs = CagetteShift()
             if 'idShiftRegistration' in request.POST and 'affected_partner' in request.POST:
+                #  if request is made by associated people, idPartner is it's id, not "master" res.partner
+                #  it's will be handled in model's method (affect_shift)
                 data = {
                     "idPartner": int(request.POST['idPartner']),
                     "idShiftRegistration": int(request.POST['idShiftRegistration']),
                     "affected_partner": request.POST['affected_partner'],
                 }
+                st_r_id = None
                 try:
                     st_r_id = cs.affect_shift(data)
                 except Exception as e:

templates/members/admin/index.html

@@ -22,7 +22,7 @@
 
         <div class="management_type_buttons txtcenter">
             <button type="button" class="btn--primary management_type_button" id="manage_makeups_button">
-                Gestion des rattragapes
+                Gestion des rattrapages
                 <span class="management_type_button_icons"><i class="fas fa-arrow-right"></i></span>
             </button><br>
             <button type="button" class="btn--primary management_type_button" id="manage_shift_registrations_button">