Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/shop/templates/bank_transfer.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ <h2>Pay by Bank Transfer</h2>
<strong>
Remember:
</strong>
Please allow for up to a week before we register your bank transfer,
especially if you are outside of the SEPA region.
You will receive an invoice by email when your payment is registered. Registration of bank transfers is a manual process. We try to do it once per week, but it can sometimes take longer, especially during the winter months. If you are tired of waiting for an invoice drop us <a href="/contact">an email</a>.
</p>
</div>

Expand Down
5 changes: 3 additions & 2 deletions src/shop/templates/in_person.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
{% block shop_content %}

<h2>Pay In Person</h2>
<p>To pay order #{{ order.id }} you need to <strong>locate an organiser</strong> (in person) and make the payment of <b>{{ order.total|currency }}</b> with cash, card or mobilepay. You need to bring the <strong>order id #{{ order.id }}</strong> as well so we can mark your order as paid.</p>
<p>To pay order #{{ order.id }} you have to go to <strong>info desk</strong> (in person) and make the payment of <b>{{ order.total|currency }}</b> with cash, card or mobilepay (<strong>you cannot pay website orders in HAX!<strong>). You need to bring the <strong>order id #{{ order.id }}</strong> so we know which order to mark as paid.</p>

<p>If physically going to the infodesk is impractical for some reason (due to geography or opening hours), and finding an organiser is inconvenient for you, then you should <a href="{% url 'shop:order_detail' pk=order.id %}">go back</a> and pick a different payment method.</p>

<p>If physically finding an organiser is inconvenient for you (during events you can find us at the Infodesk, but between events geography can make things difficult) you should <a href="{% url 'shop:order_detail' pk=order.id %}">go back</a> and pick a different payment method.</p>
<p>When your order has been marked as paid you will receive an invoice by email.</p>
{% endblock %}
12 changes: 11 additions & 1 deletion src/shop/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,17 @@ def dispatch(self, request, *args, **kwargs):

# create a new coinify invoice if needed
if not order.coinify_api_payment_intent:
coinifyintent = create_coinify_payment_intent(order, request)
try:
coinifyintent = create_coinify_payment_intent(order, request)
except AttributeError:
logger.exception("Unable to get Coinify API url")
messages.error(
self.request,
"Blockchain payment is not working properly at the moment.",
)
return HttpResponseRedirect(
reverse_lazy("shop:order_detail", kwargs={"pk": order.pk}),
)
if not coinifyintent:
messages.error(
request,
Expand Down
Loading