Few fixes on scheduled payments

diff --git a/galette/templates/default/pages/contribution_form.html.twig b/galette/templates/default/pages/contribution_form.html.twig
index 66da420c4769c21e663fcb8371c6720d61112b92..4ed2a59a499b8f36fd10e50409e316d00c34c6f8 100644 (file)
--- a/galette/templates/default/pages/contribution_form.html.twig
+++ b/galette/templates/default/pages/contribution_form.html.twig
@@ -46,7 +46,7 @@
                 </div>
                 <div class="active content">
                     <div class="ui mobile reversed stackable grid">
-                        <div class="{% if contribution.isTransactionPart() %}six wide {% endif %}column">
+                        <div class="{% if contribution.isTransactionPart() or contribution.hasSchedule() %}six wide {% endif %}column">
     {% if not require_mass %}
                             <div class="inline field">
                                 <label for="id_adh">{{ _T("Contributor:") }}</label>

diff --git a/galette/templates/default/pages/scheduledpayments_list.html.twig b/galette/templates/default/pages/scheduledpayments_list.html.twig
index 5eaccb2d68661e0383c05131a34203483710a511..5639706839164c43e0e11ce25db1131d85a7bd89 100644 (file)
--- a/galette/templates/default/pages/scheduledpayments_list.html.twig
+++ b/galette/templates/default/pages/scheduledpayments_list.html.twig
@@ -58,7 +58,7 @@
     <div class="ui secondary yellow segment">
         <div class="four fields">
             <div class="field">
-                <label for="date_field">{{ _T("Show contributions by") }}</label>
+                <label for="date_field">{{ _T("Show payments by") }}</label>
                 <select name="date_field" id="date_field" class="ui search dropdown">
                     <option value="{{ constant("Galette\\Filters\\ScheduledPaymentsList::DATE_RECORD") }}"{% if filters.date_field == constant('Galette\\Filters\\ScheduledPaymentsList::DATE_RECORD') %} selected="selected"{% endif %}>{{ _T("Date") }}</option>
                     <option value="{{ constant("Galette\\Filters\\ScheduledPaymentsList::DATE_SCHEDULED") }}"{% if filters.date_field == constant('Galette\\Filters\\ScheduledPaymentsList::DATE_SCHEDULED') %} selected="selected"{% endif %}>{{ _T("Scheduled date") }}</option>