Merge pull request #379 from VOKO-Utrecht/377-upgrade-mollie

377 upgrade mollie

Author: bveldkamp

.github/workflows/lint.yml

@@ -12,6 +12,6 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.10.12'
       - name: flake8 Lint
         uses: py-actions/[email protected]

webapp/finance/urls.py

@@ -3,9 +3,6 @@
 from finance import views, admin_views
 
 urlpatterns = (
-    url(r'^pay/choosebank/$',
-        views.ChooseBankView.as_view(),
-        name="finance.choosebank"),
     url(r'^pay/cancel/$',
         views.CancelPaymentView.as_view(),
         name="finance.cancelpayment"),

webapp/finance/views.py

@@ -1,7 +1,5 @@
 from mollie.api.client import Client as MollieClient
-from mollie.api.resources.methods import Method as MollieMethods
 from braces.views import LoginRequiredMixin
-from django import forms
 from django.conf import settings
 from django.contrib import messages
 from django.urls import reverse
@@ -15,33 +13,6 @@
 from ordering.models import Order
 
 
-def choosebankform_factory(methods):
-    """
-    Generate a Django Form used to choose your bank from a drop down
-    Based on the up-to-date list of :banks: from our PSP
-    """
-    paymethods = [(method['id'], method['description'])
-                  for method in methods
-                  if method['status'] == 'activated']
-
-    bankchoices = []
-    for method in methods:
-        if (method['id'] == 'ideal'):
-            bankchoices = [(issuer['id'], issuer['name'])
-                           for issuer in method['issuers']]
-
-    class ChooseBankForm(forms.Form):
-        method = forms.ChoiceField(
-            choices=paymethods,
-            required=True,
-            initial='ideal',
-            widget=forms.RadioSelect,
-            label="Betaalwijze")
-        bank = forms.ChoiceField(choices=bankchoices, required=True)
-
-    return ChooseBankForm
-
-
 def get_order_to_pay(user):
     cur_order_round = get_current_order_round()
 
@@ -54,26 +25,19 @@ class MollieMixin(object):
     def __init__(self):
         self.mollie = MollieClient()
         self.mollie.set_api_key(settings.MOLLIE_API_KEY)
-        self.methods = self.mollie.methods.all(include='issuers')
-
-    def create_payment(self, amount, description, issuer_id, order_id, method):
-        if (method == 'ideal'):
-            mollieMethod = MollieMethods.IDEAL
-        else:
-            mollieMethod = MollieMethods.BANCONTACT
 
+    def create_payment(self, amount, description, order_id):
         # Mollie API wants exactly two decimals, always
         return self.mollie.payments.create({
             'amount': {'currency': 'EUR', 'value': "{0:.2f}".format(amount)},
             'description': description,
+            'method': 'ideal',
             'redirectUrl': (
                 settings.BASE_URL
                 + reverse("finance.confirmtransaction")
                 + "?order=%s" % order_id
             ),
             'webhookUrl': settings.BASE_URL + reverse("finance.callback"),
-            'method': mollieMethod,
-            'issuer': issuer_id,
             'metadata': {
                 'order_id': order_id
             },
@@ -83,59 +47,44 @@ def get_payment(self, payment_id):
         return self.mollie.payments.get(payment_id)
 
 
-class ChooseBankView(LoginRequiredMixin, MollieMixin, FormView):
-    """
-    Let user choose a bank to use for iDeal payment
-    """
-    template_name = "finance/choose_bank.html"
-
-    def get_form_class(self):
-        return choosebankform_factory(methods=self.methods)
-
-    def get_context_data(self, **kwargs):
-        context = super(ChooseBankView, self).get_context_data(**kwargs)
-        context['order'] = get_order_to_pay(self.request.user)
-        return context
-
-
 class CreateTransactionView(LoginRequiredMixin, MollieMixin, FormView):
     """
     Create transaction @ bank and redirect user to bank URL
     """
-
-    def get_form_class(self):
-        return choosebankform_factory(methods=self.methods)
-
     def post(self, request, *args, **kwargs):
-        Form = self.get_form_class()
-        form = Form(data=request.POST)
-        form.full_clean()
-
-        # input validation
-        if 'method' not in form.cleaned_data:
-            return redirect(reverse('finance.choosebank'))
-        method = form.cleaned_data.get('method')
-
-        if (method == 'ideal'):
-            if 'bank' not in form.cleaned_data:
-                return redirect(reverse('finance.choosebank'))
-            bank = form.cleaned_data.get('bank')
-        else:
-            bank = None
-        # end input validation
-
         order_to_pay = get_order_to_pay(request.user)
         if not order_to_pay:
             messages.error(request, "Geen bestelling gevonden")
             return redirect(reverse('view_products'))
 
+        user_notes = request.POST.get('notes').strip()
+        if user_notes:
+            order_to_pay.user_notes = user_notes
+
+        log_event(event="Finalizing order %s" % order_to_pay.id, user=order_to_pay.user)
+        order_to_pay.finalized = True  # Freeze order
+        order_to_pay.save()
+
         amount_to_pay = order_to_pay\
             .total_price_to_pay_with_balances_taken_into_account()
         log_event(
             event="Initiating payment (creating transaction) for order %d "
                   "and amount %f" %
                   (order_to_pay.id, amount_to_pay), user=order_to_pay.user)
 
+        if amount_to_pay == 0:
+            log_event(
+                event="Payment for order %d not necessary because order total "
+                      "is %f and user's credit is %f" %
+                      (order_to_pay.id, order_to_pay.total_price,
+                       order_to_pay.user.balance.credit()),
+                user=order_to_pay.user
+            )
+
+            self._message_payment_unnecessary()
+            order_to_pay.complete_after_payment()
+            return redirect(reverse('order_summary', args=(order_to_pay.pk,)))
+
         # Sanity checks. If one of these fails, it's very likely that someone
         # is tampering.
         assert order_to_pay.user == request.user
@@ -159,9 +108,10 @@ def post(self, request, *args, **kwargs):
             amount=float(amount_to_pay),
             description="VOKO Utrecht %d"
                         % order_to_pay.id,
-            issuer_id=bank,
+            # issuer_id=bank,
+            # method=method,
             order_id=order_to_pay.id,
-            method=method)
+            )
 
         Payment.objects.create(amount=amount_to_pay,
                                order=order_to_pay,
@@ -170,6 +120,13 @@ def post(self, request, *args, **kwargs):
         redirect_url = results.checkout_url
         return redirect(redirect_url)
 
+    def _message_payment_unnecessary(self):
+        messages.add_message(
+            self.request, messages.SUCCESS,
+            'Omdat je genoeg krediet had was betalen niet nodig. '
+            'Je bestelling is bevestigd.'
+        )
+
 
 class ConfirmTransactionView(LoginRequiredMixin, MollieMixin, TemplateView):
     """

webapp/ordering/views.py

@@ -9,7 +9,6 @@
     ListView, DetailView, FormView, View, UpdateView
 )
 from django.views.generic.detail import SingleObjectMixin
-from log import log_event
 
 from ordering.core import (get_or_create_order, get_order_product,
                            update_totals_for_products_with_max_order_amounts)
@@ -46,7 +45,7 @@ def get(self, *args, **kwargs):
                 self.request, "Je bent doorgestuurd naar de betaalpagina "
                               "omdat je bestelling nog niet is betaald!"
             )
-            return HttpResponseRedirect(reverse('finance.choosebank'))
+            return HttpResponseRedirect(reverse('finish_order', args=(order.pk,)))
         return ret
 
     def post(self, request, *args, **kwargs):  # noqa: C901
@@ -91,7 +90,7 @@ def post(self, request, *args, **kwargs):  # noqa: C901
                     value = 0
 
                 # User deleted a product
-                if type(value) != int and not value.isdigit():
+                if not isinstance(value, int) and not value.isdigit():
                     value = 0
                 if not int(value):
                     if order_product:
@@ -281,43 +280,6 @@ def get_context_data(self, **kwargs):
                                                           self.request)
         return super(UpdateView, self).get_context_data(**kwargs)
 
-    def calculate_payment(self):
-        order = self.get_object()
-        return order.total_price_to_pay_with_balances_taken_into_account()
-
-    def post(self, request, *args, **kwargs):
-        order = self.get_object()
-
-        user_notes = request.POST.get('notes').strip()
-        if user_notes:
-            order.user_notes = user_notes
-
-        log_event(event="Finalizing order %s" % order.id, user=order.user)
-        order.finalized = True  # Freeze order
-        order.save()
-
-        if self.calculate_payment() == 0:
-            log_event(
-                event="Payment for order %d not necessary because order total "
-                      "is %f and user's credit is %f" %
-                      (order.id, order.total_price,
-                       order.user.balance.credit()),
-                user=order.user
-            )
-
-            self._message_payment_unnecessary()
-            order.complete_after_payment()
-            return redirect(reverse('order_summary', args=(order.pk,)))
-
-        return redirect('finance.choosebank')
-
-    def _message_payment_unnecessary(self):
-        messages.add_message(
-            self.request, messages.SUCCESS,
-            'Omdat je genoeg krediet had was betalen niet nodig. '
-            'Je bestelling is bevestigd.'
-        )
-
 
 class OrdersDisplay(LoginRequiredMixin, UserOwnsObjectMixin, ListView):
     """

webapp/templates/finance/after_payment.html

@@ -8,7 +8,7 @@ <h1>Betaling geslaagd</h1>
         </p>
     {% else %}
             <h1>Betaling mislukt</h1>
-            <p><a href="{% url 'finance.choosebank' %}">Klik hier om het nogmaals te proberen.</a></p>
+            <p><a href="{% url 'finish_order' user.orders.get_current_order.pk %}">Klik hier om het nogmaals te proberen.</a></p>
     {% endif %}
 
 {% endblock %}

webapp/templates/finance/choose_bank.html

@@ -2,17 +2,8 @@
 {% load django_bootstrap5 %}
 {% block title %}Betalen{% endblock %}
 {% block content %}
-<script type="text/javascript">
-    window.onload = function() {
-        $("#id_method").change( function(){
-            if ($("#id_method input[name='method']:checked").val() == "ideal") {
-                $("#id_bank").parent().show();
-            }else
-                $("#id_bank").parent().hide();
-        });
-    }
-</script>
-<h1>Betalen via iDeal</h1>
+
+<h1>Betaaloverzicht voor deze bestelling</h1>
     {% if not order %}
     <div class="alert alert-warning" role="alert">Je hebt geen bestelling om te betalen.</div>
     {% else %}
@@ -23,14 +14,14 @@ <h1>Betalen via iDeal</h1>
     <br/><br/>
     <strong>Te betalen: &euro; {{ order.total_price_to_pay_with_balances_taken_into_account }}</strong>
     </p>
+    <p>Klik hieronder op ‘Betalen’ om naar de betaalomgeving te gaan.</p>
 
     <div class="w-50 row">
         <form action="{% url 'finance.createtransaction' %}" method="post">{% csrf_token %}
-            {% bootstrap_form form %}
             <div class="mt-4 d-flex justify-content-between">
             <a class="btn btn-warning" href="{%  url 'finance.cancelpayment' %}" role="button"><span class="bi-x-square"></span> Annuleren</a>
             <button type="submit" class="btn btn-primary">
-                <span class="bi-star"></span> Betalen
+                <span class="bi-cash-coin"></span> Betalen
             </button>
             </div>
         </form>

webapp/templates/ordering/order_finish.html

@@ -12,7 +12,7 @@ <h1>Bestelling plaatsen</h1>
       {% else %}
       <p>
       <strong>Hieronder zie je de producten in je "winkelmandje".</strong><br/>
-      Door op de rode knop onderaan deze pagina te klikken wordt je bestelling <strong>geplaatst</strong> en
+      Door op de groene knop onderaan deze pagina te klikken wordt je bestelling <strong>geplaatst</strong> en
       ga je naar de betalingspagina.</p>
       <p>
           Als je een product niet hebt kunnen bestellen (zie eventuele melding bovenaan deze pagina) of als je
@@ -81,7 +81,7 @@ <h1>Bestelling plaatsen</h1>
   </table>
 </div>
 
-<form action="" method="post">{% csrf_token %}
+<form action="{% url 'finance.createtransaction' %}" method="post">{% csrf_token %}
 
     <div class="row">
         <div class="col-md-6">