Remaining smarty syntax, few fixes

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index b07cf943722cffea61d49b95579ccae44834f096..2041b35b6c880c409f0382d92a57b9bd33604cea 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -793,12 +793,13 @@ class ContributionsController extends CrudController
             $error_detected = array_merge($error_detected, $valid);
         }
 
+        // send email to member
+        if (isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
+            $contrib->setSendmail(); //flag to send creation email
+        }
+
         //all goes well, we can proceed
         if (count($error_detected) == 0) {
-            // send email to member
-            if (isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
-                $contrib->setSendmail(); //flag to send creation email
-            }
 
             $store = $contrib->store();
             if ($store === true) {

diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php
index 3194304d6b0e1ff78062499a288c22dc64acbc7e..103b77c678b5f7367392bfc83a079367a61222f7 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MembersController.php
+++ b/galette/lib/Galette/Controllers/Crud/MembersController.php
@@ -1614,6 +1614,11 @@ class MembersController extends CrudController
 
         $real_requireds = array_diff(array_keys($required), array_keys($disabled));
 
+        // send email to member
+        if ($this->isSelfMembership() || isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
+            $member->setSendmail(); //flag to send creation email
+        }
+
         // Validation
         $redirect_url = $this->router->pathFor('member', ['id' => $member->id]);
         if (!count($real_requireds) || isset($post[array_shift($real_requireds)])) {
@@ -1631,11 +1636,6 @@ class MembersController extends CrudController
                     $new = true;
                 }
 
-                // send email to member
-                if ($this->isSelfMembership() || isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
-                    $member->setSendmail(); //flag to send creation email
-                }
-
                 $store = $member->store();
                 if ($store === true) {
                     //member has been stored :)

diff --git a/galette/lib/Galette/Entity/Contribution.php b/galette/lib/Galette/Entity/Contribution.php
index dc2c3a08db0c9e5c45a57a2391fe938c9d488508..96aca8f07fc9e8a3830cd9f161153ae10533ee36 100644 (file)
--- a/galette/lib/Galette/Entity/Contribution.php
+++ b/galette/lib/Galette/Entity/Contribution.php
@@ -1406,7 +1406,7 @@ class Contribution
      *
      * @return Contribution
      */
-    public function setSendmail($send = true)
+    public function setSendmail(bool $send = true)
     {
         $this->sendmail = $send;
         return $this;

diff --git a/galette/templates/default/pages/configuration_dynamic_field_form.html.twig b/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
index 7bdb7dc4cd9c098da32219f8b51c83b583b894d4..364e90c4c243fdd672f9a4bdfd064276de72a007 100644 (file)
--- a/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
+++ b/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
@@ -113,7 +113,6 @@
                         {% if df is defined %}
                             {% set type = df.getType() %}
                         {% endif %}
-                        {html_options options=$field_type_names selected=$type}
                         {% for key, value in field_type_names %}
                             <option value="{{ key }}"{% if key == type %} selected="selected"{% endif %}>{{ value }}</option>
                         {% endfor %}

diff --git a/galette/templates/default/pages/contribution_form.html.twig b/galette/templates/default/pages/contribution_form.html.twig
index 5770b555d57d638578a0fa06fda11473bf5aa7a5..c8e14738514d878156075310295be512626ce52f 100644 (file)
--- a/galette/templates/default/pages/contribution_form.html.twig
+++ b/galette/templates/default/pages/contribution_form.html.twig
@@ -95,7 +95,6 @@
                             {% else %}
                                 {% set selectedid = null %}
                             {% endif %}
-                            {html_options options=$type_cotis_options selected=$selectedid}
                             {% for key, value in type_cotis_options %}
                                 <option value="{{ key }}"{% if key == selectedid %} selected="selected"{% endif %}>{{ value }}</option>
                             {% endfor %}
@@ -203,7 +202,7 @@
             <div class="ui center aligned yellow segment">
                 <div class="inline field">
                     <div class="ui toggle checkbox">
-                        <input type="checkbox" name="mail_confirm" id="mail_confirm" value="1" {% if post.mail_confirm is defined and post.mail_confirm != "" %}checked="checked"{% endif %}/>
+                        <input type="checkbox" name="mail_confirm" id="mail_confirm" value="1"{% if contribution.sendEMail() %} checked="checked"{% endif %}/>
                         <label for="mail_confirm">
                             {{ _T("Notify member") }}
                         </label>

diff --git a/galette/templates/default/pages/member_form.html.twig b/galette/templates/default/pages/member_form.html.twig
index 1999d78fe2e09327618ccd7fe7d5ba646670a4b0..26bdf79c01d96290c531dfb640fe8c79041b0e5d 100644 (file)
--- a/galette/templates/default/pages/member_form.html.twig
+++ b/galette/templates/default/pages/member_form.html.twig
@@ -83,7 +83,7 @@
                 </div>
             </div>
         {% else %}
-            <input type="hidden" name="redirect_on_create" value="{constant('Galette\\Entity\\Adherent::AFTER_ADD_SHOW')}"/>
+            <input type="hidden" name="redirect_on_create" value="{{ constant('Galette\\Entity\\Adherent::AFTER_ADD_SHOW') }}"/>
         {% endif %}
         {% if addchild is defined and addchild %}
             <input type="hidden" name="addchild" value="true"/>
@@ -93,7 +93,7 @@
             <div class="ui center aligned yellow segment">
                 <div class="inline field">
                     <div class="ui toggle checkbox">
-                        <input type="checkbox" name="mail_confirm" id="mail_confirm" value="1" {# if isset($smarty.post.mail_confirm) and $smarty.post.mail_confirm != ""}checked="checked"{/if#}/>
+                        <input type="checkbox" name="mail_confirm" id="mail_confirm" value="1"{% if member.sendEMail() %} checked="checked"{% endif %}/>
                         <label for="mail_confirm">
             {% if member.id %}
                             {{ _T("Notify member his account has been modified") }}