Add ability to make contribution optional

roodjong · May 19, 2024 · 978713d · 978713d
1 parent 66c8c1d
commit 978713d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/.env b/.env
@@ -58,6 +58,7 @@ ORG_LOGO='assets/image/logo.png'
 PRIVACY_POLICY_URL='https://roodjongeren.nl/privacybeleid/'
 LISTMONK_URL='https://listmonk.roodjongeren.nl/admin'
 USE_MIDDLE_NAME=true
+CONTRIBUTION_ENABLED=true
 
 # Set to https in production environment
 SECURE_SCHEME='http'
diff --git a/config/services.yaml b/config/services.yaml
@@ -14,6 +14,7 @@ parameters:
     app.privacyPolicyUrl: '%env(PRIVACY_POLICY_URL)%'
     app.listmonkUrl: '%env(string:LISTMONK_URL)%'
     app.useMiddleName: '%env(bool:USE_MIDDLE_NAME)%'
+    app.contributionEnabled: '%env(bool:CONTRIBUTION_ENABLED)%'
     router.request_context.scheme: '%env(SECURE_SCHEME)%'
     asset.request_context.secure: true
 

diff --git a/src/Controller/DocumentsController.php b/src/Controller/DocumentsController.php
@@ -30,6 +30,7 @@ public function documents(Request $requset, $folderId): Response {
             'choices' => $repoFolders->findAll(),
             'action' => $this->generateUrl('member_documents_move')
         ]);
+        $contributionEnabled = $this->getParameter('app.contributionEnabled');
 
         return $this->render('user/documents.html.twig', [
             'folders' => $folders,
@@ -43,7 +44,8 @@ public function documents(Request $requset, $folderId): Response {
 
             'uploadForm' => $uploadForm->createView(),
             'newFolderForm' => $newFolderForm->createView(),
-            'moveForm' => $moveForm->createView()
+            'moveForm' => $moveForm->createView(),
+	    'contributionEnabled' => $contributionEnabled,
         ]);
     }
 
@@ -93,7 +95,8 @@ public function createFolder(Request $request, $folderId): Response {
                 return $this->json(['status' => 'success', 'id' => $newFolder->getId()]);
             }
 
-            return $this->redirectToRoute('member_documents', ['folderId' => $newFolder->getId()]);
+            $contributionEnabled = $this->getParameter('app.contributionEnabled');
+            return $this->redirectToRoute('member_documents', ['folderId' => $newFolder->getId(), 'contributionEnabled' => $contributionEnabled]);
         }
 
         throw $this->createNotFoundException();
@@ -157,8 +160,10 @@ public function upload(Request $request, $folderId): Response {
                 ]);
             }
 
+            $contributionEnabled = $this->getParameter('app.contributionEnabled');
             return $this->redirectToRoute('member_documents', [
-                'folderId' => $folder ? $folder->getId() : ''
+                'folderId' => $folder ? $folder->getId() : '',
+		'contributionEnabled' => $contributionEnabled,
             ]);
         }
 

diff --git a/src/Controller/MemberController.php b/src/Controller/MemberController.php
@@ -37,6 +37,7 @@ public function memberAcceptPersonalDetails(Request $request): Response {
         $member = $this->getUser();
         $orgName = $this->getParameter('app.organizationName');
         $privacyPolicyUrl = $this->getParameter('app.privacyPolicyUrl');
+        $contributionEnabled = $this->getParameter('app.contributionEnabled');
         $form = $this->createFormBuilder($member)
             ->add('acceptUsePersonalInformation', null, [
                 'label' => "Ik ga ermee akkoord dat $orgName mijn persoonsgegevens opslaat in haar ledenadministratie, zoals beschreven in het <a href='$privacyPolicyUrl'>privacybeleid</a>.",
@@ -57,7 +58,8 @@ public function memberAcceptPersonalDetails(Request $request): Response {
         }
 
         return $this->render('user/privacy-policy.html.twig', [
-            'form' => $form->createView()
+            'form' => $form->createView(),
+	    'contributionEnabled' => $contributionEnabled,
         ]);
     }
 
@@ -69,6 +71,7 @@ public function home(Request $request): Response {
         if (!$member->getAcceptUsePersonalInformation())
             return $this->memberAcceptPersonalDetails($request);
 
+        $contributionEnabled = $this->getParameter('app.contributionEnabled');
         $events = $this->getDoctrine()->getRepository(Event::class)->createQueryBuilder('e')
             ->where('e.division IS NULL or e.division = ?1')
             ->andWhere('e.timeEnd > ?2')
@@ -79,7 +82,8 @@ public function home(Request $request): Response {
             ->getResult();
 
         return $this->render('user/home.html.twig', [
-            'events' => $events
+            'events' => $events,
+	    'contributionEnabled' => $contributionEnabled,
         ]);
     }
 
@@ -264,7 +268,7 @@ public function details(Request $request, UserPasswordEncoderInterface $password
         $member = $this->getUser();
         if (!$member->getAcceptUsePersonalInformation())
             return $this->memberAcceptPersonalDetails($request);
-
+	$contributionEnabled = $this->getParameter('app.contributionEnabled');
         $form = $this->createForm(MemberDetailsType::class, $member);
         $revision = new MemberDetailsRevision($member, true);
         $success = false;
@@ -301,7 +305,8 @@ public function details(Request $request, UserPasswordEncoderInterface $password
             'form' => $form->createView(),
             'formPassword' => $formPassword->createView(),
             'success' => $success,
-            'successPassword' => $successPassword
+            'successPassword' => $successPassword,
+            'contributionEnabled' => $contributionEnabled,
         ]);
     }
 

diff --git a/templates/user/details.html.twig b/templates/user/details.html.twig
@@ -101,7 +101,7 @@
 
             {{ form_end(formPassword) }}
         </div>
-
+	{% if contributionEnabled %}
         <div class="contributions">
             <h1>Contributie</h1>
 
@@ -158,5 +158,6 @@
                 </tbody>
             </table>
         </div>
+	{% endif %}
     </div>
 {% endblock %}
diff --git a/templates/user/layout/members.html.twig b/templates/user/layout/members.html.twig
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block body %}
-    {% if not app.user.contributionPaidAutomatically %}
+    {% if not app.user.contributionPaidAutomatically and contributionEnabled %}
     <div id="nagbar">
         <span>Je hebt nog geen automatisch incasso ingesteld! Stel dit in op de <a href="{{ url('member_details') }}">gegevens</a> pagina.</span>
     </div>