From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 17 Jun 2021 07:44:13 +0000 (+0200)
Subject: Fix missing deadline alias, fix rollback issue
X-Git-Tag: 0.9.5~9
X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=0356d54b45dfa0fcb5bdb5c6b19b5b7fa5d5ea20;p=galette.git

Fix missing deadline alias, fix rollback issue
---

diff --git a/galette/lib/Galette/Entity/Contribution.php b/galette/lib/Galette/Entity/Contribution.php
index 3a86b9fe3..660ad5b28 100644
--- 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 ae267d518..66a177d17 100644
--- 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);