block extension if member can't have it

members_space/static/js/members-space-home.js

@@ -44,7 +44,7 @@ function request_delay() {
                         && data.responseJSON.message === "delays limit reached") {
                     closeModal();
                     alert("Vous avez mis plus de 6 mois pour rattraper un service, " +
-                            "vous ne pouvez plus sélectionner de rattrapage depuis l'espace membre. " +
+                            "vous ne pouvez plus rien faire depuis l'espace membre. " +
                             "Merci de contacter le BDM.");
                 } else {
                     err = {msg: "erreur serveur lors de la création du délai", ctx: 'request_delay'};

members_space/static/js/members-space.js

@@ -165,7 +165,11 @@ function init_my_info_data() {
             });
     }
 
-    if (partner_data.makeups_to_do > 0 && partner_data.is_associated_people === "False") {
+    if (
+        partner_data.makeups_to_do > 0
+        && partner_data.is_associated_people === "False"
+        && partner_data.cooperative_state !== 'unsubscribed'
+    ) {
         $(".choose_makeups").show();
 
         if (

shifts/views.py

@@ -267,13 +267,12 @@ def request_delay(request):
         if Verification.verif_token(request.POST.get('verif_token'), int(request.POST.get('idPartner'))) is True:
             cs = CagetteShift()
 
-            # TODO do we need this?
-            # use_new_members_space = getattr(settings, 'USE_NEW_MEMBERS_SPACE', False) 
-            # if use_new_members_space is True:
-            #     member_can_have_delay = cs.member_can_have_delay(int(request.POST.get('idPartner')))
-            #     if member_can_have_delay is False:
-            #         res = { 'message' : 'delays limit reached'}
-            #         return JsonResponse(res, status=403)
+            use_new_members_space = getattr(settings, 'USE_NEW_MEMBERS_SPACE', False) 
+            if use_new_members_space is True:
+                member_can_have_delay = cs.member_can_have_delay(int(request.POST.get('idPartner')))
+                if member_can_have_delay is False:
+                    res = { 'message' : 'delays limit reached'}
+                    return JsonResponse(res, status=403)
             
             data = {
                 "idPartner": int(request.POST['idPartner']),