Ref #215: set to null bank information if payment type does not need …

…it on membership creation&edition
LUCILE-DECROZANT-TRIQUENAUX-EIRL · Jul 13, 2020 · e78d740 · e78d740
1 parent 8362be3
commit e78d740
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Controller/MembershipController.php b/src/Controller/MembershipController.php
@@ -118,6 +118,14 @@ public function createAction(Request $request, TranslatorInterface $translator)
             $payment->setAmount($updateMembershipFDO->getPaymentAmount());
             $payment->setDateReceived($updateMembershipFDO->getPaymentDateReceived());
             $payment->setDateCashed($updateMembershipFDO->getPaymentDateCashed());
+            if ($payment->getType()->isBankneeded())
+            {
+                $payment->setBank($updateMembershipFDO->getBank());
+            }
+            else
+            {
+                $payment->setBank(null);
+            }
 
             $payment->setPayer($updateMembershipFDO->getPayer());
             $payment->setMembership($membership);
@@ -236,6 +244,14 @@ public function editAction(Membership $membership, Request $request, TranslatorI
             $payment->setAmount($updateMembershipFDO->getPaymentAmount());
             $payment->setDateReceived($updateMembershipFDO->getPaymentDateReceived());
             $payment->setDateCashed($updateMembershipFDO->getPaymentDateCashed());
+            if ($payment->getType()->isBankneeded())
+            {
+                $payment->setBank($updateMembershipFDO->getBank());
+            }
+            else
+            {
+                $payment->setBank(null);
+            }
 
             $payment->setPayer($updateMembershipFDO->getPayer());
 

diff --git a/src/Entity/Payment.php b/src/Entity/Payment.php
@@ -212,9 +212,9 @@ function getBank()
      * @throws \Exception If bank information is not needed in the
      *                    corresponding payment type, throws an exception
      */
-    function setBank(Bank $bank): self
+    function setBank(?Bank $bank): self
     {
-        if (!$this->type->isBankneeded())
+        if (!$this->type->isBankneeded() && !is_null($bank))
         {
             throw new \Exception('Bank information is not needed in this payment.');
         }