X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3d95fcd3649e33465314257c8b93ff139b95629f..ddf2102eff7ea420a4ea5144c43409587fc1156e:/src/club/templates/club/payment_form.html?ds=sidebyside

diff --git a/src/club/templates/club/payment_form.html b/src/club/templates/club/payment_form.html
index 2891b98c9..a5b5c068d 100644
--- a/src/club/templates/club/payment_form.html
+++ b/src/club/templates/club/payment_form.html
@@ -10,12 +10,16 @@
   {% for e in  form.amount.errors %}
     <li>{{ e }}</li>
   {% endfor %}
+  {% for e in  form.method.errors %}
+    <li>{{ e }}</li>
+  {% endfor %}
 </ul>
 
 <h3>1. {% trans "Choose your type of support" %}</h3>
 
 {{ form.amount }}
 {{ form.monthly }}
+{{ form.method }}
 <div class="plan-select">
   <span class="button plan-toggle" data-plan="plan-single" data-monthly="False">{% trans "one-time" %}</span>
   <span class="button plan-toggle active" data-plan="plan-monthly" data-monthly="True">{% trans "monthly" %}</span>
@@ -24,8 +28,8 @@
 <h3>2. {% trans "Choose the amount" %}</h3>
 
 <div class="plan" id="plan-single" style="display:none;" data-monthly="False" data-min-for-year="{{ club.min_for_year }}" data-amount="{{ club.default_single_amount }}">
-  {% for amount in club.proposed_single_amounts %}
-    <span class="button kwota{% if amount == club.default_single_amount %} active{% endif %}{% if amount >= club.min_for_year %} yearly{% endif %}">{{ amount }}</span>
+  {% for amount in club.singleamount_set.all %}
+    <span class="button kwota{% if amount.amount == club.default_single_amount %} active{% endif %}{% if amount.amount >= club.min_for_year %} yearly{% endif %}">{{ amount.amount }}</span>
   {% endfor %}
 
   <span class="inna">
@@ -37,29 +41,65 @@
 
 
 <div class="plan" id="plan-monthly" data-monthly="True" data-amount="{{ club.default_monthly_amount }}">
-  {% for amount in club.proposed_monthly_amounts %}
-    <span class="button kwota{% if amount == club.default_monthly_amount %} active{% endif %}">{{ amount }}</span>
+  {% for amount in club.monthlyamount_set.all %}
+    <span class="button kwota{% if amount.amount == club.default_monthly_amount %} active{% endif %}">{{ amount.amount }}</span>
   {% endfor %}
 
   <span class="inna">
     <span class="button">{% trans "different amount" %}</span>
     <input type="number" min="{{ club.min_amount }}">
   </span>
-  <div class="methods">{% include 'club/payment/payu-re.html' %}</div>
+  <div class="methods">
+    {% include 'club/payment/payu-re.html' %}
+  </div>
 </div>
 
-<h3>3. {% trans "Provide an e-mail address" %}</h3>
+<h3>3. {% trans "Provide contact details" %}</h3>
+
+<p>
+  <label class="required">{% trans "First and last name:" %}</label><br>
+  {{ form.first_name }}
+  <br><br>
+  {{ form.last_name }}
+</p>
+
+
+<p>
+  <label for="id_email" {% if form.email.field.required %}class="required"{% endif %}>{% trans "E-mail:" %}</label><br>
+  {{ form.email }}
+</p>
+
+<p>
+  <label for="id_phone" {% if form.phone.field.required %}class="required"{% endif %}>{% trans "Phone number:" %}</label><br>
+  {{ form.phone }}
+</p>
+
+<p>
+  <label for="id_postal"  {% if form.postal.field.required %}class="required"{% endif %}>{% trans "Postal address:" %}</label><br>
+  {{ form.postal }}<br>
+  {{ form.postal_code }} {{ form.postal_town }}<br>
+  {{ form.postal_country }}
+</p>
+
+{% for c, key, consent_field in form.consent %}
+  <p>
+    {{ consent_field }}
+    <label for="id_{{ key }}" {% if c.required %}class="required"{% endif %}>
+      {{ consent_field.label }}
+    </label>
+  </p>
+{% endfor %}
 
-<p>{{ form.email }}</p>
 
 <p>
   {{ form.agree_newsletter }}
   <label for="id_agree_newsletter">
-    {% trans "I'd like to receive informations about new publications." %}
+    {% trans "I'd like to subscribe the newsletter." %}
   </label>
 </p>
 
 <p class="helptext">{% trans 'You can unsubscribe at any point. More in the <a target="_blank" href="https://nowoczesnapolska.org.pl/prywatnosc/">privacy policy</a>.' %}</p>
-<p class="helptext">{{ form.data_processing }}</p>
+
+<div class="helptext">{{ form.data_processing|safe }}</div>
 
 <div><button class="submit" type='submit'>{% trans "Donate" %}</button></div>