0003-lingo-make-manager-views-compliant-with-PaymentBacke.patch

Emmanuel Cazenave, 09 mai 2019 17:52

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/3] lingo: make manager views compliant with PaymentBackend
 (#32441)

 combo/apps/lingo/forms.py                     |  12 ++
 combo/apps/lingo/manager_views.py             |  82 ++++++++++--
 .../lingo/templates/lingo/paymentbackend.html |  44 +++++++
 .../lingo/paymentbackend_confirm_delete.html  |  17 +++
 .../templates/lingo/paymentbackend_form.html  |  22 ++++
 .../templates/lingo/paymentbackend_list.html  |  38 ++++++
 .../lingo/templates/lingo/regie_list.html     |   3 -
 .../templates/lingo/transaction_list.html     |   2 +-
 combo/apps/lingo/urls.py                      |  18 ++-
 tests/test_lingo_cells.py                     |   8 +-
 tests/test_lingo_manager.py                   | 122 +++++++++++++++---
 tests/test_notification.py                    |   9 +-
 12 files changed, 334 insertions(+), 43 deletions(-)
 create mode 100644 combo/apps/lingo/forms.py
 create mode 100644 combo/apps/lingo/templates/lingo/paymentbackend.html
 create mode 100644 combo/apps/lingo/templates/lingo/paymentbackend_confirm_delete.html
 create mode 100644 combo/apps/lingo/templates/lingo/paymentbackend_form.html
 create mode 100644 combo/apps/lingo/templates/lingo/paymentbackend_list.html

     from django import forms
     from .models import Regie
     class RegieForm(forms.ModelForm):
         class Meta:
             model = Regie
             widgets = {
                 'payment_backend': forms.HiddenInput()
+            }
             fields = '__all__'

     import datetime
     from dateutil import parser as date_parser
     from django.core.urlresolvers import reverse_lazy
     from django.core.urlresolvers import reverse, reverse_lazy
     from django.db.models import Q
     from django.utils import six
     from django.utils.functional import cached_property
     from django.utils.timezone import make_aware
     from django.views.generic import CreateView, UpdateView, ListView, DeleteView
     from django.http import HttpResponse
     from django.views.generic import CreateView, UpdateView, ListView, DeleteView, DetailView
     from django.http import HttpResponse, Http404
     import eopayment
     from .models import Regie, Transaction
     from .forms import RegieForm
     from .models import Regie, Transaction, PaymentBackend
     class RegieListView(ListView):
         model = Regie
     class RegieViewMixin(object):
         def get_success_url(self):
             res = reverse(
                 'lingo-manager-paymentbackend', kwargs={'pk': self.get_object().payment_backend.id}
+            )
             return res
     class RegieCreateView(CreateView):
         form_class = RegieForm
         model = Regie
         fields = '__all__'
         success_url = reverse_lazy('lingo-manager-regie-list')
         @cached_property
         def payment_backend(self):
             try:
                 return PaymentBackend.objects.get(id=self.kwargs.get('pk'))
             except PaymentBackend.DoesNotExist:
                 raise Http404()
         def get_initial(self):
             res = {'payment_backend': self.payment_backend}
             if self.model.objects.all().count() == 0:
                 return {'is_default': True}
             return {}
                 res['is_default'] = True
             return res
         def get_success_url(self):
             res = reverse(
                 'lingo-manager-paymentbackend', kwargs={'pk': self.payment_backend.id}
+            )
             return res
     class RegieUpdateView(UpdateView):
     class RegieUpdateView(RegieViewMixin, UpdateView):
         model = Regie
         fields = '__all__'
         success_url = reverse_lazy('lingo-manager-regie-list')
         form_class = RegieForm
     class RegieDeleteView(DeleteView):
     class RegieDeleteView(RegieViewMixin, DeleteView):
         model = Regie
         success_url = reverse_lazy('lingo-manager-regie-list')
     class TransactionListView(ListView):
-...
             else:
                 writer.writerow([unicode(x).encode('utf-8') for x in row])
         return response
     class PaymentBackendView(DetailView):
         model = PaymentBackend
         template_name = 'lingo/paymentbackend.html'
     class PaymentBackendListView(ListView):
         model = PaymentBackend
     class PaymentBackendMixinView(object):
         def get_success_url(self):
             res = reverse(
                 'lingo-manager-paymentbackend', kwargs={'pk': self.object.id}
+            )
             return res
     class PaymentBackendCreateView(PaymentBackendMixinView, CreateView):
         model = PaymentBackend
         fields = '__all__'
     class PaymentBackendUpdateView(PaymentBackendMixinView, UpdateView):
         model = PaymentBackend
         fields = '__all__'
     class PaymentBackendDeleteView(DeleteView):
         model = PaymentBackend
         success_url = reverse_lazy('lingo-manager-paymentbackend-list')

     {% extends "lingo/paymentbackend_list.html" %}
     {% load i18n %}
     {% block breadcrumb %}
     {{ block.super }}
     <a href=".">{% trans "Settings" %}</a>
     {% endblock %}
     {% block appbar %}
     <h2>{% trans "Settings" %}
         <span class="identifier">[{% trans "identifier:" %} {{object.slug}}]</span>
     </h2>
     <span class="actions">
       <a rel="popup" href="{% url 'lingo-manager-paymentbackend-delete' pk=object.id %}">{% trans 'Delete' %}</a>
       <a rel="popup" href="{% url 'lingo-manager-paymentbackend-edit' pk=object.id %}">{% trans 'Options' %}</a>
       <a rel="popup" href="{% url 'lingo-manager-regie-add' pk=object.id %}">{% trans 'New Regie' %}</a>
     </span>
     {% endblock %}
     {% block content %}
     <div class="section">
     <h3>{% trans "Regies" %}</h3>
     <div>
     {% if object.regie_set.count %}
       <ul class="objects-list single-links">
         {% for regie in object.regie_set.all %}
         <li>
           <a rel="popup" href="{% url 'lingo-manager-regie-edit' pk=regie.id %}">{{ regie.slug }}</a>
           <a rel="popup" class="delete" href="{% url 'lingo-manager-regie-delete' pk=regie.id %}">{% trans "remove" %}</a>
         </li>
         {% endfor %}
       </ul>
     {% else %}
     <div class="big-msg-info">
       {% blocktrans %}
       This payment backend doesn't have any regie yet. Click on the "New Regie" button in
       the top right of the page to add a first one.
       {% endblocktrans %}
     </div>
     {% endif %}
     </div>
     </div>
     {% endblock %}

     {% extends "combo/manager_base.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{{ view.model.get_verbose_name }}</h2>
     {% endblock %}
     {% block content %}
     <form method="post">
       {% csrf_token %}
       {% blocktrans %}Are you sure you want to delete this ?{% endblocktrans %}
       <div class="buttons">
         <button class="delete-button">{% trans 'Delete' %}</button>
         <a class="cancel" href="{% url 'lingo-manager-paymentbackend-list' %}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

     {% extends "lingo/paymentbackend_list.html" %}
     {% load i18n %}
     {% block appbar %}
     {% if object.id %}
     <h2>{% trans "Edit Payment backend" %}</h2>
     {% else %}
     <h2>{% trans "New Payment backend" %}</h2>
     {% endif %}
     {% endblock %}
     {% block content %}
     <form method="post" enctype="multipart/form-data">
       {% csrf_token %}
       {{ form.as_p }}
       <div class="buttons">
         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{% url 'lingo-manager-homepage' %}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

     {% extends "lingo/manager_base.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{% trans 'Payment backends' %}</h2>
     <span class="actions">
     <a rel="popup" href="{% url 'lingo-manager-paymentbackend-add' %}">{% trans 'New' %}</a>
     </span>
     {% endblock %}
     {% block breadcrumb %}
     {{ block.super }}
     <a href="{% url 'lingo-manager-paymentbackend-list' %}">{% trans 'Payment backends' %}</a>
     {% endblock %}
     {% block content %}
     {% if object_list %}
     <ul class="objects-list single-links">
      {% for pb in object_list %}
      <li>
      <a href="{% url 'lingo-manager-paymentbackend' pk=pb.id %}">{{ pb.label }}
        <span>({{pb.service}})</span>
      </a>
       <a rel="popup" class="delete" href="{% url 'lingo-manager-paymentbackend-delete' pk=pb.id %}">{% trans "remove" %}</a>
      </li>
      {% endfor %}
     </ul>
     {% else %}
     <div class="big-msg-info">
       {% blocktrans %}
       This site doesn't have any payment backend yet. Click on the "New" button in the top
       right of the page to add a first one.
       {% endblocktrans %}
     </div>
     {% endif %}
     {% endblock %}

     {% block appbar %}
     <h2>{% trans 'Regies' %}</h2>
     <span class="actions">
     <a rel="popup" href="{% url 'lingo-manager-regie-add' %}">{% trans 'New' %}</a>
     </span>
     {% endblock %}
     {% block breadcrumb %}

     {% block appbar %}
     <h2>{% trans 'Transactions' %}</h2>
     <span class="actions">
     <a href="{% url 'lingo-manager-regie-list' %}">{% trans 'Regies' %}</a>
     <a href="{% url 'lingo-manager-paymentbackend-list' %}">{% trans 'Payment backends' %}</a>
     <a href="{% url 'lingo-manager-transactions-download' %}">{% trans 'download CSV' %}</a>
     </span>
     {% endblock %}

                         RemoveBasketItemApiView, ValidateTransactionApiView,
                         CancelTransactionApiView, SelfInvoiceView, BasketItemPayView)
     from .manager_views import (RegieListView, RegieCreateView, RegieUpdateView,
             RegieDeleteView, TransactionListView, download_transactions_csv)
                                 RegieDeleteView, TransactionListView, download_transactions_csv,
                                 PaymentBackendListView, PaymentBackendCreateView,
                                 PaymentBackendUpdateView, PaymentBackendView, PaymentBackendDeleteView)
     lingo_manager_urls = [
         url('^$', TransactionListView.as_view(), name='lingo-manager-homepage'),
         url('^transactions/download-csv/$', download_transactions_csv, name='lingo-manager-transactions-download'),
         url('^regies/$', RegieListView.as_view(), name='lingo-manager-regie-list'),
         url('^regies/add/$', RegieCreateView.as_view(), name='lingo-manager-regie-add'),
     #    url('^regies/add/$', RegieCreateView.as_view(), name='lingo-manager-regie-add'),
         url(r'^regies/(?P<pk>\w+)/edit$', RegieUpdateView.as_view(),
             name='lingo-manager-regie-edit'),
         url(r'^regies/(?P<pk>\w+)/delete$', RegieDeleteView.as_view(),
             name='lingo-manager-regie-delete'),
         url('^paymentbackends/$', PaymentBackendListView.as_view(),
             name='lingo-manager-paymentbackend-list'),
         url('^paymentbackends/add/$', PaymentBackendCreateView.as_view(),
             name='lingo-manager-paymentbackend-add'),
         url(r'^paymentbackends/(?P<pk>\w+)/$', PaymentBackendView.as_view(),
             name='lingo-manager-paymentbackend'),
         url(r'^paymentbackends/(?P<pk>\w+)/edit$', PaymentBackendUpdateView.as_view(),
             name='lingo-manager-paymentbackend-edit'),
         url(r'^paymentbackends/(?P<pk>\w+)/delete$', PaymentBackendDeleteView.as_view(),
             name='lingo-manager-paymentbackend-delete'),
         url(r'^paymentbackends/(?P<pk>\w+)/add-regie$',
             RegieCreateView.as_view(), name='lingo-manager-regie-add'),
+    ]
     urlpatterns = [

     from combo.data.models import Page
     from combo.apps.lingo.models import Regie, BasketItem, Transaction
     from combo.apps.lingo.models import (LingoBasketCell,
     from combo.apps.lingo.models import (LingoBasketCell, PaymentBackend,
             LingoRecentTransactionsCell, LingoBasketLinkCell, TipiPaymentFormCell)
     pytestmark = pytest.mark.django_db
-...
     @pytest.fixture
     def regie():
         try:
             pb = PaymentBackend.objects.get(slug='test1')
         except PaymentBackend.DoesNotExist:
             pb = PaymentBackend.objects.create(
                 label='test1', slug='test1')
         try:
             regie = Regie.objects.get(slug='test')
         except Regie.DoesNotExist:
-...
             regie.label = 'Test'
             regie.slug = 'test'
             regie.description = 'test'
             regie.payment_backend = pb
             regie.save()
         return regie

     import eopayment
     from combo.data.models import Page
     from combo.apps.lingo.models import Regie, BasketItem, Transaction, ActiveItems, TipiPaymentFormCell
     from combo.apps.lingo.models import (Regie, BasketItem, Transaction, ActiveItems,
                                          TipiPaymentFormCell, PaymentBackend)
     from decimal import Decimal
     pytestmark = pytest.mark.django_db
     @pytest.fixture
     def payment_backend():
         return PaymentBackend.objects.create(
                 label='test1', slug='test1', service='dummy', service_options={'siret': '1234'})
     def login(app, username='admin', password='admin'):
         login_page = app.get('/login/')
         login_form = login_page.forms[0]
-...
         resp = app.get('/manage/', status=200)
         assert '/manage/lingo/' in resp.text
     def test_add_regie(app, admin_user):
     def test_add_regie(app, admin_user, payment_backend):
         Regie.objects.all().delete()
         app = login(app)
         resp = app.get('/manage/lingo/regies/', status=200)
         resp = resp.click('New')
         resp = app.get('/manage/lingo/paymentbackends/%s/' % payment_backend.pk, status=200)
         resp = resp.click('New Regie')
         resp.forms[0]['label'] = 'Test'
         resp.forms[0]['slug'] = 'test'
         resp.forms[0]['description'] = 'description'
         resp.forms[0]['service'] = 'dummy'
         resp.forms[0]['payment_backend'] = payment_backend.pk
         assert resp.form['is_default'].checked is True
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/lingo/regies/')
         assert resp.location.endswith('/manage/lingo/paymentbackends/%s/' % payment_backend.pk)
         assert Regie.objects.count() == 1
         regie = Regie.objects.all()[0]
         assert regie.label == 'Test'
         assert regie.is_default is True
     def test_edit_regie(app, admin_user):
         test_add_regie(app, admin_user)
     def test_edit_regie(app, admin_user, payment_backend):
         test_add_regie(app, admin_user, payment_backend)
         app = login(app)
         resp = app.get('/manage/lingo/regies/', status=200)
         resp = resp.click('Test')
         resp.forms[0]['description'] = 'other description'
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/lingo/regies/')
         assert Regie.objects.count() == 1
         regie = Regie.objects.all()[0]
         assert regie.description == 'other description'
     def test_delete_regie(app, admin_user):
         test_add_regie(app, admin_user)
     def test_delete_regie(app, admin_user, payment_backend):
         test_add_regie(app, admin_user, payment_backend)
         app = login(app)
         resp = app.get('/manage/lingo/regies/', status=200)
         resp = resp.click('remove')
         assert 'Are you sure you want to delete this?' in resp.text
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/lingo/regies/')
         assert Regie.objects.count() == 0
     def test_add_second_regie(app, admin_user):
         test_add_regie(app, admin_user)
     def test_add_second_regie(app, admin_user, payment_backend):
         test_add_regie(app, admin_user, payment_backend)
         regie = Regie.objects.all()[0]
         app = login(app)
         resp = app.get('/manage/lingo/regies/', status=200)
         resp = resp.click('New')
         resp = app.get('/manage/lingo/paymentbackends/%s/' % payment_backend.pk, status=200)
         resp = resp.click('New Regie')
         resp.forms[0]['label'] = 'Test2'
         resp.forms[0]['slug'] = 'test2'
         resp.forms[0]['description'] = 'description'
         resp.forms[0]['service'] = 'dummy'
         resp.forms[0]['payment_backend'] = payment_backend.pk
         assert resp.form['is_default'].checked is False
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/lingo/regies/')
         assert Regie.objects.count() == 2
         assert Regie.objects.get(id=regie.id).is_default is True
         assert Regie.objects.exclude(id=regie.id)[0].is_default is False
     def test_download_transaction(app, admin_user):
         test_add_regie(app, admin_user)
     def test_download_transaction(app, admin_user, payment_backend):
         test_add_regie(app, admin_user, payment_backend)
         regie = Regie.objects.filter(slug='test')[0]
         user = User.objects.create_user('dimebag', 'dime@bag.pan', 'pwd')
         user.last_name = u'Darëll'
-...
         assert resp.text.count('ROLDEB:') == 1
         assert resp.text.count('ROLDET:') == 1
     def test_configure_invoices_cell(app, admin_user):
     def test_configure_invoices_cell(app, admin_user, payment_backend):
         page = Page(title='xxx', slug='test', template_name='standard')
         page.save()
-...
         regie.label = 'Test'
         regie.slug = 'test'
         regie.description = 'test'
         regie.payment_backend = payment_backend
         regie.save()
         resp = app.get('/manage/pages/%s/' % page.id, status=200)
-...
         regie2.slug = 'test2'
         regie2.description = 'test2'
         regie2.webservice_url = 'http://example.net/'
         regie2.payment_backend = payment_backend
         regie2.save()
         resp = app.get('/manage/pages/%s/' % page.id, status=200)
-...
         resp.form['clingo_activeitems-%s-regie' % cell.id].value = 'test2'
         resp.form.submit()
         assert ActiveItems.objects.get(id=cell.id).regie == regie2.slug
     def test_payment_backend_list(app, admin_user):
         PaymentBackend.objects.create(label='label1', slug='slug1', description='description1')
         PaymentBackend.objects.create(label='label2', slug='slug2', description='description2')
         app = login(app)
         resp = app.get('/manage/lingo/paymentbackends/', status=200)
         assert '/manage/lingo/paymentbackends/add' in resp.text
         assert 'label1' in resp.content
         assert 'label2' in resp.content
         for pb in PaymentBackend.objects.all():
             assert '/manage/lingo/paymentbackends/%s' % pb.pk in resp.text
             assert '/manage/lingo/paymentbackends/%s/delete' % pb.pk in resp.text
     def test_view_payment_backend(app, admin_user):
         pb = PaymentBackend.objects.create(label='label1', slug='slug1', description='description1')
         Regie.objects.create(
             label='regie-label1', slug='regie-slug1', description='regie-description1',
             payment_backend=pb)
         Regie.objects.create(
             label='regie-label2', slug='regie-slug2', description='regie-description2',
             payment_backend=pb)
         app = login(app)
         resp = app.get('/manage/lingo/paymentbackends/%s/' % pb.pk, status=200)
         assert '/manage/lingo/paymentbackends/%s/add-regie' % pb.pk in resp.text
         assert '/manage/lingo/paymentbackends/%s/edit' % pb.pk in resp.text
         assert '/manage/lingo/paymentbackends/%s/delete' % pb.pk in resp.text
         for rg in pb.regie_set.all():
             assert rg.slug in resp.text
             assert '/manage/lingo/regies/%s/edit' % rg.pk in resp.text
             assert '/manage/lingo/regies/%s/delete' % rg.pk in resp.text
     def test_add_payment_backend(app, admin_user):
         assert not PaymentBackend.objects.count()
         app = login(app)
         resp = app.get('/manage/lingo/paymentbackends/add/', status=200)
         resp.forms[0]['label'] = 'Test'
         resp.forms[0]['slug'] = 'test-add'
         resp.forms[0]['description'] = 'description'
         resp.forms[0]['service'] = 'dummy'
         resp.forms[0]['service_options'] = '{"siret": "1234"}'
         resp = resp.forms[0].submit()
         assert PaymentBackend.objects.count() == 1
         pb = PaymentBackend.objects.get(slug='test-add')
         assert pb.label == 'Test'
         assert pb.description == 'description'
         assert pb.service_options == {'siret': '1234'}
         assert resp.location.endswith('/manage/lingo/paymentbackends/%s/' % pb.pk)
     def test_edit_payment_backend(app, admin_user):
         pb = PaymentBackend.objects.create(label='label1', slug='slug1', description='description1')
         app = login(app)
         resp = app.get('/manage/lingo/paymentbackends/%s/edit' % pb.pk, status=200)
         resp.forms[0]['label'] = 'label1-modified'
         resp.forms[0]['slug'] = 'slug1'
         resp.forms[0]['description'] = 'description1'
         resp.forms[0]['service'] = 'dummy'
         resp.forms[0]['service_options'] = '{"siret": "1234"}'
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/lingo/paymentbackends/%s/' % pb.pk)
         pb = PaymentBackend.objects.get(slug='slug1')
         assert pb.label == 'label1-modified'

     from combo.data.models import Page
     from combo.apps.notifications.models import Notification, NotificationsCell
     from combo.apps.lingo.models import Regie, ActiveItems
     from combo.apps.lingo.models import Regie, ActiveItems, PaymentBackend
     pytestmark = pytest.mark.django_db
-...
     @pytest.fixture
     def regie():
         try:
             pb = PaymentBackend.objects.get(slug='test1')
         except PaymentBackend.DoesNotExist:
             pb = PaymentBackend.objects.create(
                 label='test1', slug='test1', service='dummy')
         try:
             regie = Regie.objects.get(slug='remote')
         except Regie.DoesNotExist:
-...
             regie.slug = 'remote'
             regie.description = 'remote'
             regie.payment_min_amount = Decimal(2.0)
             regie.service = 'dummy'
             regie.payment_backend = pb
             regie.save()
         return regie
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-lingo-make-manager-views-compliant-with-PaymentBacke.patch