Remove conflict resolver and add dynamic payments

members/templates/member_add_many.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div>
     <div>
-        <h3> Lisää useampi jäsen </h3>
+        <h3>{% trans "Add many members" %}</h3>
     </div>
 
     <div>
@@ -25,9 +25,18 @@
 
     </div>
     <form name="memberTextForm" action="/members/import_csv" method="POST">{% csrf_token %}
-        <div>
+        <div class="form-group">
+            <label>{% trans "Data" %}</label>
             <textarea name="textfield" class="form-control large-textarea" placeholder="Teemu, Teekkari, teemu.teekkari@notmail.dom, Otaniemi, 0, 0"></textarea>
         </div>
+        <div class="form-group">
+            <label>{% trans "Payment source" %}</label>
+            <select name="payment_source" class="form-control">
+              <option value="AYY">{% trans "AYY" %}</option>
+              <option value="bank_transfer">{% trans "Bank transfer" %}</option>
+              <option value="cash">{% trans "Cash payment" %}</option>
+            </select>
+        </div>
         <div>
             <button type="submit" class="btn btn-primary">{% trans "Send" %}</button>
         </div>