CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Freshen up layout of refund choice page

Browse Source
This commit is contained in:
Raphael Michel
2021-01-27 10:48:40 +01:00
parent 33b34f31d1
commit 0747f5b8b8
4 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/payment.py
View File

@@ -950,7 +950,7 @@ class ManualPayment(BasePaymentProvider):
@property @property
def public_name(self): def public_name(self):
return str(self.settings.get('public_name', as_type=LazyI18nString)) return str(self.settings.get('public_name', as_type=LazyI18nString) or _('Manual payment'))
@property @property
def settings_form_fields(self): def settings_form_fields(self):

61
src/pretix/control/templates/pretixcontrol/order/refund_choose.html
View File

@@ -35,18 +35,17 @@
<th>{% trans "Payment" %}</th> <th>{% trans "Payment" %}</th>
<th>{% trans "Payment details" %}</th> <th>{% trans "Payment details" %}</th>
<th>{% trans "Amount not refunded" %}</th> <th>{% trans "Amount not refunded" %}</th>
<th>{% trans "Refund" %}</th> <th class="text-right flip refund-amount">{% trans "Refund amount" %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for p in payments %} {% for p in payments %}
<tr> <tr>
<td>{{ p.full_id }}<br/>{{ p.payment_date|date:"SHORT_DATETIME_FORMAT" }}<br/>{{ p.payment_provider.verbose_name }}</td> <td>{{ p.full_id }}<br/>{{ p.payment_date|date:"SHORT_DATETIME_FORMAT" }}<br/>{{ p.payment_provider.verbose_name }}</td>
<td class="payment-details">{{ p.html_info|safe }}</td> <td class="payment-details">{{ p.html_info|default_if_none:""|safe }}</td>
<td>{{ p.available_amount|money:request.event.currency }}</td> <td>{{ p.available_amount|money:request.event.currency }}</td>
<td> <td class="text-right flip refund-amount">
{% if p.partial_refund_possible %} {% if p.partial_refund_possible %}
{% trans "Automatically refund" context "amount_label" %}
<div class="input-group"> <div class="input-group">
<input type="text" name="refund-{{ p.pk }}" <input type="text" name="refund-{{ p.pk }}"
{% if p.propose_refund %} {% if p.propose_refund %}
@@ -64,10 +63,10 @@
<input type="checkbox" name="refund-{{ p.pk }}" <input type="checkbox" name="refund-{{ p.pk }}"
value="{{ p.amount|floatformat:2 }}" value="{{ p.amount|floatformat:2 }}"
{% if p.propose_refund == p.amount %}checked{% endif %}> {% if p.propose_refund == p.amount %}checked{% endif %}>
{% trans "Automatically refund full amount" %} {% trans "Full amount" %} ({{ p.amount|money:request.event.currency }})
</label> </label>
{% else %} {% else %}
<em>{% trans "This payment method does not support automatic refunds." %}</em> <em class="text-muted">{% trans "This payment method does not support automatic refunds." %}</em>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -82,7 +81,8 @@
<thead> <thead>
<tr> <tr>
<th>{% trans "Payment method" %}</th> <th>{% trans "Payment method" %}</th>
<th>{% trans "Refund" %}</th> <th>{% trans "Receipient / options" %}</th>
<th class="text-right flip refund-amount">{% trans "Refund amount" %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -94,7 +94,9 @@
</strong> </strong>
</td> </td>
<td> <td>
{% trans "Automatically refund" context "amount_label" %} {{ form|safe }}
</td>
<td class="text-right flip refund-amount">
<div class="input-group"> <div class="input-group">
<input type="text" name="newrefund-{{ prov }}" <input type="text" name="newrefund-{{ prov }}"
placeholder="{{ 0|floatformat:2 }}" placeholder="{{ 0|floatformat:2 }}"
@@ -103,15 +105,16 @@
{{ request.event.currency }} {{ request.event.currency }}
</span> </span>
</div> </div>
<br>
{{ form|safe }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
<tr> <tr>
<td><strong>{% trans "Transfer to other order" %}</strong></td> <td><strong>{% trans "Transfer to other order" %}</strong></td>
<td> <td>
{% trans "Transfer" context "amount_label" %} <input type="text" name="order-offsetting" placeholder="{% trans "Order code" %}"
value="" title="" class="form-control">
</td>
<td class="text-right flip refund-amount">
<div class="input-group"> <div class="input-group">
<input type="text" name="refund-offsetting" <input type="text" name="refund-offsetting"
title="" class="form-control" placeholder="{{ 0|floatformat:2 }}"> title="" class="form-control" placeholder="{{ 0|floatformat:2 }}">
@@ -119,17 +122,18 @@
{{ request.event.currency }} {{ request.event.currency }}
</span> </span>
</div> </div>
{% trans "to" context "order_label" %}
<input type="text" name="order-offsetting"
value="" title="" class="form-control">
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<strong>{% trans "Create a new gift card" %}</strong> <strong>{% trans "Create a new gift card" %}</strong>
</td> </td>
<td> <td>
<div class="text-muted">
{% trans "The gift card can be used to buy tickets for all events of this organizer." %}
</div>
</td>
<td class="text-right flip refund-amount">
<div class="input-group"> <div class="input-group">
<input type="text" name="refund-new-giftcard" <input type="text" name="refund-new-giftcard"
title="" class="form-control" title="" class="form-control"
@@ -143,16 +147,22 @@
{{ request.event.currency }} {{ request.event.currency }}
</span> </span>
</div> </div>
<div class="text-muted">
{% trans "The gift card can be used to buy tickets for all events of this organizer." %}
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><strong>{% trans "Manual refund" %}</strong></td> <td><strong>{% trans "Manual refund" %}</strong></td>
<td> <td>
{% trans "Manually refund" context "amount_label" %} <label class="radio no-bold">
<input type="radio" name="manual_state" value="created" checked>
{% trans "Keep transfer as to do" %}
</label><br>
<label class="radio no-bold">
<input type="radio" name="manual_state" value="done">
{% trans "Mark refund as done" %}
</label>
</td>
<td class="text-right flip refund-amount">
<div class="input-group"> <div class="input-group">
<input type="text" name="refund-manual" <input type="text" name="refund-manual"
{% if remainder %} {% if remainder %}
@@ -164,17 +174,8 @@
<span class="input-group-addon"> <span class="input-group-addon">
{{ request.event.currency }} {{ request.event.currency }}
</span> </span>
</div><br> </div>
<label class="radio no-bold">
<input type="radio" name="manual_state" value="created" checked>
{% trans "Keep transfer as to do" %}
</label>
<label class="radio no-bold">
<input type="radio" name="manual_state" value="done">
{% trans "Mark refund as done" %}
</label>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

1
src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/new_refund_control_form.html
View File

@@ -2,7 +2,6 @@
{% load ibanformat %} {% load ibanformat %}
{% load bootstrap3 %} {% load bootstrap3 %}
{% trans "to" context "refund_recipient" %}
{% bootstrap_field form.payer layout="inline" %} {% bootstrap_field form.payer layout="inline" %}
{% bootstrap_field form.iban layout="inline" %} {% bootstrap_field form.iban layout="inline" %}
{% bootstrap_field form.bic layout="inline" %} {% bootstrap_field form.bic layout="inline" %}

16
src/pretix/static/pretixcontrol/scss/_forms.scss
View File

@@ -512,17 +512,11 @@ table td > .checkbox input[type="checkbox"] {
.form-refund-choose { .form-refund-choose {
.payment-details { .payment-details {
max-width: 200px; max-width: 200px;
overflow: hidden; }
dt { .refund-amount {
float: none; width: 250px;
text-align: left; input.form-control {
font-weight: normal; width: 100px;
width: auto;
color: $text-muted;
}
dd {
margin-left: 0px;
word-break: break-word;
} }
} }
} }