Fix missing deadline alias, fix rollback issue

diff --git a/galette/lib/Galette/Entity/Contribution.php b/galette/lib/Galette/Entity/Contribution.php
index 3a86b9fe3a8a905977a7b8965ef5998f8d8e15f2..660ad5b2866cf8dbff8487cc275df025582854ad 100644 (file)
--- a/galette/lib/Galette/Entity/Contribution.php
+++ b/galette/lib/Galette/Entity/Contribution.php
@@ -669,12 +669,10 @@ class Contribution
 
             return true;
         } catch (Throwable $e) {
-            $this->zdb->connection->rollBack();
-            Analog::log(
-                'Something went wrong :\'( | ' . $e->getMessage() . "\n" .
-                $e->getTraceAsString(),
-                Analog::ERROR
-            );
+
+            if ($this->zdb->connection->inTransaction()) {
+                $this->zdb->connection->rollBack();
+            }
             return false;
         }
     }

diff --git a/galette/lib/Galette/Features/Replacements.php b/galette/lib/Galette/Features/Replacements.php
index ae267d518bf151bd6a66fb3be40c0de6ff39cae6..66a177d17dd70dff7c3bf66fc36e418e177450af 100644 (file)
--- a/galette/lib/Galette/Features/Replacements.php
+++ b/galette/lib/Galette/Features/Replacements.php
@@ -448,6 +448,10 @@ trait Replacements
         }
 
         //handle DEADLINE alias
+        $c_patterns['deadline'] = [
+            'title'     => $c_patterns['contrib_edate'],
+            'pattern'   => '/{DEADLINE}/'
+        ];
 
         return $c_patterns + $dynamic_patterns;
     }
@@ -566,6 +570,7 @@ trait Replacements
         $c_replacements['__contrib_label'] = $c_replacements['contrib_label'];
 
         //handle DEADLINE alias
+        $c_replacements['deadline'] = $c_replacements['contrib_edate'];
 
         $this->setReplacements($c_replacements);